summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2020-05-13 19:09:46 +0000
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-14 12:30:31 +0200
commit3524bc167c43152d70708e1ba3c1021385f65d25 (patch)
treeb49b0c03cf0836b427f0e50f4e51644ff1908fa8 /src
parent2a96a8dbaf251c9b38bd117f8ff6faaac4465d09 (diff)
tree-wide: get rid of trailing whitespace (part 1)
Remove trailing white spaces. Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11780
Diffstat (limited to 'src')
-rw-r--r--src/bin/e_actions.c4
-rw-r--r--src/bin/e_bindings.c2
-rw-r--r--src/bin/e_bryce.c4
-rw-r--r--src/bin/e_client.c14
-rw-r--r--src/bin/e_client.h2
-rw-r--r--src/bin/e_comp.c10
-rw-r--r--src/bin/e_comp_canvas.c2
-rw-r--r--src/bin/e_comp_object.c6
-rw-r--r--src/bin/e_comp_wl.c2
-rw-r--r--src/bin/e_comp_wl_dmabuf.c2
-rw-r--r--src/bin/e_comp_x.c18
-rw-r--r--src/bin/e_comp_x_randr.c2
-rw-r--r--src/bin/e_config_data.h8
-rw-r--r--src/bin/e_config_dialog.c2
-rw-r--r--src/bin/e_fm.c52
-rw-r--r--src/bin/e_fm/e_fm_ipc.c2
-rw-r--r--src/bin/e_fm/e_fm_main_eeze.c24
-rw-r--r--src/bin/e_fm/e_fm_main_udisks2.c4
-rw-r--r--src/bin/e_focus.c2
-rw-r--r--src/bin/e_gadget.c4
-rw-r--r--src/bin/e_gadget_loader.c2
-rw-r--r--src/bin/e_hints.c4
22 files changed, 86 insertions, 86 deletions
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index af0122335..0955b3e89 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -1156,7 +1156,7 @@ window_jump_to(const char *params)
1156 { 1156 {
1157 if (!e_client_focus_policy_click(ec)) 1157 if (!e_client_focus_policy_click(ec))
1158 e_client_pointer_warp_to_center_now(ec); 1158 e_client_pointer_warp_to_center_now(ec);
1159 } 1159 }
1160 evas_object_focus_set(ec->frame, 1); 1160 evas_object_focus_set(ec->frame, 1);
1161 return 1; 1161 return 1;
1162 } 1162 }
@@ -3447,7 +3447,7 @@ e_actions_init(void)
3447 e_action_predef_name_set(N_("Desktop"), N_("Switch Desktop To... On Screen..."), 3447 e_action_predef_name_set(N_("Desktop"), N_("Switch Desktop To... On Screen..."),
3448 "desk_linear_flip_to_screen", NULL, 3448 "desk_linear_flip_to_screen", NULL,
3449 "syntax: D S, example: 0 1", 1); 3449 "syntax: D S, example: 0 1", 1);
3450 3450
3451 /* desk_linear_flip_by */ 3451 /* desk_linear_flip_by */
3452 ACT_GO(desk_linear_flip_by); 3452 ACT_GO(desk_linear_flip_by);
3453 e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Linearly..."), 3453 e_action_predef_name_set(N_("Desktop"), N_("Flip Desktop Linearly..."),
diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 810b7a00b..084e6ef51 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -489,7 +489,7 @@ e_bindings_mouse_action_modifiers_text_generate(E_Binding_Context ctxt, const ch
489 keys[2].val = &alt; 489 keys[2].val = &alt;
490 keys[3].val = &win; 490 keys[3].val = &win;
491 keys[4].val = &altgr; 491 keys[4].val = &altgr;
492 492
493 EINA_LIST_FOREACH(e_bindings->mouse_bindings, l, ebm) 493 EINA_LIST_FOREACH(e_bindings->mouse_bindings, l, ebm)
494 if ((ebm->context == (int)ctxt) && eina_streq(ebm->action, action)) 494 if ((ebm->context == (int)ctxt) && eina_streq(ebm->action, action))
495 { 495 {
diff --git a/src/bin/e_bryce.c b/src/bin/e_bryce.c
index e66a164af..e242686d2 100644
--- a/src/bin/e_bryce.c
+++ b/src/bin/e_bryce.c
@@ -97,7 +97,7 @@ _bryce_autohide_coords(Bryce *b, int *x, int *y)
97 if (b->parent == e_comp->elm) 97 if (b->parent == e_comp->elm)
98 { 98 {
99 E_Zone *zone; 99 E_Zone *zone;
100 100
101 zone = e_comp_zone_number_get(b->zone); 101 zone = e_comp_zone_number_get(b->zone);
102 ox = zone->x, oy = zone->y, ow = zone->w, oh = zone->h; 102 ox = zone->x, oy = zone->y, ow = zone->w, oh = zone->h;
103 } 103 }
@@ -135,7 +135,7 @@ _bryce_position(Bryce *b, int w, int h, int *nx, int *ny)
135 if (b->parent == e_comp->elm) 135 if (b->parent == e_comp->elm)
136 { 136 {
137 E_Zone *zone; 137 E_Zone *zone;
138 138
139 zone = e_comp_zone_number_get(b->zone); 139 zone = e_comp_zone_number_get(b->zone);
140 ox = zone->x, oy = zone->y, ow = zone->w, oh = zone->h; 140 ox = zone->x, oy = zone->y, ow = zone->w, oh = zone->h;
141 if (starting) 141 if (starting)
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 4f373e10b..f486af8cb 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -101,7 +101,7 @@ _e_client_cb_config_mode(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev
101 E_Layer layer; 101 E_Layer layer;
102 102
103 /* move fullscreen borders above everything */ 103 /* move fullscreen borders above everything */
104 104
105 if (e_config->mode.presentation) 105 if (e_config->mode.presentation)
106 layer = E_LAYER_CLIENT_TOP; 106 layer = E_LAYER_CLIENT_TOP;
107 else if (!e_config->allow_above_fullscreen) 107 else if (!e_config->allow_above_fullscreen)
@@ -251,7 +251,7 @@ cleanup:
251 if (!warp_client->lock_user_shade) 251 if (!warp_client->lock_user_shade)
252 e_client_unshade(warp_client, warp_client->shade_dir); 252 e_client_unshade(warp_client, warp_client->shade_dir);
253 } 253 }
254 254
255 if (!warp_client->lock_focus_out) 255 if (!warp_client->lock_focus_out)
256 { 256 {
257 evas_object_focus_set(warp_client->frame, 1); 257 evas_object_focus_set(warp_client->frame, 1);
@@ -557,7 +557,7 @@ _e_client_free(E_Client *ec)
557 eina_stringshare_replace(&ec->internal_icon, NULL); 557 eina_stringshare_replace(&ec->internal_icon, NULL);
558 eina_stringshare_replace(&ec->internal_icon_key, NULL); 558 eina_stringshare_replace(&ec->internal_icon_key, NULL);
559 eina_stringshare_replace(&ec->uuid, NULL); 559 eina_stringshare_replace(&ec->uuid, NULL);
560 560
561 focus_stack = eina_list_remove(focus_stack, ec); 561 focus_stack = eina_list_remove(focus_stack, ec);
562 raise_stack = eina_list_remove(raise_stack, ec); 562 raise_stack = eina_list_remove(raise_stack, ec);
563 563
@@ -2422,7 +2422,7 @@ _e_client_frame_update(E_Client *ec)
2422 bordername = "nofocus"; 2422 bordername = "nofocus";
2423 else if (ec->urgent) 2423 else if (ec->urgent)
2424 bordername = "urgent"; 2424 bordername = "urgent";
2425 else if (((ec->icccm.transient_for && (!ec->netwm.type)) || (ec->dialog)) && 2425 else if (((ec->icccm.transient_for && (!ec->netwm.type)) || (ec->dialog)) &&
2426 (e_pixmap_is_x(ec->pixmap))) 2426 (e_pixmap_is_x(ec->pixmap)))
2427 bordername = "dialog"; 2427 bordername = "dialog";
2428 else if (ec->netwm.state.modal) 2428 else if (ec->netwm.state.modal)
@@ -2691,7 +2691,7 @@ e_client_new(E_Pixmap *cp, int first_map, int internal)
2691 ec->new_client = 1; 2691 ec->new_client = 1;
2692 e_comp->new_clients++; 2692 e_comp->new_clients++;
2693 2693
2694 if (!_e_client_hook_call(E_CLIENT_HOOK_NEW_CLIENT, ec)) 2694 if (!_e_client_hook_call(E_CLIENT_HOOK_NEW_CLIENT, ec))
2695 { 2695 {
2696 /* delete the above allocated object */ 2696 /* delete the above allocated object */
2697 //e_object_del(E_OBJECT(ec)); 2697 //e_object_del(E_OBJECT(ec));
@@ -3829,7 +3829,7 @@ e_client_focused_set(E_Client *ec)
3829 3829
3830 _e_client_hook_call(E_CLIENT_HOOK_FOCUS_UNSET, ec_unfocus); 3830 _e_client_hook_call(E_CLIENT_HOOK_FOCUS_UNSET, ec_unfocus);
3831 /* only send event here if we're not being deleted */ 3831 /* only send event here if we're not being deleted */
3832 if ((!e_object_is_del(E_OBJECT(ec_unfocus))) && 3832 if ((!e_object_is_del(E_OBJECT(ec_unfocus))) &&
3833 (e_object_ref_get(E_OBJECT(ec_unfocus)) > 0)) 3833 (e_object_ref_get(E_OBJECT(ec_unfocus)) > 0))
3834 { 3834 {
3835 _e_client_event_simple(ec_unfocus, E_EVENT_CLIENT_FOCUS_OUT); 3835 _e_client_event_simple(ec_unfocus, E_EVENT_CLIENT_FOCUS_OUT);
@@ -4499,7 +4499,7 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
4499 if ((eina_list_count(e_comp->zones) > 1) || 4499 if ((eina_list_count(e_comp->zones) > 1) ||
4500 (policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_query())) 4500 (policy == E_FULLSCREEN_RESIZE) || (!ecore_x_randr_query()))
4501#else 4501#else
4502 if ((eina_list_count(e_comp->zones) > 1) || 4502 if ((eina_list_count(e_comp->zones) > 1) ||
4503 (policy == E_FULLSCREEN_RESIZE)) 4503 (policy == E_FULLSCREEN_RESIZE))
4504#endif 4504#endif
4505 { 4505 {
diff --git a/src/bin/e_client.h b/src/bin/e_client.h
index adb98fca1..6100b8840 100644
--- a/src/bin/e_client.h
+++ b/src/bin/e_client.h
@@ -568,7 +568,7 @@ struct E_Client
568 unsigned char have_property E_BITFIELD; 568 unsigned char have_property E_BITFIELD;
569 unsigned char vkbd E_BITFIELD; 569 unsigned char vkbd E_BITFIELD;
570 } vkbd; 570 } vkbd;
571 571
572 struct { 572 struct {
573 unsigned int steam_game_id; 573 unsigned int steam_game_id;
574 } steam; 574 } steam;
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index e911787f2..642008998 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -67,7 +67,7 @@ _e_comp_visible_object_clip_is(Evas_Object *obj)
67{ 67{
68 Evas_Object *clip; 68 Evas_Object *clip;
69 int a; 69 int a;
70 70
71 clip = evas_object_clip_get(obj); 71 clip = evas_object_clip_get(obj);
72 if (!evas_object_visible_get(clip)) return EINA_FALSE; 72 if (!evas_object_visible_get(clip)) return EINA_FALSE;
73 evas_object_color_get(clip, NULL, NULL, NULL, &a); 73 evas_object_color_get(clip, NULL, NULL, NULL, &a);
@@ -93,7 +93,7 @@ _e_comp_visible_object_is(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coo
93 ) 93 )
94 { 94 {
95 int a; 95 int a;
96 96
97 evas_object_color_get(obj, NULL, NULL, NULL, &a); 97 evas_object_color_get(obj, NULL, NULL, NULL, &a);
98 if (a > 0) 98 if (a > 0)
99 { 99 {
@@ -112,12 +112,12 @@ _e_comp_visible_object_is(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coo
112 else 112 else
113 { 113 {
114 Eina_List *children; 114 Eina_List *children;
115 115
116 if ((children = evas_object_smart_members_get(obj))) 116 if ((children = evas_object_smart_members_get(obj)))
117 { 117 {
118 Eina_List *l; 118 Eina_List *l;
119 Evas_Object *o; 119 Evas_Object *o;
120 120
121 EINA_LIST_FOREACH(children, l, o) 121 EINA_LIST_FOREACH(children, l, o)
122 { 122 {
123 if (_e_comp_visible_object_is(o, x, y, w, h)) 123 if (_e_comp_visible_object_is(o, x, y, w, h))
@@ -144,7 +144,7 @@ static Eina_Bool
144_e_comp_visible_object_is_above(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) 144_e_comp_visible_object_is_above(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
145{ 145{
146 Evas_Object *above; 146 Evas_Object *above;
147 147
148 for (above = evas_object_above_get(obj); above; 148 for (above = evas_object_above_get(obj); above;
149 above = evas_object_above_get(above)) 149 above = evas_object_above_get(above))
150 { 150 {
diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c
index 11b1c0339..596ab52d4 100644
--- a/src/bin/e_comp_canvas.c
+++ b/src/bin/e_comp_canvas.c
@@ -615,7 +615,7 @@ e_comp_canvas_update(void)
615 { 615 {
616 zone = NULL; 616 zone = NULL;
617 617
618 printf("@ match screens %p[%i] = %i %i %ix%i -- %i\n", 618 printf("@ match screens %p[%i] = %i %i %ix%i -- %i\n",
619 scr, scr->escreen, scr->x, scr->y, scr->w, scr->h, scr->escreen); 619 scr, scr->escreen, scr->x, scr->y, scr->w, scr->h, scr->escreen);
620 EINA_LIST_FOREACH(zones, ll, zone) 620 EINA_LIST_FOREACH(zones, ll, zone)
621 { 621 {
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index cf9f3c3de..a260585d6 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -612,7 +612,7 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw)
612 ((name) && (m->name) && (!e_util_glob_match(name, m->name)))) 612 ((name) && (m->name) && (!e_util_glob_match(name, m->name))))
613 continue; 613 continue;
614 if (!_e_comp_object_shadow_client_match(cw->ec, m)) continue; 614 if (!_e_comp_object_shadow_client_match(cw->ec, m)) continue;
615 615
616 focus = m->focus; 616 focus = m->focus;
617 urgent = m->urgent; 617 urgent = m->urgent;
618 no_shadow = m->no_shadow; 618 no_shadow = m->no_shadow;
@@ -1477,7 +1477,7 @@ _e_comp_intercept_stack_helper(E_Comp_Object *cw, Evas_Object *stack, E_Comp_Obj
1477 } 1477 }
1478 if (!o) 1478 if (!o)
1479 /* top client layer window hasn't been stacked yet. this probably shouldn't happen? 1479 /* top client layer window hasn't been stacked yet. this probably shouldn't happen?
1480 * return here since the top client layer window 1480 * return here since the top client layer window
1481 */ 1481 */
1482 { 1482 {
1483 E_Client *ec; 1483 E_Client *ec;
@@ -2761,7 +2761,7 @@ _e_comp_object_util_show(void *data EINA_UNUSED, Evas_Object *obj)
2761 } 2761 }
2762 else 2762 else
2763 e_comp_shape_queue(); 2763 e_comp_shape_queue();
2764 2764
2765 evas_object_show(obj); 2765 evas_object_show(obj);
2766 if (ref && (!stopping)) 2766 if (ref && (!stopping))
2767 { 2767 {
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 76775ff7a..a32ff16ac 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -3321,7 +3321,7 @@ e_comp_wl_output_init(const char *id, const char *make, const char *model,
3321 3321
3322 e_comp_wl->outputs = eina_list_append(e_comp_wl->outputs, output); 3322 e_comp_wl->outputs = eina_list_append(e_comp_wl->outputs, output);
3323 3323
3324 output->global = 3324 output->global =
3325 wl_global_create(e_comp_wl->wl.disp, &wl_output_interface, 3325 wl_global_create(e_comp_wl->wl.disp, &wl_output_interface,
3326 2, output, _e_comp_wl_cb_output_bind); 3326 2, output, _e_comp_wl_cb_output_bind);
3327 3327
diff --git a/src/bin/e_comp_wl_dmabuf.c b/src/bin/e_comp_wl_dmabuf.c
index 55900061d..799a81033 100644
--- a/src/bin/e_comp_wl_dmabuf.c
+++ b/src/bin/e_comp_wl_dmabuf.c
@@ -462,7 +462,7 @@ linux_dmabuf_buffer_get_user_data(struct linux_dmabuf_buffer *buffer)
462 return buffer->user_data; 462 return buffer->user_data;
463} 463}
464 464
465static const struct zwp_linux_dmabuf_v1_interface linux_dmabuf_implementation = 465static const struct zwp_linux_dmabuf_v1_interface linux_dmabuf_implementation =
466{ 466{
467 linux_dmabuf_destroy, 467 linux_dmabuf_destroy,
468 linux_dmabuf_create_params 468 linux_dmabuf_create_params
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 93e4e6a0d..a217a5eff 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -416,7 +416,7 @@ _e_comp_x_client_new_helper(E_Client *ec)
416 ec->comp_data->ph = ec->h; 416 ec->comp_data->ph = ec->h;
417 } 417 }
418 ec->changes.size = 1; 418 ec->changes.size = 1;
419 419
420 420
421 e_pixmap_visual_cmap_set(ec->pixmap, ec->comp_data->initial_attributes.visual, ec->comp_data->initial_attributes.colormap); 421 e_pixmap_visual_cmap_set(ec->pixmap, ec->comp_data->initial_attributes.visual, ec->comp_data->initial_attributes.colormap);
422 if (ec->override && (!ec->internal)) 422 if (ec->override && (!ec->internal))
@@ -613,7 +613,7 @@ _e_comp_x_client_new_helper(E_Client *ec)
613 deskxy[1]); 613 deskxy[1]);
614 614
615 if (desk) e_client_desk_set(ec, desk); 615 if (desk) e_client_desk_set(ec, desk);
616 616
617 } 617 }
618 } 618 }
619 619
@@ -758,7 +758,7 @@ _e_comp_x_post_client_idler_cb(void *d EINA_UNUSED)
758 parent = ec->e.state.video_parent_client; 758 parent = ec->e.state.video_parent_client;
759 twin = _e_comp_x_client_window_get(parent); 759 twin = _e_comp_x_client_window_get(parent);
760 ecore_x_window_move(twin, 760 ecore_x_window_move(twin,
761 parent->client.x + 761 parent->client.x +
762 ec->e.state.video_position.x, 762 ec->e.state.video_position.x,
763 parent->client.y + 763 parent->client.y +
764 ec->e.state.video_position.y); 764 ec->e.state.video_position.y);
@@ -806,7 +806,7 @@ _e_comp_x_post_client_idler_cb(void *d EINA_UNUSED)
806 ec->netwm.sync.serial++); 806 ec->netwm.sync.serial++);
807 } 807 }
808 } 808 }
809 809
810 if (ec->post_move || ec->post_resize) 810 if (ec->post_move || ec->post_resize)
811 _e_comp_x_client_move_resize_send(ec); 811 _e_comp_x_client_move_resize_send(ec);
812 } 812 }
@@ -1817,7 +1817,7 @@ _e_comp_x_configure_request(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore
1817 y = ev->y; 1817 y = ev->y;
1818 } 1818 }
1819 } 1819 }
1820 1820
1821 if ((ev->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W) || 1821 if ((ev->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W) ||
1822 (ev->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H)) 1822 (ev->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H))
1823 { 1823 {
@@ -1826,7 +1826,7 @@ _e_comp_x_configure_request(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore
1826 if (ev->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H) 1826 if (ev->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H)
1827 h = ev->h, _e_comp_x_client_data_get(ec)->initial_attributes.h = ev->h; 1827 h = ev->h, _e_comp_x_client_data_get(ec)->initial_attributes.h = ev->h;
1828 } 1828 }
1829 1829
1830 e_comp_object_frame_xy_adjust(ec->frame, x, y, &x, &y); 1830 e_comp_object_frame_xy_adjust(ec->frame, x, y, &x, &y);
1831 e_comp_object_frame_wh_adjust(ec->frame, w, h, &w, &h); 1831 e_comp_object_frame_wh_adjust(ec->frame, w, h, &w, &h);
1832 1832
@@ -3257,7 +3257,7 @@ _e_comp_x_grab_replay(void *data EINA_UNUSED, int type, void *event)
3257 E_Client *ec; 3257 E_Client *ec;
3258 3258
3259 if (type != ECORE_EVENT_MOUSE_BUTTON_DOWN) return ECORE_CALLBACK_DONE; 3259 if (type != ECORE_EVENT_MOUSE_BUTTON_DOWN) return ECORE_CALLBACK_DONE;
3260 if ((!e_config->pass_click_on) && 3260 if ((!e_config->pass_click_on) &&
3261 (!e_config->always_click_to_raise) && // this works even if not on click-to-focus 3261 (!e_config->always_click_to_raise) && // this works even if not on click-to-focus
3262 (!e_config->always_click_to_focus) // this works even if not on click-to-focus 3262 (!e_config->always_click_to_focus) // this works even if not on click-to-focus
3263 ) 3263 )
@@ -3588,7 +3588,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
3588 ec->icccm.name = eina_stringshare_add(nname); 3588 ec->icccm.name = eina_stringshare_add(nname);
3589 ec->icccm.class = eina_stringshare_add(nclass); 3589 ec->icccm.class = eina_stringshare_add(nclass);
3590 ec->hacks.mapping_change = 3590 ec->hacks.mapping_change =
3591 ((!e_util_strcasecmp(ec->icccm.class, "vmplayer")) || 3591 ((!e_util_strcasecmp(ec->icccm.class, "vmplayer")) ||
3592 (!e_util_strcasecmp(ec->icccm.class, "vmware"))); 3592 (!e_util_strcasecmp(ec->icccm.class, "vmware")));
3593 if (ec->hacks.mapping_change) 3593 if (ec->hacks.mapping_change)
3594 _e_comp_x_mapping_change_disabled++; 3594 _e_comp_x_mapping_change_disabled++;
@@ -4535,7 +4535,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
4535 { 4535 {
4536 E_Exec_Instance *inst; 4536 E_Exec_Instance *inst;
4537 4537
4538 if (((!ec->lock_border) || (!ec->border.name)) && 4538 if (((!ec->lock_border) || (!ec->border.name)) &&
4539 (ec->internal || cd->reparented)) 4539 (ec->internal || cd->reparented))
4540 { 4540 {
4541 ec->border.changed = 1; 4541 ec->border.changed = 1;
diff --git a/src/bin/e_comp_x_randr.c b/src/bin/e_comp_x_randr.c
index e6f4c78c0..7754fd11e 100644
--- a/src/bin/e_comp_x_randr.c
+++ b/src/bin/e_comp_x_randr.c
@@ -75,7 +75,7 @@ _output_screen_get(Ecore_X_Window root, Ecore_X_Randr_Output o)
75static Ecore_X_Randr_Edid_Display_Interface_Type 75static Ecore_X_Randr_Edid_Display_Interface_Type
76_output_conn_type_get(Ecore_X_Window root, Ecore_X_Randr_Output o) 76_output_conn_type_get(Ecore_X_Window root, Ecore_X_Randr_Output o)
77{ 77{
78 // get what kind of connector (hdmi, dvi, displayport etc.) - vga is 78 // get what kind of connector (hdmi, dvi, displayport etc.) - vga is
79 Ecore_X_Randr_Edid_Display_Interface_Type type; 79 Ecore_X_Randr_Edid_Display_Interface_Type type;
80 unsigned long len = 0; 80 unsigned long len = 0;
81 unsigned char *edid = ecore_x_randr_output_edid_get(root, o, &len); 81 unsigned char *edid = ecore_x_randr_output_edid_get(root, o, &len);
diff --git a/src/bin/e_config_data.h b/src/bin/e_config_data.h
index b52ea3225..148c69322 100644
--- a/src/bin/e_config_data.h
+++ b/src/bin/e_config_data.h
@@ -1,7 +1,7 @@
1#ifdef E_TYPEDEFS 1#ifdef E_TYPEDEFS
2 2
3/** \def E_CONFIG_DD_NEW(str, typ) 3/** \def E_CONFIG_DD_NEW(str, typ)
4 * is used to create definition of a struct 4 * is used to create definition of a struct
5 * \str str name to give to struct 5 * \str str name to give to struct
6 * \typ typ the actual struct type 6 * \typ typ the actual struct type
7 */ 7 */
@@ -9,7 +9,7 @@
9 e_config_descriptor_new(str, sizeof(typ)) 9 e_config_descriptor_new(str, sizeof(typ))
10 10
11/** \def E_CONFIG_DD_FREE(eed) 11/** \def E_CONFIG_DD_FREE(eed)
12 * is used to free definition of a struct 12 * is used to free definition of a struct
13 * \eed eed the pointer created by \link #E_CONFIG_DD_NEW 13 * \eed eed the pointer created by \link #E_CONFIG_DD_NEW
14 */ 14 */
15#define E_CONFIG_DD_FREE(eed) if (eed) { e_config_descriptor_free((eed)); (eed) = NULL; } 15#define E_CONFIG_DD_FREE(eed) if (eed) { e_config_descriptor_free((eed)); (eed) = NULL; }
@@ -19,7 +19,7 @@
19 19
20/** \def E_CONFIG_LIST(edd, type, member, eddtype) 20/** \def E_CONFIG_LIST(edd, type, member, eddtype)
21 * declares a struct member to be included definition 21 * declares a struct member to be included definition
22 * list type must be Evas_List and not Ecore_List 22 * list type must be Evas_List and not Ecore_List
23 * \edd edd the pointer created by \link #E_CONFIG_DD_NEW 23 * \edd edd the pointer created by \link #E_CONFIG_DD_NEW
24 * \type type struct type 24 * \type type struct type
25 * \member member member of struct 25 * \member member member of struct
@@ -29,7 +29,7 @@
29 29
30/** \def E_CONFIG_HASH(edd, type, member, eddtype) 30/** \def E_CONFIG_HASH(edd, type, member, eddtype)
31 * declares a struct member to be included definition 31 * declares a struct member to be included definition
32 * list type must be Evas_Hash and not Ecore_Hash 32 * list type must be Evas_Hash and not Ecore_Hash
33 * \edd edd the pointer created by \link #E_CONFIG_DD_NEW 33 * \edd edd the pointer created by \link #E_CONFIG_DD_NEW
34 * \type type struct type 34 * \type type struct type
35 * \member member member of struct 35 * \member member member of struct
diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c
index 8643189e7..e348973cc 100644
--- a/src/bin/e_config_dialog.c
+++ b/src/bin/e_config_dialog.c
@@ -200,7 +200,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
200 cfd->dia->data = cfd; 200 cfd->dia->data = cfd;
201 e_dialog_title_set(cfd->dia, cfd->title); 201 e_dialog_title_set(cfd->dia, cfd->title);
202 cfdata = cfd->cfdata; 202 cfdata = cfd->cfdata;
203 if (cfd->view->create_cfdata && (!cfd->cfdata)) 203 if (cfd->view->create_cfdata && (!cfd->cfdata))
204 cfd->cfdata = cfd->view->create_cfdata(cfd); 204 cfd->cfdata = cfd->view->create_cfdata(cfd);
205 205
206 evas = evas_object_evas_get(cfd->dia->win); 206 evas = evas_object_evas_get(cfd->dia->win);
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 44b8edd07..b62b6399a 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -5526,14 +5526,14 @@ _e_fm2_icon_next_find(Evas_Object *obj, int next, int (*match_func)(E_Fm2_Icon *
5526 sd = evas_object_smart_data_get(obj); 5526 sd = evas_object_smart_data_get(obj);
5527 if (!sd) return NULL; 5527 if (!sd) return NULL;
5528 if (!sd->icons) return NULL; 5528 if (!sd->icons) return NULL;
5529 5529
5530 l = eina_list_data_find_list(sd->icons, (sd->range_selected) ? 5530 l = eina_list_data_find_list(sd->icons, (sd->range_selected) ?
5531 sd->range_selected : 5531 sd->range_selected :
5532 sd->last_selected); 5532 sd->last_selected);
5533 5533
5534 if (!next) return eina_list_data_get(l); 5534 if (!next) return eina_list_data_get(l);
5535 5535
5536 if (!l) return (next == 1) ? eina_list_data_get(sd->icons) : 5536 if (!l) return (next == 1) ? eina_list_data_get(sd->icons) :
5537 eina_list_last_data_get(sd->icons); 5537 eina_list_last_data_get(sd->icons);
5538 5538
5539 view_mode = _e_fm2_view_mode_get(sd); 5539 view_mode = _e_fm2_view_mode_get(sd);
@@ -5541,23 +5541,23 @@ _e_fm2_icon_next_find(Evas_Object *obj, int next, int (*match_func)(E_Fm2_Icon *
5541 (view_mode == E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS) || 5541 (view_mode == E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS) ||
5542 (view_mode == E_FM2_VIEW_MODE_CUSTOM_ICONS)) 5542 (view_mode == E_FM2_VIEW_MODE_CUSTOM_ICONS))
5543 custom = 1; 5543 custom = 1;
5544 5544
5545 ic_next = NULL; 5545 ic_next = NULL;
5546 5546
5547 if (custom || match_func) 5547 if (custom || match_func)
5548 { 5548 {
5549 ic = eina_list_data_get(l); 5549 ic = eina_list_data_get(l);
5550 x = ic->x; 5550 x = ic->x;
5551 y = ic->y; 5551 y = ic->y;
5552 5552
5553 EINA_LIST_FOREACH(sd->icons, l, ic) 5553 EINA_LIST_FOREACH(sd->icons, l, ic)
5554 { 5554 {
5555 if (match_func && !match_func(ic, data)) continue; 5555 if (match_func && !match_func(ic, data)) continue;
5556 5556
5557 int dx = (ic->x - x); 5557 int dx = (ic->x - x);
5558 int dy = (ic->y - y); 5558 int dy = (ic->y - y);
5559 int sgnx = (dx) ? dx / abs(dx) : 0; 5559 int sgnx = (dx) ? dx / abs(dx) : 0;
5560 5560
5561 if ((next == sgnx) && (abs(dx) >= abs(dy))) 5561 if ((next == sgnx) && (abs(dx) >= abs(dy)))
5562 { 5562 {
5563 dist = abs(dy) + abs(dx); 5563 dist = abs(dy) + abs(dx);
@@ -5596,7 +5596,7 @@ _e_fm2_icon_sel_prev(Evas_Object *obj, Eina_Bool add)
5596 { 5596 {
5597 _e_fm2_icon_range_select(ic_prev); 5597 _e_fm2_icon_range_select(ic_prev);
5598 } 5598 }
5599 5599
5600 evas_object_smart_callback_call(obj, "selection_change", NULL); 5600 evas_object_smart_callback_call(obj, "selection_change", NULL);
5601 _e_fm2_icon_make_visible(ic_prev); 5601 _e_fm2_icon_make_visible(ic_prev);
5602} 5602}
@@ -5607,7 +5607,7 @@ _e_fm2_icon_sel_next(Evas_Object *obj, Eina_Bool add)
5607 E_Fm2_Icon *ic_next; 5607 E_Fm2_Icon *ic_next;
5608 5608
5609 ic_next = _e_fm2_icon_next_find(obj, 1, NULL, NULL); 5609 ic_next = _e_fm2_icon_next_find(obj, 1, NULL, NULL);
5610 5610
5611 if (!ic_next) return; 5611 if (!ic_next) return;
5612 5612
5613 if ((!add) || ic_next->sd->config->selection.single) 5613 if ((!add) || ic_next->sd->config->selection.single)
@@ -5636,7 +5636,7 @@ _e_fm2_icon_sel_down(Evas_Object *obj, Eina_Bool add)
5636 if (!sd->icons) return; 5636 if (!sd->icons) return;
5637 5637
5638 ic = (sd->range_selected) ? sd->range_selected : sd->last_selected; 5638 ic = (sd->range_selected) ? sd->range_selected : sd->last_selected;
5639 5639
5640 if (ic) 5640 if (ic)
5641 { 5641 {
5642 ic_down = ic; 5642 ic_down = ic;
@@ -5644,7 +5644,7 @@ _e_fm2_icon_sel_down(Evas_Object *obj, Eina_Bool add)
5644 { 5644 {
5645 int dx = (ic2->x - ic->x); 5645 int dx = (ic2->x - ic->x);
5646 int dy = (ic2->y - ic->y); 5646 int dy = (ic2->y - ic->y);
5647 5647
5648 if ((dy > 0) && (abs(dy) > abs(dx))) 5648 if ((dy > 0) && (abs(dy) > abs(dx)))
5649 { 5649 {
5650 dist = abs(dx)+abs(dy); 5650 dist = abs(dx)+abs(dy);
@@ -5656,11 +5656,11 @@ _e_fm2_icon_sel_down(Evas_Object *obj, Eina_Bool add)
5656 } 5656 }
5657 } 5657 }
5658 } 5658 }
5659 else 5659 else
5660 { 5660 {
5661 ic_down = eina_list_data_get(sd->icons); 5661 ic_down = eina_list_data_get(sd->icons);
5662 } 5662 }
5663 5663
5664 if ((!add) || ic_down->sd->config->selection.single) 5664 if ((!add) || ic_down->sd->config->selection.single)
5665 { 5665 {
5666 _e_fm2_icon_desel_any(obj); 5666 _e_fm2_icon_desel_any(obj);
@@ -5688,7 +5688,7 @@ _e_fm2_icon_sel_up(Evas_Object *obj, Eina_Bool add)
5688 if (!sd->icons) return; 5688 if (!sd->icons) return;
5689 5689
5690 ic = (sd->range_selected) ? sd->range_selected : sd->last_selected; 5690 ic = (sd->range_selected) ? sd->range_selected : sd->last_selected;
5691 5691
5692 if (ic) 5692 if (ic)
5693 { 5693 {
5694 ic_down = ic; 5694 ic_down = ic;
@@ -5696,7 +5696,7 @@ _e_fm2_icon_sel_up(Evas_Object *obj, Eina_Bool add)
5696 { 5696 {
5697 int dx = (ic2->x - ic->x); 5697 int dx = (ic2->x - ic->x);
5698 int dy = (ic2->y - ic->y); 5698 int dy = (ic2->y - ic->y);
5699 5699
5700 if ((dy < 0) && (abs(dy) > abs(dx))) 5700 if ((dy < 0) && (abs(dy) > abs(dx)))
5701 { 5701 {
5702 dist = abs(dx) + abs(dy); 5702 dist = abs(dx) + abs(dy);
@@ -5713,7 +5713,7 @@ _e_fm2_icon_sel_up(Evas_Object *obj, Eina_Bool add)
5713 { 5713 {
5714 ic_down = eina_list_last_data_get(sd->icons); 5714 ic_down = eina_list_last_data_get(sd->icons);
5715 } 5715 }
5716 5716
5717 if ((!add) || ic_down->sd->config->selection.single) 5717 if ((!add) || ic_down->sd->config->selection.single)
5718 { 5718 {
5719 _e_fm2_icon_desel_any(obj); 5719 _e_fm2_icon_desel_any(obj);
@@ -5734,25 +5734,25 @@ _e_fm2_icon_range_select(E_Fm2_Icon *ic)
5734 const Eina_List *l; 5734 const Eina_List *l;
5735 E_Fm2_Icon *ic2; 5735 E_Fm2_Icon *ic2;
5736 E_Fm2_Icon *last; 5736 E_Fm2_Icon *last;
5737 5737
5738 char view_mode = _e_fm2_view_mode_get(ic->sd); 5738 char view_mode = _e_fm2_view_mode_get(ic->sd);
5739 5739
5740 if (!ic->sd->range_selected) 5740 if (!ic->sd->range_selected)
5741 { 5741 {
5742 last = ic->sd->last_selected; 5742 last = ic->sd->last_selected;
5743 ic->sd->range_select_anchor = last; 5743 ic->sd->range_select_anchor = last;
5744 } 5744 }
5745 else 5745 else
5746 { 5746 {
5747 last = ic->sd->range_select_anchor; 5747 last = ic->sd->range_select_anchor;
5748 } 5748 }
5749 5749
5750 _e_fm2_icon_desel_any(ic->sd->obj); 5750 _e_fm2_icon_desel_any(ic->sd->obj);
5751 5751
5752 if ((!last) || (last == ic)) 5752 if ((!last) || (last == ic))
5753 { 5753 {
5754 _e_fm2_icon_select(ic); 5754 _e_fm2_icon_select(ic);
5755 ic->sd->range_select_anchor = ic; 5755 ic->sd->range_select_anchor = ic;
5756 } 5756 }
5757 else if ((view_mode == E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS) || 5757 else if ((view_mode == E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS) ||
5758 (view_mode == E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS) || 5758 (view_mode == E_FM2_VIEW_MODE_CUSTOM_GRID_ICONS) ||
@@ -5762,7 +5762,7 @@ _e_fm2_icon_range_select(E_Fm2_Icon *ic)
5762 int boundx = (ic->x < last->x) ? (last->x + last->w) : (ic->x + ic->w); 5762 int boundx = (ic->x < last->x) ? (last->x + last->w) : (ic->x + ic->w);
5763 int topy = (ic->y <= last->y) ? ic->y : last->y; 5763 int topy = (ic->y <= last->y) ? ic->y : last->y;
5764 int boundy = (ic->y < last->y) ? (last->y + last->h) : (ic->y + ic->h); 5764 int boundy = (ic->y < last->y) ? (last->y + last->h) : (ic->y + ic->h);
5765 5765
5766 EINA_LIST_FOREACH(ic->sd->icons, l, ic2) 5766 EINA_LIST_FOREACH(ic->sd->icons, l, ic2)
5767 { 5767 {
5768 if ((ic2->x >= topx) && (ic2->x < boundx) && 5768 if ((ic2->x >= topx) && (ic2->x < boundx) &&
@@ -5780,7 +5780,7 @@ _e_fm2_icon_range_select(E_Fm2_Icon *ic)
5780 if (!trig) break; 5780 if (!trig) break;
5781 } 5781 }
5782 } 5782 }
5783 5783
5784 ic->sd->range_selected = ic; 5784 ic->sd->range_selected = ic;
5785} 5785}
5786 5786
diff --git a/src/bin/e_fm/e_fm_ipc.c b/src/bin/e_fm/e_fm_ipc.c
index c357f4cf4..917ae21f9 100644
--- a/src/bin/e_fm/e_fm_ipc.c
+++ b/src/bin/e_fm/e_fm_ipc.c
@@ -1357,7 +1357,7 @@ _e_fm_ipc_timer_cb(void *d EINA_UNUSED)
1357 ecore_ipc_server_send(_e_fm_ipc_server, 1357 ecore_ipc_server_send(_e_fm_ipc_server,
1358 6 /*E_IPC_DOMAIN_FM*/, 1358 6 /*E_IPC_DOMAIN_FM*/,
1359 E_FM_OP_VOLUME_LIST_DONE, 1359 E_FM_OP_VOLUME_LIST_DONE,
1360 0, 0, 0, "", 1); 1360 0, 0, 0, "", 1);
1361 _init_timer_run = EINA_TRUE; 1361 _init_timer_run = EINA_TRUE;
1362 return EINA_FALSE; 1362 return EINA_FALSE;
1363} 1363}
diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c
index 0fcffa249..9b10b3117 100644
--- a/src/bin/e_fm/e_fm_main_eeze.c
+++ b/src/bin/e_fm/e_fm_main_eeze.c
@@ -420,7 +420,7 @@ _e_fm_main_eeze_volume_add(const char *syspath,
420 if ((v2) && (v2->partition == 0)) 420 if ((v2) && (v2->partition == 0))
421 _e_fm_main_eeze_volume_del(v2->udi); 421 _e_fm_main_eeze_volume_del(v2->udi);
422 } 422 }
423 423
424 s = e_storage_find(v->parent); 424 s = e_storage_find(v->parent);
425 INF("++VOL:\n syspath: %s\n uuid: %s\n fstype: %s\n size: %llu\n label: %s\n" 425 INF("++VOL:\n syspath: %s\n uuid: %s\n fstype: %s\n size: %llu\n label: %s\n"
426 " partition: %d\n partition_number: %d\n partition_label: %s\n mounted: %d\n mount_point: %s", 426 " partition: %d\n partition_number: %d\n partition_label: %s\n mounted: %d\n mount_point: %s",
@@ -542,7 +542,7 @@ _e_fm_main_eeze_volume_mount(E_Volume *v)
542 542
543 _e_fm_main_eeze_mount_point_set(v); 543 _e_fm_main_eeze_mount_point_set(v);
544 if (!v->mount_point) goto error; 544 if (!v->mount_point) goto error;
545 INF("mount %s %s [fs type = %s]", v->udi, v->mount_point, v->fstype); 545 INF("mount %s %s [fs type = %s]", v->udi, v->mount_point, v->fstype);
546 eeze_disk_mountopts_set(v->disk, opts); 546 eeze_disk_mountopts_set(v->disk, opts);
547 if (!eeze_disk_mount_wrapper_get(v->disk)) 547 if (!eeze_disk_mount_wrapper_get(v->disk))
548 { 548 {
@@ -716,27 +716,27 @@ _e_fm_main_eeze_init(void)
716 eeze_init(); 716 eeze_init();
717 eina_log_domain_level_set("eeze_disk", EINA_LOG_LEVEL_DBG); 717 eina_log_domain_level_set("eeze_disk", EINA_LOG_LEVEL_DBG);
718 eeze_mount_tabs_watch(); 718 eeze_mount_tabs_watch();
719 ecore_event_handler_add(EEZE_EVENT_DISK_MOUNT, 719 ecore_event_handler_add(EEZE_EVENT_DISK_MOUNT,
720 (Ecore_Event_Handler_Cb)_e_fm_main_eeze_cb_vol_mounted, NULL); 720 (Ecore_Event_Handler_Cb)_e_fm_main_eeze_cb_vol_mounted, NULL);
721 ecore_event_handler_add(EEZE_EVENT_DISK_UNMOUNT, 721 ecore_event_handler_add(EEZE_EVENT_DISK_UNMOUNT,
722 (Ecore_Event_Handler_Cb)_e_fm_main_eeze_cb_vol_unmounted, NULL); 722 (Ecore_Event_Handler_Cb)_e_fm_main_eeze_cb_vol_unmounted, NULL);
723 ecore_event_handler_add(EEZE_EVENT_DISK_EJECT, 723 ecore_event_handler_add(EEZE_EVENT_DISK_EJECT,
724 (Ecore_Event_Handler_Cb)_e_fm_main_eeze_cb_vol_ejected, NULL); 724 (Ecore_Event_Handler_Cb)_e_fm_main_eeze_cb_vol_ejected, NULL);
725 ecore_event_handler_add(EEZE_EVENT_DISK_ERROR, 725 ecore_event_handler_add(EEZE_EVENT_DISK_ERROR,
726 (Ecore_Event_Handler_Cb)_e_fm_main_eeze_cb_vol_error, NULL); 726 (Ecore_Event_Handler_Cb)_e_fm_main_eeze_cb_vol_error, NULL);
727 727
728 ecore_event_handler_add(ECORE_EXE_EVENT_ADD, 728 ecore_event_handler_add(ECORE_EXE_EVENT_ADD,
729 (Ecore_Event_Handler_Cb)_scanner_add, pfx); 729 (Ecore_Event_Handler_Cb)_scanner_add, pfx);
730 ecore_event_handler_add(ECORE_EXE_EVENT_DEL, 730 ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
731 (Ecore_Event_Handler_Cb)_scanner_del, pfx); 731 (Ecore_Event_Handler_Cb)_scanner_del, pfx);
732 732
733 ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, 733 ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD,
734 (Ecore_Event_Handler_Cb)_scanner_con, NULL); 734 (Ecore_Event_Handler_Cb)_scanner_con, NULL);
735 ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL, 735 ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL,
736 (Ecore_Event_Handler_Cb)_scanner_disc, NULL); 736 (Ecore_Event_Handler_Cb)_scanner_disc, NULL);
737 ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA, 737 ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA,
738 (Ecore_Event_Handler_Cb)_scanner_data, NULL); 738 (Ecore_Event_Handler_Cb)_scanner_data, NULL);
739 ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ERROR, 739 ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ERROR,
740 (Ecore_Event_Handler_Cb)_scanner_err, NULL); 740 (Ecore_Event_Handler_Cb)_scanner_err, NULL);
741 741
742 eet_setup(); 742 eet_setup();
diff --git a/src/bin/e_fm/e_fm_main_udisks2.c b/src/bin/e_fm/e_fm_main_udisks2.c
index da5e3b6c8..b4f85134c 100644
--- a/src/bin/e_fm/e_fm_main_udisks2.c
+++ b/src/bin/e_fm/e_fm_main_udisks2.c
@@ -143,7 +143,7 @@ _e_fm_main_udisks2_volume_block_add(E_Volume *v, U2_Block *u2)
143 eina_stringshare_replace(&v->fstype, u2->IdType); 143 eina_stringshare_replace(&v->fstype, u2->IdType);
144 eina_stringshare_replace(&v->label, u2->IdLabel); 144 eina_stringshare_replace(&v->label, u2->IdLabel);
145 if (!v->label) v->label = eina_stringshare_ref(u2->HintName); 145 if (!v->label) v->label = eina_stringshare_ref(u2->HintName);
146 146
147} 147}
148 148
149static void 149static void
@@ -886,7 +886,7 @@ _volume_eject_umount_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *p
886 vols_ejecting = eina_list_remove(vols_ejecting, v); 886 vols_ejecting = eina_list_remove(vols_ejecting, v);
887 _volume_eject(v->storage->proxy); 887 _volume_eject(v->storage->proxy);
888 } 888 }
889 889
890} 890}
891 891
892static Eldbus_Pending * 892static Eldbus_Pending *
diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c
index 5dd3d7b6d..537e48e88 100644
--- a/src/bin/e_focus.c
+++ b/src/bin/e_focus.c
@@ -9,7 +9,7 @@ static Eina_Bool _e_focus_raise_timer(void *data);
9E_API void 9E_API void
10e_focus_event_mouse_in(E_Client *ec) 10e_focus_event_mouse_in(E_Client *ec)
11{ 11{
12 12
13 if ((e_config->focus_policy == E_FOCUS_MOUSE) || 13 if ((e_config->focus_policy == E_FOCUS_MOUSE) ||
14 (e_config->focus_policy == E_FOCUS_SLOPPY)) 14 (e_config->focus_policy == E_FOCUS_SLOPPY))
15 { 15 {
diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
index 6495a3902..de6d89cba 100644
--- a/src/bin/e_gadget.c
+++ b/src/bin/e_gadget.c
@@ -2817,7 +2817,7 @@ _editor_pointer_button(Gadget_Item *active, int t EINA_UNUSED, Ecore_Event_Mouse
2817 { 2817 {
2818 E_Gadget_Config *zgc, *z; 2818 E_Gadget_Config *zgc, *z;
2819 Eina_List *l; 2819 Eina_List *l;
2820 2820
2821 if (ev->buttons == 1) 2821 if (ev->buttons == 1)
2822 { 2822 {
2823 EINA_LIST_FOREACH(sites->sites, l, zgs) 2823 EINA_LIST_FOREACH(sites->sites, l, zgs)
@@ -2856,7 +2856,7 @@ _editor_pointer_button(Gadget_Item *active, int t EINA_UNUSED, Ecore_Event_Mouse
2856 evas_object_smart_callback_call(zzgs->layout, "gadget_site_dropped", pointer_site); 2856 evas_object_smart_callback_call(zzgs->layout, "gadget_site_dropped", pointer_site);
2857 _gadget_free(zgc); 2857 _gadget_free(zgc);
2858 } 2858 }
2859 2859
2860 } 2860 }
2861 E_FREE_FUNC(pointer_site, evas_object_del); 2861 E_FREE_FUNC(pointer_site, evas_object_del);
2862 return ECORE_CALLBACK_RENEW; 2862 return ECORE_CALLBACK_RENEW;
diff --git a/src/bin/e_gadget_loader.c b/src/bin/e_gadget_loader.c
index ac8b8d62f..24913c915 100644
--- a/src/bin/e_gadget_loader.c
+++ b/src/bin/e_gadget_loader.c
@@ -263,7 +263,7 @@ action_request(void *data, Evas_Object *obj, void *event_info)
263 h = eina_hash_pointer_new((Eina_Free_Cb)_ar_bind_del); 263 h = eina_hash_pointer_new((Eina_Free_Cb)_ar_bind_del);
264 eina_hash_add(display_actions, &d, h); 264 eina_hash_add(display_actions, &d, h);
265 } 265 }
266 266
267 ar_bind = action_route_bind_action(ar_global, action); 267 ar_bind = action_route_bind_action(ar_global, action);
268 action_route_bind_add_listener(ar_bind, &_ar_bind_interface, ga); 268 action_route_bind_add_listener(ar_bind, &_ar_bind_interface, ga);
269 wl_display_roundtrip(ecore_wl2_display_get(d)); 269 wl_display_roundtrip(ecore_wl2_display_get(d));
diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index c65a35227..07ff3ad7e 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -153,7 +153,7 @@ e_hints_init(Ecore_Window root, Ecore_Window propwin)
153 for (;; ) 153 for (;; )
154 { 154 {
155 Ecore_X_Window selfwin = 0; 155 Ecore_X_Window selfwin = 0;
156 156
157 /* check that supporting wm win points to itself to be valid */ 157 /* check that supporting wm win points to itself to be valid */
158 nwins = ecore_x_window_prop_window_get(twin, 158 nwins = ecore_x_window_prop_window_get(twin,
159 ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK, 159 ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK,
@@ -365,7 +365,7 @@ e_hints_client_stacking_set(void)
365 break; 365 break;
366 } 366 }
367 } 367 }
368 368
369 if (i < c - non_x) 369 if (i < c - non_x)
370 { 370 {
371#ifdef CLIENT_STACK_DEBUG 371#ifdef CLIENT_STACK_DEBUG