summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2020-05-13 19:32:55 +0000
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-14 14:17:15 +0200
commit65441c214b204f375dcb91f7e835ab3a59c5f43c (patch)
treec72fceffc240cc4d006435b5b5e0cfccb5cb3265 /src
parentbead80ca2335e7230eed5d9d65d6f9c35c1333cd (diff)
tree-wide: get rid of trailing whitespace (part 10)
Remove trailing whitespaces Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11830
Diffstat (limited to 'src')
-rw-r--r--src/modules/fileman_opinfo/e_mod_main.c38
-rw-r--r--src/modules/gadman/e_mod_gadman.c2
-rw-r--r--src/modules/gadman/e_mod_gadman.h4
-rw-r--r--src/modules/ibar/e_mod_config.c4
-rw-r--r--src/modules/ibar/e_mod_main.c58
-rw-r--r--src/modules/ibox/e_mod_config.c16
-rw-r--r--src/modules/ibox/e_mod_main.c2
-rw-r--r--src/modules/ibox/e_mod_main.h2
-rw-r--r--src/modules/luncher/bar.c24
-rw-r--r--src/modules/luncher/config.c4
-rw-r--r--src/modules/notification/e_mod_config.c2
11 files changed, 78 insertions, 78 deletions
diff --git a/src/modules/fileman_opinfo/e_mod_main.c b/src/modules/fileman_opinfo/e_mod_main.c
index 266e0fce8..584d6243a 100644
--- a/src/modules/fileman_opinfo/e_mod_main.c
+++ b/src/modules/fileman_opinfo/e_mod_main.c
@@ -71,7 +71,7 @@ _opinfo_op_registry_listener(void *data, const E_Fm2_Op_Registry_Entry *ere)
71 // Don't show if the operation keep less than 1 second 71 // Don't show if the operation keep less than 1 second
72 if (!ere->needs_attention && (ere->start_time + 1.0 > ecore_loop_time_get())) 72 if (!ere->needs_attention && (ere->start_time + 1.0 > ecore_loop_time_get()))
73 return; 73 return;
74 74
75 // Update icon 75 // Update icon
76 switch (ere->op) 76 switch (ere->op)
77 { 77 {
@@ -228,34 +228,34 @@ static Eina_Bool
228_opinfo_op_registry_free_data_delayed(void *data) 228_opinfo_op_registry_free_data_delayed(void *data)
229{ 229{
230 Evas_Object *o = data; 230 Evas_Object *o = data;
231 231
232 if (o) 232 if (o)
233 { 233 {
234 evas_object_del(o); 234 evas_object_del(o);
235 } 235 }
236 236
237 return ECORE_CALLBACK_CANCEL; 237 return ECORE_CALLBACK_CANCEL;
238} 238}
239 239
240static void 240static void
241_opinfo_op_registry_abort_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) 241_opinfo_op_registry_abort_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
242{ 242{
243 int id; 243 int id;
244 244
245 id = (long)data; 245 id = (long)data;
246 if (!id) return; 246 if (!id) return;
247 247
248 e_fm2_operation_abort(id); 248 e_fm2_operation_abort(id);
249} 249}
250 250
251static void 251static void
252_opinfo_op_registry_window_jump_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) 252_opinfo_op_registry_window_jump_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
253{ 253{
254 int id = (long)data; 254 int id = (long)data;
255 E_Fm2_Op_Registry_Entry *ere; 255 E_Fm2_Op_Registry_Entry *ere;
256 Evas_Object *win; 256 Evas_Object *win;
257 E_Client *ec; 257 E_Client *ec;
258 258
259 if (!id) return; 259 if (!id) return;
260 ere = e_fm2_op_registry_entry_get(id); 260 ere = e_fm2_op_registry_entry_get(id);
261 if (!ere) return; 261 if (!ere) return;
@@ -279,7 +279,7 @@ _opinfo_op_registry_entry_add_cb(void *data, EINA_UNUSED int type, void *event)
279 E_Fm2_Op_Registry_Entry *ere = event; 279 E_Fm2_Op_Registry_Entry *ere = event;
280 Instance *inst = data; 280 Instance *inst = data;
281 Evas_Object *o; 281 Evas_Object *o;
282 282
283 if (!inst || !ere) 283 if (!inst || !ere)
284 return ECORE_CALLBACK_RENEW; 284 return ECORE_CALLBACK_RENEW;
285 285
@@ -287,18 +287,18 @@ _opinfo_op_registry_entry_add_cb(void *data, EINA_UNUSED int type, void *event)
287 287
288 if (!(ere->op == E_FM_OP_COPY || ere->op == E_FM_OP_MOVE || ere->op == E_FM_OP_REMOVE)) 288 if (!(ere->op == E_FM_OP_COPY || ere->op == E_FM_OP_MOVE || ere->op == E_FM_OP_REMOVE))
289 return ECORE_CALLBACK_RENEW; 289 return ECORE_CALLBACK_RENEW;
290 290
291 o = edje_object_add(evas_object_evas_get(inst->o_box)); 291 o = edje_object_add(evas_object_evas_get(inst->o_box));
292 e_theme_edje_object_set(o, "base/theme/fileman", "e/fileman/default/progress"); 292 e_theme_edje_object_set(o, "base/theme/fileman", "e/fileman/default/progress");
293 edje_object_signal_callback_add(o, "e,fm,operation,abort", "", 293 edje_object_signal_callback_add(o, "e,fm,operation,abort", "",
294 _opinfo_op_registry_abort_cb, (void*)(long)ere->id); 294 _opinfo_op_registry_abort_cb, (void*)(long)ere->id);
295 edje_object_signal_callback_add(o, "e,fm,window,jump", "", 295 edje_object_signal_callback_add(o, "e,fm,window,jump", "",
296 _opinfo_op_registry_window_jump_cb, (void*)(long)ere->id); 296 _opinfo_op_registry_window_jump_cb, (void*)(long)ere->id);
297 elm_box_pack_end(inst->o_box, o); 297 elm_box_pack_end(inst->o_box, o);
298 298
299 e_fm2_op_registry_entry_listener_add(ere, _opinfo_op_registry_listener, 299 e_fm2_op_registry_entry_listener_add(ere, _opinfo_op_registry_listener,
300 o, _opinfo_op_registry_free_data); 300 o, _opinfo_op_registry_free_data);
301 301
302 return ECORE_CALLBACK_RENEW; 302 return ECORE_CALLBACK_RENEW;
303} 303}
304 304
@@ -306,7 +306,7 @@ static Eina_Bool
306_opinfo_op_registry_entry_del_cb(void *data, EINA_UNUSED int type, EINA_UNUSED void *event) 306_opinfo_op_registry_entry_del_cb(void *data, EINA_UNUSED int type, EINA_UNUSED void *event)
307{ 307{
308 Instance *inst = data; 308 Instance *inst = data;
309 309
310 if (!inst) 310 if (!inst)
311 return ECORE_CALLBACK_RENEW; 311 return ECORE_CALLBACK_RENEW;
312 312
@@ -329,12 +329,12 @@ _opinfo_op_registry_update_all(Instance *inst)
329 _opinfo_op_registry_update_status(inst); 329 _opinfo_op_registry_update_status(inst);
330} 330}
331 331
332static void 332static void
333_opinfo_op_registry_update_status(Instance *inst) 333_opinfo_op_registry_update_status(Instance *inst)
334{ 334{
335 int cnt; 335 int cnt;
336 char buf[256]; 336 char buf[256];
337 337
338 cnt = e_fm2_op_registry_count(); 338 cnt = e_fm2_op_registry_count();
339 if (cnt) 339 if (cnt)
340 { 340 {
@@ -445,7 +445,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas)
445 snprintf(buf, sizeof(buf), "%s/e-module-fileman_opinfo.edj", 445 snprintf(buf, sizeof(buf), "%s/e-module-fileman_opinfo.edj",
446 e_module_dir_get(opinfo_module)); 446 e_module_dir_get(opinfo_module));
447 edje_object_file_set(o, buf, "icon"); 447 edje_object_file_set(o, buf, "icon");
448 448
449 return o; 449 return o;
450} 450}
451 451
@@ -457,7 +457,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED)
457 457
458/******************** E MODULE ****************************************/ 458/******************** E MODULE ****************************************/
459 459
460E_API E_Module_Api e_modapi = 460E_API E_Module_Api e_modapi =
461{ 461{
462 E_MODULE_API_VERSION, 462 E_MODULE_API_VERSION,
463 "EFM Info" 463 "EFM Info"
diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c
index 71349e6f3..b10fc3040 100644
--- a/src/modules/gadman/e_mod_gadman.c
+++ b/src/modules/gadman/e_mod_gadman.c
@@ -1191,7 +1191,7 @@ _menu_style_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
1191 { 1191 {
1192 w = ow, h = oh; 1192 w = ow, h = oh;
1193 } 1193 }
1194 else 1194 else
1195 { 1195 {
1196 /* just flip aspect */ 1196 /* just flip aspect */
1197 w = oh; 1197 w = oh;
diff --git a/src/modules/gadman/e_mod_gadman.h b/src/modules/gadman/e_mod_gadman.h
index ec76361ae..3be541628 100644
--- a/src/modules/gadman/e_mod_gadman.h
+++ b/src/modules/gadman/e_mod_gadman.h
@@ -57,12 +57,12 @@ struct _Manager
57 57
58 Eina_List *waiting; 58 Eina_List *waiting;
59 Ecore_Event_Handler *add; 59 Ecore_Event_Handler *add;
60 60
61 int visible; 61 int visible;
62 Evas_Object *overlay; 62 Evas_Object *overlay;
63 63
64 int width, height; 64 int width, height;
65 65
66 E_Module *module; 66 E_Module *module;
67 E_Config_Dialog *config_dialog; 67 E_Config_Dialog *config_dialog;
68 E_Int_Menu_Augmentation *maug; 68 E_Int_Menu_Augmentation *maug;
diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c
index 1f9cd4516..baaaad537 100644
--- a/src/modules/ibar/e_mod_config.c
+++ b/src/modules/ibar/e_mod_config.c
@@ -243,11 +243,11 @@ _cb_entry_ok(void *data, char *text)
243 f = fopen(buf, "w"); 243 f = fopen(buf, "w");
244 if (!f) break; 244 if (!f) break;
245 /* Populate this .order file with some defaults */ 245 /* Populate this .order file with some defaults */
246 snprintf(tmp, sizeof(tmp), 246 snprintf(tmp, sizeof(tmp),
247 "terminology.desktop\n" 247 "terminology.desktop\n"
248 "sylpheed.desktop\n" 248 "sylpheed.desktop\n"
249 "firefox.desktop\n" 249 "firefox.desktop\n"
250 "openoffice.desktop\n" 250 "openoffice.desktop\n"
251 "xchat.desktop\n" 251 "xchat.desktop\n"
252 "gimp.desktop\n"); 252 "gimp.desktop\n");
253 fwrite(tmp, sizeof(char), strlen(tmp), f); 253 fwrite(tmp, sizeof(char), strlen(tmp), f);
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index ff79fc4f8..e8d443c2a 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -588,7 +588,7 @@ _ibar_fill(IBar *b)
588 } 588 }
589 eina_iterator_free(it); 589 eina_iterator_free(it);
590 } 590 }
591 591
592 _ibar_empty_handle(b); 592 _ibar_empty_handle(b);
593 _ibar_resize_handle(b); 593 _ibar_resize_handle(b);
594 if (!b->inst->gcc) return; 594 if (!b->inst->gcc) return;
@@ -1698,7 +1698,7 @@ static Eina_Bool
1698_ibar_cb_icon_reset(void *data) 1698_ibar_cb_icon_reset(void *data)
1699{ 1699{
1700 IBar_Icon *ic = data; 1700 IBar_Icon *ic = data;
1701 1701
1702 if (ic->focused) 1702 if (ic->focused)
1703 { 1703 {
1704 _ibar_icon_signal_emit(ic, "e,state,focused", "e"); 1704 _ibar_icon_signal_emit(ic, "e,state,focused", "e");
@@ -1780,7 +1780,7 @@ static void
1780_ibar_instance_watch(void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type) 1780_ibar_instance_watch(void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type)
1781{ 1781{
1782 IBar_Icon *ic = data; 1782 IBar_Icon *ic = data;
1783 1783
1784 switch (type) 1784 switch (type)
1785 { 1785 {
1786 case E_EXEC_WATCH_STARTED: 1786 case E_EXEC_WATCH_STARTED:
@@ -1831,7 +1831,7 @@ _ibar_icon_go(IBar_Icon *ic, Eina_Bool keep_going)
1831 else 1831 else
1832 { 1832 {
1833 E_Exec_Instance *einst; 1833 E_Exec_Instance *einst;
1834 1834
1835 einst = e_exec(ic->ibar->inst->gcc->gadcon->zone, 1835 einst = e_exec(ic->ibar->inst->gcc->gadcon->zone,
1836 ic->app, NULL, NULL, "ibar"); 1836 ic->app, NULL, NULL, "ibar");
1837 if (einst) 1837 if (einst)
@@ -1848,7 +1848,7 @@ _ibar_icon_go(IBar_Icon *ic, Eina_Bool keep_going)
1848 if (!strncasecmp(ic->app->url, "file:", 5)) 1848 if (!strncasecmp(ic->app->url, "file:", 5))
1849 { 1849 {
1850 E_Action *act; 1850 E_Action *act;
1851 1851
1852 act = e_action_find("fileman"); 1852 act = e_action_find("fileman");
1853 if (act) act->func.go(NULL, ic->app->url + 5); 1853 if (act) act->func.go(NULL, ic->app->url + 5);
1854 } 1854 }
@@ -2215,7 +2215,7 @@ _ibar_manager_find(void)
2215 E_Zone *z = e_zone_current_get(); 2215 E_Zone *z = e_zone_current_get();
2216 IBar *b; 2216 IBar *b;
2217 Eina_List *l; 2217 Eina_List *l;
2218 2218
2219 if (!z) return NULL; 2219 if (!z) return NULL;
2220 // find iubar on current zone 2220 // find iubar on current zone
2221 EINA_LIST_FOREACH(ibars, l, b) 2221 EINA_LIST_FOREACH(ibars, l, b)
@@ -2256,7 +2256,7 @@ _ibar_focused_find(void)
2256{ 2256{
2257 IBar *b; 2257 IBar *b;
2258 Eina_List *l; 2258 Eina_List *l;
2259 2259
2260 EINA_LIST_FOREACH(ibars, l, b) 2260 EINA_LIST_FOREACH(ibars, l, b)
2261 { 2261 {
2262 if (b->focused) return b; 2262 if (b->focused) return b;
@@ -2268,7 +2268,7 @@ static int
2268_ibar_cb_sort(IBar *b1, IBar *b2) 2268_ibar_cb_sort(IBar *b1, IBar *b2)
2269{ 2269{
2270 E_Zone *z1 = NULL, *z2 = NULL; 2270 E_Zone *z1 = NULL, *z2 = NULL;
2271 2271
2272 if ((b1) && (b1->inst) && (b1->inst->gcc) && (b1->inst->gcc->gadcon)) 2272 if ((b1) && (b1->inst) && (b1->inst->gcc) && (b1->inst->gcc->gadcon))
2273 z1 = b1->inst->gcc->gadcon->zone; 2273 z1 = b1->inst->gcc->gadcon->zone;
2274 if ((b2) && (b2->inst) && (b2->inst->gcc) && (b2->inst->gcc->gadcon)) 2274 if ((b2) && (b2->inst) && (b2->inst->gcc) && (b2->inst->gcc->gadcon))
@@ -2279,7 +2279,7 @@ _ibar_cb_sort(IBar *b1, IBar *b2)
2279 else 2279 else
2280 { 2280 {
2281 int id1, id2; 2281 int id1, id2;
2282 2282
2283 id1 = z1->id; 2283 id1 = z1->id;
2284 id2 = z2->id; 2284 id2 = z2->id;
2285 return id2 - id1; 2285 return id2 - id1;
@@ -2293,7 +2293,7 @@ _ibar_focused_next_find(void)
2293 IBar *b, *bn = NULL; 2293 IBar *b, *bn = NULL;
2294 Eina_List *l; 2294 Eina_List *l;
2295 Eina_List *tmpl = NULL; 2295 Eina_List *tmpl = NULL;
2296 2296
2297 EINA_LIST_FOREACH(ibars, l, b) 2297 EINA_LIST_FOREACH(ibars, l, b)
2298 { 2298 {
2299 if (!b->icons) continue; 2299 if (!b->icons) continue;
@@ -2327,7 +2327,7 @@ _ibar_focused_prev_find(void)
2327 IBar *b, *bn = NULL; 2327 IBar *b, *bn = NULL;
2328 Eina_List *l; 2328 Eina_List *l;
2329 Eina_List *tmpl = NULL; 2329 Eina_List *tmpl = NULL;
2330 2330
2331 EINA_LIST_FOREACH(ibars, l, b) 2331 EINA_LIST_FOREACH(ibars, l, b)
2332 { 2332 {
2333 if (!b->icons) continue; 2333 if (!b->icons) continue;
@@ -2359,7 +2359,7 @@ static void
2359_ibar_focus(IBar *b) 2359_ibar_focus(IBar *b)
2360{ 2360{
2361 IBar_Icon *ic; 2361 IBar_Icon *ic;
2362 2362
2363 if (b->focused) return; 2363 if (b->focused) return;
2364 b->focused = EINA_TRUE; 2364 b->focused = EINA_TRUE;
2365 EINA_INLIST_FOREACH(b->icons, ic) 2365 EINA_INLIST_FOREACH(b->icons, ic)
@@ -2395,7 +2395,7 @@ static void
2395_ibar_focus_next(IBar *b) 2395_ibar_focus_next(IBar *b)
2396{ 2396{
2397 IBar_Icon *ic, *ic1 = NULL, *ic2 = NULL; 2397 IBar_Icon *ic, *ic1 = NULL, *ic2 = NULL;
2398 2398
2399 if (!b->focused) return; 2399 if (!b->focused) return;
2400 if (!b->icons) return; 2400 if (!b->icons) return;
2401 EINA_INLIST_FOREACH(b->icons, ic) 2401 EINA_INLIST_FOREACH(b->icons, ic)
@@ -2420,7 +2420,7 @@ static void
2420_ibar_focus_prev(IBar *b) 2420_ibar_focus_prev(IBar *b)
2421{ 2421{
2422 IBar_Icon *ic, *ic1 = NULL, *ic2 = NULL; 2422 IBar_Icon *ic, *ic1 = NULL, *ic2 = NULL;
2423 2423
2424 if (!b->focused) return; 2424 if (!b->focused) return;
2425 if (!b->icons) return; 2425 if (!b->icons) return;
2426 EINA_INLIST_FOREACH(b->icons, ic) 2426 EINA_INLIST_FOREACH(b->icons, ic)
@@ -2442,7 +2442,7 @@ static void
2442_ibar_focus_launch(IBar *b) 2442_ibar_focus_launch(IBar *b)
2443{ 2443{
2444 IBar_Icon *ic; 2444 IBar_Icon *ic;
2445 2445
2446 if (!b->focused) return; 2446 if (!b->focused) return;
2447 EINA_INLIST_FOREACH(b->icons, ic) 2447 EINA_INLIST_FOREACH(b->icons, ic)
2448 { 2448 {
@@ -2459,7 +2459,7 @@ _ibar_focus_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *even
2459{ 2459{
2460 Ecore_Event_Key *ev; 2460 Ecore_Event_Key *ev;
2461 IBar *b, *b2; 2461 IBar *b, *b2;
2462 2462
2463 ev = event; 2463 ev = event;
2464 if (ev->window != _ibar_focus_win) return ECORE_CALLBACK_PASS_ON; 2464 if (ev->window != _ibar_focus_win) return ECORE_CALLBACK_PASS_ON;
2465 b = _ibar_focused_find(); 2465 b = _ibar_focused_find();
@@ -2467,7 +2467,7 @@ _ibar_focus_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *even
2467 if (!strcmp(ev->key, "Up")) 2467 if (!strcmp(ev->key, "Up"))
2468 { 2468 {
2469 if (b->inst) 2469 if (b->inst)
2470 { 2470 {
2471 switch (b->inst->orient) 2471 switch (b->inst->orient)
2472 { 2472 {
2473 case E_GADCON_ORIENT_VERT: 2473 case E_GADCON_ORIENT_VERT:
@@ -2487,7 +2487,7 @@ _ibar_focus_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *even
2487 else if (!strcmp(ev->key, "Down")) 2487 else if (!strcmp(ev->key, "Down"))
2488 { 2488 {
2489 if (b->inst) 2489 if (b->inst)
2490 { 2490 {
2491 switch (b->inst->orient) 2491 switch (b->inst->orient)
2492 { 2492 {
2493 case E_GADCON_ORIENT_VERT: 2493 case E_GADCON_ORIENT_VERT:
@@ -2507,7 +2507,7 @@ _ibar_focus_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *even
2507 else if (!strcmp(ev->key, "Left")) 2507 else if (!strcmp(ev->key, "Left"))
2508 { 2508 {
2509 if (b->inst) 2509 if (b->inst)
2510 { 2510 {
2511 switch (b->inst->orient) 2511 switch (b->inst->orient)
2512 { 2512 {
2513 case E_GADCON_ORIENT_FLOAT: 2513 case E_GADCON_ORIENT_FLOAT:
@@ -2528,7 +2528,7 @@ _ibar_focus_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *even
2528 else if (!strcmp(ev->key, "Right")) 2528 else if (!strcmp(ev->key, "Right"))
2529 { 2529 {
2530 if (b->inst) 2530 if (b->inst)
2531 { 2531 {
2532 switch (b->inst->orient) 2532 switch (b->inst->orient)
2533 { 2533 {
2534 case E_GADCON_ORIENT_FLOAT: 2534 case E_GADCON_ORIENT_FLOAT:
@@ -2597,7 +2597,7 @@ static void
2597_ibar_go_focus(void) 2597_ibar_go_focus(void)
2598{ 2598{
2599 IBar *b; 2599 IBar *b;
2600 2600
2601 if (_ibar_focus_win) return; 2601 if (_ibar_focus_win) return;
2602 b = _ibar_manager_find(); 2602 b = _ibar_manager_find();
2603 if (!b) return; 2603 if (!b) return;
@@ -2612,7 +2612,7 @@ static void
2612_ibar_go_unfocus(void) 2612_ibar_go_unfocus(void)
2613{ 2613{
2614 IBar *b; 2614 IBar *b;
2615 2615
2616 if (!_ibar_focus_win) return; 2616 if (!_ibar_focus_win) return;
2617 b = _ibar_focused_find(); 2617 b = _ibar_focused_find();
2618 if (b) _ibar_unfocus(b); 2618 if (b) _ibar_unfocus(b);
@@ -2621,7 +2621,7 @@ _ibar_go_unfocus(void)
2621 ecore_event_handler_del(_ibar_key_down_handler); 2621 ecore_event_handler_del(_ibar_key_down_handler);
2622 _ibar_key_down_handler = NULL; 2622 _ibar_key_down_handler = NULL;
2623} 2623}
2624 2624
2625static void 2625static void
2626_ibar_cb_action_focus(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED, Ecore_Event_Key *ev EINA_UNUSED) 2626_ibar_cb_action_focus(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED, Ecore_Event_Key *ev EINA_UNUSED)
2627{ 2627{
@@ -2636,7 +2636,7 @@ _ibar_cb_client_prop(void *d EINA_UNUSED, int t EINA_UNUSED, E_Event_Client_Prop
2636 E_Client *ec; 2636 E_Client *ec;
2637 Eina_Bool skip = EINA_TRUE; 2637 Eina_Bool skip = EINA_TRUE;
2638 2638
2639 if (e_client_util_ignored_get(ev->ec) || (!ev->ec->exe_inst) || 2639 if (e_client_util_ignored_get(ev->ec) || (!ev->ec->exe_inst) ||
2640 (!ev->ec->exe_inst->desktop)) return ECORE_CALLBACK_RENEW; 2640 (!ev->ec->exe_inst->desktop)) return ECORE_CALLBACK_RENEW;
2641 if ((!(ev->property & E_CLIENT_PROPERTY_NETWM_STATE)) && (!(ev->property & E_CLIENT_PROPERTY_ICON))) 2641 if ((!(ev->property & E_CLIENT_PROPERTY_NETWM_STATE)) && (!(ev->property & E_CLIENT_PROPERTY_ICON)))
2642 return ECORE_CALLBACK_RENEW; 2642 return ECORE_CALLBACK_RENEW;
@@ -2840,7 +2840,7 @@ e_modapi_init(E_Module *m)
2840 E_CONFIG_VAL(D, T, dont_add_nonorder, INT); 2840 E_CONFIG_VAL(D, T, dont_add_nonorder, INT);
2841 E_CONFIG_VAL(D, T, dont_track_launch, UCHAR); 2841 E_CONFIG_VAL(D, T, dont_track_launch, UCHAR);
2842 E_CONFIG_VAL(D, T, dont_icon_menu_mouseover, UCHAR); 2842 E_CONFIG_VAL(D, T, dont_icon_menu_mouseover, UCHAR);
2843 2843
2844 conf_edd = E_CONFIG_DD_NEW("IBar_Config", Config); 2844 conf_edd = E_CONFIG_DD_NEW("IBar_Config", Config);
2845#undef T 2845#undef T
2846#undef D 2846#undef D
@@ -2885,7 +2885,7 @@ e_modapi_init(E_Module *m)
2885 2885
2886 e_gadcon_provider_register(&_gadcon_class); 2886 e_gadcon_provider_register(&_gadcon_class);
2887 ibar_orders = eina_hash_string_superfast_new(NULL); 2887 ibar_orders = eina_hash_string_superfast_new(NULL);
2888 2888
2889 act_ibar_focus = e_action_add("ibar_focus"); 2889 act_ibar_focus = e_action_add("ibar_focus");
2890 if (act_ibar_focus) 2890 if (act_ibar_focus)
2891 { 2891 {
@@ -2893,7 +2893,7 @@ e_modapi_init(E_Module *m)
2893 e_action_predef_name_set(N_("IBar"), N_("Focus IBar"), 2893 e_action_predef_name_set(N_("IBar"), N_("Focus IBar"),
2894 "ibar_focus", "<none>", NULL, 0); 2894 "ibar_focus", "<none>", NULL, 0);
2895 } 2895 }
2896 2896
2897 return m; 2897 return m;
2898} 2898}
2899 2899
@@ -2904,11 +2904,11 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
2904 Config_Item *ci; 2904 Config_Item *ci;
2905 2905
2906 _ibar_go_unfocus(); 2906 _ibar_go_unfocus();
2907 2907
2908 e_action_del("ibar_focus"); 2908 e_action_del("ibar_focus");
2909 e_action_predef_name_del("IBar", "Focus IBar"); 2909 e_action_predef_name_del("IBar", "Focus IBar");
2910 act_ibar_focus = NULL; 2910 act_ibar_focus = NULL;
2911 2911
2912 e_gadcon_provider_unregister(&_gadcon_class); 2912 e_gadcon_provider_unregister(&_gadcon_class);
2913 2913
2914 if (ibar_config->config_dialog) 2914 if (ibar_config->config_dialog)
diff --git a/src/modules/ibox/e_mod_config.c b/src/modules/ibox/e_mod_config.c
index 97609ee26..d0ade272a 100644
--- a/src/modules/ibox/e_mod_config.c
+++ b/src/modules/ibox/e_mod_config.c
@@ -26,13 +26,13 @@ static void _cb_disable_check_list(void *data, Evas_Object *obj);
26static void _cb_zone_policy_change(void *data, Evas_Object *obj); 26static void _cb_zone_policy_change(void *data, Evas_Object *obj);
27// unused 27// unused
28//static void _cb_disable_check(void *data, Evas_Object *obj); 28//static void _cb_disable_check(void *data, Evas_Object *obj);
29void 29void
30_config_ibox_module(Config_Item *ci) 30_config_ibox_module(Config_Item *ci)
31{ 31{
32 E_Config_Dialog *cfd; 32 E_Config_Dialog *cfd;
33 E_Config_Dialog_View *v; 33 E_Config_Dialog_View *v;
34 char buf[4096]; 34 char buf[4096];
35 35
36 v = E_NEW(E_Config_Dialog_View, 1); 36 v = E_NEW(E_Config_Dialog_View, 1);
37 37
38 /* Dialog Methods */ 38 /* Dialog Methods */
@@ -42,7 +42,7 @@ _config_ibox_module(Config_Item *ci)
42 v->basic.create_widgets = _basic_create_widgets; 42 v->basic.create_widgets = _basic_create_widgets;
43 v->advanced.apply_cfdata = NULL; 43 v->advanced.apply_cfdata = NULL;
44 v->advanced.create_widgets = NULL; 44 v->advanced.create_widgets = NULL;
45 45
46 /* Create The Dialog */ 46 /* Create The Dialog */
47 snprintf(buf, sizeof(buf), "%s/e-module-ibox.edj", e_module_dir_get(ibox_config->module)); 47 snprintf(buf, sizeof(buf), "%s/e-module-ibox.edj", e_module_dir_get(ibox_config->module));
48 cfd = e_config_dialog_new(NULL, 48 cfd = e_config_dialog_new(NULL,
@@ -52,7 +52,7 @@ _config_ibox_module(Config_Item *ci)
52 ibox_config->config_dialog = eina_list_append(ibox_config->config_dialog, cfd); 52 ibox_config->config_dialog = eina_list_append(ibox_config->config_dialog, cfd);
53} 53}
54 54
55static void 55static void
56_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata) 56_fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
57{ 57{
58 cfdata->show_label = ci->show_label; 58 cfdata->show_label = ci->show_label;
@@ -66,14 +66,14 @@ _create_data(E_Config_Dialog *cfd)
66{ 66{
67 E_Config_Dialog_Data *cfdata; 67 E_Config_Dialog_Data *cfdata;
68 Config_Item *ci; 68 Config_Item *ci;
69 69
70 ci = cfd->data; 70 ci = cfd->data;
71 cfdata = E_NEW(E_Config_Dialog_Data, 1); 71 cfdata = E_NEW(E_Config_Dialog_Data, 1);
72 _fill_data(ci, cfdata); 72 _fill_data(ci, cfdata);
73 return cfdata; 73 return cfdata;
74} 74}
75 75
76static void 76static void
77_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 77_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
78{ 78{
79 show_label_list = eina_list_free(show_label_list); 79 show_label_list = eina_list_free(show_label_list);
@@ -170,7 +170,7 @@ static int
170_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 170_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
171{ 171{
172 Config_Item *ci; 172 Config_Item *ci;
173 173
174 ci = cfd->data; 174 ci = cfd->data;
175 ci->show_label = cfdata->show_label; 175 ci->show_label = cfdata->show_label;
176 ci->icon_label = cfdata->icon_label; 176 ci->icon_label = cfdata->icon_label;
@@ -213,7 +213,7 @@ _cb_zone_policy_change(void *data, Evas_Object *obj EINA_UNUSED)
213static void 213static void
214_cb_disable_check(void *data, Evas_Object *obj) 214_cb_disable_check(void *data, Evas_Object *obj)
215{ 215{
216 e_widget_disabled_set((Evas_Object *) data, 216 e_widget_disabled_set((Evas_Object *) data,
217 !e_widget_check_checked_get(obj)); 217 !e_widget_check_checked_get(obj));
218} 218}
219#endif 219#endif
diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index ab35c5196..3d7c00447 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -1033,7 +1033,7 @@ _ibox_cb_event_client_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev
1033 if (!ev->ec->iconic) return ECORE_CALLBACK_RENEW; 1033 if (!ev->ec->iconic) return ECORE_CALLBACK_RENEW;
1034 if (!ev->ec->zone) return ECORE_CALLBACK_RENEW; 1034 if (!ev->ec->zone) return ECORE_CALLBACK_RENEW;
1035 desk = e_desk_current_get(ev->ec->zone); 1035 desk = e_desk_current_get(ev->ec->zone);
1036 1036
1037 ibox = _ibox_zone_find(ev->ec->zone); 1037 ibox = _ibox_zone_find(ev->ec->zone);
1038 EINA_LIST_FREE(ibox, b) 1038 EINA_LIST_FREE(ibox, b)
1039 { 1039 {
diff --git a/src/modules/ibox/e_mod_main.h b/src/modules/ibox/e_mod_main.h
index 8c1054e7a..32a104c0c 100644
--- a/src/modules/ibox/e_mod_main.h
+++ b/src/modules/ibox/e_mod_main.h
@@ -14,7 +14,7 @@ struct _Config
14 Eina_List *config_dialog; 14 Eina_List *config_dialog;
15}; 15};
16 16
17struct _Config_Item 17struct _Config_Item
18{ 18{
19 const char *id; 19 const char *id;
20 int show_label; 20 int show_label;
diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index 40f6f08d1..b9727c258 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -54,7 +54,7 @@ _bar_gadget_configure(Evas_Object *g)
54 return config_luncher(e_zone_current_get(), inst, EINA_TRUE); 54 return config_luncher(e_zone_current_get(), inst, EINA_TRUE);
55} 55}
56 56
57static void 57static void
58_bar_popup_dismissed(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) 58_bar_popup_dismissed(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
59{ 59{
60 E_FREE_FUNC(obj, evas_object_del); 60 E_FREE_FUNC(obj, evas_object_del);
@@ -64,9 +64,9 @@ static const char *
64_bar_location_get(Instance *inst) 64_bar_location_get(Instance *inst)
65{ 65{
66 const char *s = "float"; 66 const char *s = "float";
67 67
68 E_Gadget_Site_Orient orient = e_gadget_site_orient_get(e_gadget_site_get(inst->o_main)); 68 E_Gadget_Site_Orient orient = e_gadget_site_orient_get(e_gadget_site_get(inst->o_main));
69 E_Gadget_Site_Anchor anchor = e_gadget_site_anchor_get(e_gadget_site_get(inst->o_main)); 69 E_Gadget_Site_Anchor anchor = e_gadget_site_anchor_get(e_gadget_site_get(inst->o_main));
70 70
71 if (anchor & E_GADGET_SITE_ANCHOR_LEFT) 71 if (anchor & E_GADGET_SITE_ANCHOR_LEFT)
72 { 72 {
@@ -152,7 +152,7 @@ _bar_location_get(Instance *inst)
152 case E_GADGET_SITE_ORIENT_VERTICAL: 152 case E_GADGET_SITE_ORIENT_VERTICAL:
153 s = "left"; 153 s = "left";
154 break; 154 break;
155 default: 155 default:
156 s = "bottom"; 156 s = "bottom";
157 break; 157 break;
158 } 158 }
@@ -821,7 +821,7 @@ _bar_icon_preview_show(void *data)
821 evas_object_size_hint_max_set(ic->preview_scroller, zone->w - 15, zone->h - 15); 821 evas_object_size_hint_max_set(ic->preview_scroller, zone->w - 15, zone->h - 15);
822 elm_object_style_set(ic->preview_scroller, "no_inset_shadow"); 822 elm_object_style_set(ic->preview_scroller, "no_inset_shadow");
823 E_EXPAND(ic->preview_scroller); 823 E_EXPAND(ic->preview_scroller);
824 824
825 ic->preview_box = elm_box_add(ic->preview); 825 ic->preview_box = elm_box_add(ic->preview);
826 evas_object_size_hint_align_set(ic->preview_box, 0, 0); 826 evas_object_size_hint_align_set(ic->preview_box, 0, 0);
827 switch (orient) 827 switch (orient)
@@ -905,10 +905,10 @@ _bar_icon_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *even
905 else if (clients && !ic->inst->current_preview) 905 else if (clients && !ic->inst->current_preview)
906 ic->mouse_in_timer = ecore_timer_loop_add(0.3, _bar_icon_preview_show, ic); 906 ic->mouse_in_timer = ecore_timer_loop_add(0.3, _bar_icon_preview_show, ic);
907} 907}
908 908
909static void 909static void
910_bar_exec_new_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_data EINA_UNUSED) 910_bar_exec_new_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_data EINA_UNUSED)
911{ 911{
912 Icon *ic = data; 912 Icon *ic = data;
913 E_Client *ec = e_comp_object_client_get(obj); 913 E_Client *ec = e_comp_object_client_get(obj);
914 914
@@ -1207,7 +1207,7 @@ _bar_cb_client_remove(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Clie
1207 _bar_icon_del(inst, ic); 1207 _bar_icon_del(inst, ic);
1208 } 1208 }
1209 else if (ic->preview && (inst->current_preview == ic->preview)) 1209 else if (ic->preview && (inst->current_preview == ic->preview))
1210 { 1210 {
1211 _bar_icon_preview_show(ic); 1211 _bar_icon_preview_show(ic);
1212 } 1212 }
1213 } 1213 }
@@ -1280,7 +1280,7 @@ _bar_cb_exec_client_prop(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_C
1280 Eina_Bool has_desktop = EINA_TRUE; 1280 Eina_Bool has_desktop = EINA_TRUE;
1281 1281
1282 if (e_client_util_ignored_get(ev->ec)) 1282 if (e_client_util_ignored_get(ev->ec))
1283 return ECORE_CALLBACK_RENEW; 1283 return ECORE_CALLBACK_RENEW;
1284 if ((!(ev->property & E_CLIENT_PROPERTY_NETWM_STATE)) && (!(ev->property & E_CLIENT_PROPERTY_ICON)) 1284 if ((!(ev->property & E_CLIENT_PROPERTY_NETWM_STATE)) && (!(ev->property & E_CLIENT_PROPERTY_ICON))
1285 && (!(ev->property & E_CLIENT_PROPERTY_URGENCY))) 1285 && (!(ev->property & E_CLIENT_PROPERTY_URGENCY)))
1286 return ECORE_CALLBACK_RENEW; 1286 return ECORE_CALLBACK_RENEW;
@@ -1485,7 +1485,7 @@ _bar_fill(Instance *inst)
1485{ 1485{
1486 const Eina_Hash *execs = e_exec_instances_get(); 1486 const Eina_Hash *execs = e_exec_instances_get();
1487 Eina_Iterator *it; 1487 Eina_Iterator *it;
1488 Eina_List *l, *ll, *lll; 1488 Eina_List *l, *ll, *lll;
1489 E_Exec_Instance *ex; 1489 E_Exec_Instance *ex;
1490 E_Client *ec; 1490 E_Client *ec;
1491 Icon *ic; 1491 Icon *ic;
@@ -1770,7 +1770,7 @@ static void
1770_bar_drop_enter(void *data, const char *type EINA_UNUSED, void *event_data EINA_UNUSED) 1770_bar_drop_enter(void *data, const char *type EINA_UNUSED, void *event_data EINA_UNUSED)
1771{ 1771{
1772 Instance *inst = data; 1772 Instance *inst = data;
1773 1773
1774 inst->inside = EINA_TRUE; 1774 inst->inside = EINA_TRUE;
1775 inst->place_holder = evas_object_rectangle_add(evas_object_evas_get(inst->o_icon_con)); 1775 inst->place_holder = evas_object_rectangle_add(evas_object_evas_get(inst->o_icon_con));
1776 evas_object_color_set(inst->place_holder, 0, 0, 0, 0); 1776 evas_object_color_set(inst->place_holder, 0, 0, 0, 0);
@@ -1937,7 +1937,7 @@ _bar_recalculate_job(void *data)
1937 { 1937 {
1938 _bar_empty(inst); 1938 _bar_empty(inst);
1939 _bar_fill(inst); 1939 _bar_fill(inst);
1940 } 1940 }
1941 inst->recalc_job = NULL; 1941 inst->recalc_job = NULL;
1942 } 1942 }
1943} 1943}
diff --git a/src/modules/luncher/config.c b/src/modules/luncher/config.c
index 557691217..2ce4baf7e 100644
--- a/src/modules/luncher/config.c
+++ b/src/modules/luncher/config.c
@@ -70,7 +70,7 @@ _config_source_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_inf
70 return; 70 return;
71 if (inst->cfg->dir) eina_stringshare_del(inst->cfg->dir); 71 if (inst->cfg->dir) eina_stringshare_del(inst->cfg->dir);
72 inst->cfg->dir = NULL; 72 inst->cfg->dir = NULL;
73 inst->cfg->dir = eina_stringshare_ref(dir); 73 inst->cfg->dir = eina_stringshare_ref(dir);
74 bar_reorder(inst); 74 bar_reorder(inst);
75} 75}
76 76
@@ -147,7 +147,7 @@ _config_source_added(void *data, char *text)
147 break; 147 break;
148 } 148 }
149 config_luncher(e_zone_current_get(), inst, luncher_config->bar); 149 config_luncher(e_zone_current_get(), inst, luncher_config->bar);
150} 150}
151 151
152static void 152static void
153_config_source_deleted(void *data) 153_config_source_deleted(void *data)
diff --git a/src/modules/notification/e_mod_config.c b/src/modules/notification/e_mod_config.c
index e7dbb5c70..4893b367a 100644
--- a/src/modules/notification/e_mod_config.c
+++ b/src/modules/notification/e_mod_config.c
@@ -188,7 +188,7 @@ static int
188_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, 188_basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED,
189 E_Config_Dialog_Data *cfdata) 189 E_Config_Dialog_Data *cfdata)
190{ 190{
191 return 191 return
192 (cfdata->show_low != notification_cfg->show_low) || 192 (cfdata->show_low != notification_cfg->show_low) ||
193 (cfdata->show_normal != notification_cfg->show_normal) || 193 (cfdata->show_normal != notification_cfg->show_normal) ||
194 (cfdata->show_critical != notification_cfg->show_critical) || 194 (cfdata->show_critical != notification_cfg->show_critical) ||