discomfitor pushed a commit to branch master.
commit 0775d755fa3ccda44f2aa2bf4407608b3e7b7e40
Author: Mike Blumenkrantz <[email protected]>
Date: Thu Aug 22 09:49:39 2013 +0100
formatting
---
src/modules/ibar/e_mod_main.c | 68 +++++++++++++++++++++----------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 07e3835..cd6a4d8 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -72,7 +72,7 @@ struct _IBar_Icon
Ecore_Timer *timer;
E_Exec_Instance *exe_inst;
Eina_List *exes; //all instances
- Eina_List *exe_current;
+ Eina_List *exe_current;
E_Gadcon_Popup *menu;
int mouse_down;
struct
@@ -118,7 +118,7 @@ static void _ibar_cb_icon_mouse_up(void *data, Evas
*e, Evas_Object *obj
static void _ibar_cb_icon_mouse_move(void *data, Evas *e, Evas_Object
*obj, void *event_info);
static void _ibar_cb_icon_move(void *data, Evas *e, Evas_Object *obj,
void *event_info);
static void _ibar_cb_icon_resize(void *data, Evas *e, Evas_Object
*obj, void *event_info);
-static void _ibar_cb_icon_wheel(void *data, Evas *e, Evas_Object *obj,
void *event_info);
+static void _ibar_cb_icon_wheel(void *data, Evas *e, Evas_Object *obj,
void *event_info);
static void _ibar_inst_cb_enter(void *data, const char *type, void
*event_info);
static void _ibar_inst_cb_move(void *data, const char *type, void
*event_info);
static void _ibar_inst_cb_leave(void *data, const char *type, void
*event_info);
@@ -773,8 +773,8 @@ _ibar_icon_new(IBar *b, Efreet_Desktop *desktop, Eina_Bool
notinorder)
_ibar_cb_icon_mouse_up, ic);
evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_MOVE,
_ibar_cb_icon_mouse_move, ic);
- evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_WHEEL,
- _ibar_cb_icon_wheel, ic);
+ evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOUSE_WHEEL,
+ _ibar_cb_icon_wheel, ic);
evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_MOVE,
_ibar_cb_icon_move, ic);
evas_object_event_callback_add(ic->o_holder, EVAS_CALLBACK_RESIZE,
@@ -823,7 +823,7 @@ _ibar_icon_free(IBar_Icon *ic)
E_FREE_FUNC(ic->reset_timer, ecore_timer_del);
if (ic->app) efreet_desktop_unref(ic->app);
ic->exe_current = NULL;
- ic->ibar->not_in_order_count -= ic->not_in_order;
+ ic->ibar->not_in_order_count -= ic->not_in_order;
if (ic->ibar->ic_drop_before == ic)
ic->ibar->ic_drop_before = NULL;
_ibar_icon_empty(ic);
@@ -1315,22 +1315,22 @@ _ibar_cb_icon_reset(void *data)
}
static void
-_ibar_cb_icon_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj
__UNUSED__, void *event_info)
-{
- Evas_Event_Mouse_Wheel *ev = event_info;
- E_Exec_Instance *exe;
+_ibar_cb_icon_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj
__UNUSED__, void *event_info)
+{
+ Evas_Event_Mouse_Wheel *ev = event_info;
+ E_Exec_Instance *exe;
IBar_Icon *ic = data;
E_Border *cur, *sel = NULL;
- Eina_List *l;
+ Eina_List *l;
- if (!ic->exes) return;
+ if (!ic->exes) return;
cur = e_border_focused_get();
- if (!ic->exe_current)
- ic->exe_current = ic->exes;
+ if (!ic->exe_current)
+ ic->exe_current = ic->exes;
- exe = eina_list_data_get(ic->exe_current);
- if (ev->z < 0)
+ exe = eina_list_data_get(ic->exe_current);
+ if (ev->z < 0)
{
if (cur->exe_inst == exe)
{
@@ -1338,14 +1338,14 @@ _ibar_cb_icon_wheel(void *data, Evas *e __UNUSED__,
Evas_Object *obj __UNUSED__,
if (l) sel = eina_list_data_get(eina_list_next(l));
}
if (!sel)
- {
- ic->exe_current = eina_list_next(ic->exe_current);
- if (!ic->exe_current)
+ {
+ ic->exe_current = eina_list_next(ic->exe_current);
+ if (!ic->exe_current)
ic->exe_current = ic->exes;
- }
- }
- else if (ev->z > 0)
- {
+ }
+ }
+ else if (ev->z > 0)
+ {
if (cur->exe_inst == exe)
{
l = eina_list_data_find_list(exe->borders, cur);
@@ -1353,23 +1353,23 @@ _ibar_cb_icon_wheel(void *data, Evas *e __UNUSED__,
Evas_Object *obj __UNUSED__,
}
if (!sel)
{
- ic->exe_current = eina_list_prev(ic->exe_current);
- if (!ic->exe_current)
+ ic->exe_current = eina_list_prev(ic->exe_current);
+ if (!ic->exe_current)
ic->exe_current = eina_list_last(ic->exes);
- }
- }
+ }
+ }
if (!sel)
- {
+ {
exe = eina_list_data_get(ic->exe_current);
sel = eina_list_data_get(exe->borders);
- }
-
- if (sel)
- e_border_activate(sel, 1);
-}
-
-static void
+ }
+
+ if (sel)
+ e_border_activate(sel, 1);
+}
+
+static void
_ibar_instance_watch(void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type)
{
IBar_Icon *ic = data;
--
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
