summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2020-05-13 19:36:06 +0000
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-14 14:17:19 +0200
commit28080ccc046996f5b948e7f93b16b3380e7eb934 (patch)
tree4dd31feeea7baf4f12ed709367799e6a2f4fa613 /src
parent4d519842865d540b707265eb8047b9e12ed130c5 (diff)
tree-wide: get rid of trailing whitespace (last part)
Remove trailing whitespaces Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11832
Diffstat (limited to 'src')
-rw-r--r--src/modules/wireless/wireless.c4
-rw-r--r--src/modules/wizard/e_wizard.c2
-rw-r--r--src/modules/wizard/page_010.c2
-rw-r--r--src/modules/wizard/page_011.c2
-rw-r--r--src/modules/wizard/page_040.c4
-rw-r--r--src/modules/wizard/page_110.c4
-rw-r--r--src/modules/wizard/page_115.c4
-rw-r--r--src/modules/wl_drm/e_mod_main.c6
-rw-r--r--src/modules/wl_fb/e_mod_main.c2
-rw-r--r--src/modules/wl_x11/e_mod_main.c2
-rw-r--r--src/modules/xwayland/e_mod_main.c36
-rw-r--r--src/tests/override_fullscreen.c2
12 files changed, 35 insertions, 35 deletions
diff --git a/src/modules/wireless/wireless.c b/src/modules/wireless/wireless.c
index 1328609fd..866339442 100644
--- a/src/modules/wireless/wireless.c
+++ b/src/modules/wireless/wireless.c
@@ -467,7 +467,7 @@ _wireless_edit_send()
467 break; 467 break;
468 default: break; 468 default: break;
469 } 469 }
470 470
471 } 471 }
472 else 472 else
473 proxy = EINA_TRUE; 473 proxy = EINA_TRUE;
@@ -734,7 +734,7 @@ _wireless_gadget_edit_basic(void)
734 elm_object_text_set(hoversel, methods[wc->method]); 734 elm_object_text_set(hoversel, methods[wc->method]);
735 evas_object_smart_callback_add(hoversel, "clicked", _wireless_gadget_edit_method_open, NULL); 735 evas_object_smart_callback_add(hoversel, "clicked", _wireless_gadget_edit_method_open, NULL);
736 } 736 }
737 737
738 ent = entry = _wireless_popup_table_entry_row(tb, _("Address"), NULL, NULL, &row); 738 ent = entry = _wireless_popup_table_entry_row(tb, _("Address"), NULL, NULL, &row);
739 elm_object_disabled_set(ent, disabled); 739 elm_object_disabled_set(ent, disabled);
740 wireless_popup.entries = eina_list_append(wireless_popup.entries, ent); 740 wireless_popup.entries = eina_list_append(wireless_popup.entries, ent);
diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index 6a871d9cc..ffebaeb6c 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -151,7 +151,7 @@ wizard_page_show(Evas_Object *obj)
151 if (!obj) return; 151 if (!obj) return;
152 elm_box_pack_end(o_box, obj); 152 elm_box_pack_end(o_box, obj);
153 evas_object_show(obj); 153 evas_object_show(obj);
154 154
155 elm_object_focus_set(obj, 1); 155 elm_object_focus_set(obj, 1);
156 edje_object_signal_emit(o_bg, "e,action,page,new", "e"); 156 edje_object_signal_emit(o_bg, "e,action,page,new", "e");
157} 157}
diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c
index 33cff7eb5..5fdc3c33d 100644
--- a/src/modules/wizard/page_010.c
+++ b/src/modules/wizard/page_010.c
@@ -162,7 +162,7 @@ _lang_content_get(E_Intl_Pair *pair, Evas_Object *obj, const char *part)
162 e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", pair->locale_icon); 162 e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", pair->locale_icon);
163 else 163 else
164 e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", "lang-system.png"); 164 e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", "lang-system.png");
165 165
166 ic = elm_icon_add(obj); 166 ic = elm_icon_add(obj);
167 elm_image_file_set(ic, buf, NULL); 167 elm_image_file_set(ic, buf, NULL);
168 evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 20, 10); 168 evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 20, 10);
diff --git a/src/modules/wizard/page_011.c b/src/modules/wizard/page_011.c
index 2615d70f9..fb08ff1d1 100644
--- a/src/modules/wizard/page_011.c
+++ b/src/modules/wizard/page_011.c
@@ -196,7 +196,7 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
196 EINA_LIST_FOREACH(layouts, l, lay) 196 EINA_LIST_FOREACH(layouts, l, lay)
197 { 197 {
198 void *it; 198 void *it;
199 199
200 it = elm_genlist_item_append(ob, &itc, lay, NULL, 0, _layout_select, lay); 200 it = elm_genlist_item_append(ob, &itc, lay, NULL, 0, _layout_select, lay);
201 if (eina_streq(lay->name, "us")) 201 if (eina_streq(lay->name, "us"))
202 sel_it = it; 202 sel_it = it;
diff --git a/src/modules/wizard/page_040.c b/src/modules/wizard/page_040.c
index b775a641e..348d5e2f5 100644
--- a/src/modules/wizard/page_040.c
+++ b/src/modules/wizard/page_040.c
@@ -37,13 +37,13 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED)
37 api->wizard_title_set(_("Adding missing App files")); 37 api->wizard_title_set(_("Adding missing App files"));
38 api->wizard_button_next_enable_set(0); 38 api->wizard_button_next_enable_set(0);
39 api->wizard_page_show(NULL); 39 api->wizard_page_show(NULL);
40 40
41 snprintf(buf, sizeof(buf), "%s/extra_desktops", api->wizard_dir_get()); 41 snprintf(buf, sizeof(buf), "%s/extra_desktops", api->wizard_dir_get());
42 extra_desks = ecore_file_ls(buf); 42 extra_desks = ecore_file_ls(buf);
43 43
44 /* advance in 1 sec */ 44 /* advance in 1 sec */
45 _next_timer = ecore_timer_loop_add(1.0, _next_page, NULL); 45 _next_timer = ecore_timer_loop_add(1.0, _next_page, NULL);
46 46
47 EINA_LIST_FREE(extra_desks, file) 47 EINA_LIST_FREE(extra_desks, file)
48 { 48 {
49 snprintf(buf, sizeof(buf), "%s/extra_desktops/%s", 49 snprintf(buf, sizeof(buf), "%s/extra_desktops/%s",
diff --git a/src/modules/wizard/page_110.c b/src/modules/wizard/page_110.c
index ef43b7023..5307d6790 100644
--- a/src/modules/wizard/page_110.c
+++ b/src/modules/wizard/page_110.c
@@ -15,7 +15,7 @@ _recommend_connman(E_Wizard_Page *pg EINA_UNUSED)
15#if defined(USE_MODULE_CONNMAN) || defined(USE_MODULE_WIRELESS) 15#if defined(USE_MODULE_CONNMAN) || defined(USE_MODULE_WIRELESS)
16 elm_object_text_set(of, _("Connman network service not found")); 16 elm_object_text_set(of, _("Connman network service not found"));
17 17
18 18
19 elm_object_text_set(ob, _("Install/Enable Connman service for network management support")); 19 elm_object_text_set(ob, _("Install/Enable Connman service for network management support"));
20#else 20#else
21 elm_object_text_set(of, _("Connman and Wireless modules disabled")); 21 elm_object_text_set(of, _("Connman and Wireless modules disabled"));
@@ -93,7 +93,7 @@ _check_connman_owner(void *data, const Eldbus_Message *msg,
93 api->wizard_button_next_enable_set(1); 93 api->wizard_button_next_enable_set(1);
94 ecore_idler_add(_page_next_call, NULL); 94 ecore_idler_add(_page_next_call, NULL);
95 return; 95 return;
96 96
97fail: 97fail:
98 _connman_fail(data); 98 _connman_fail(data);
99} 99}
diff --git a/src/modules/wizard/page_115.c b/src/modules/wizard/page_115.c
index a5d17671d..9c2c5408a 100644
--- a/src/modules/wizard/page_115.c
+++ b/src/modules/wizard/page_115.c
@@ -15,7 +15,7 @@ _recommend_bluez5(E_Wizard_Page *pg EINA_UNUSED)
15#if defined(USE_MODULE_BLUEZ5) 15#if defined(USE_MODULE_BLUEZ5)
16 elm_object_text_set(of, _("BlueZ Bluetooth service not found")); 16 elm_object_text_set(of, _("BlueZ Bluetooth service not found"));
17 17
18 18
19 elm_object_text_set(ob, _("Install/Enable BlueZ 5 / bluetoothd service for network management support")); 19 elm_object_text_set(ob, _("Install/Enable BlueZ 5 / bluetoothd service for network management support"));
20#else 20#else
21 elm_object_text_set(of, _("Bluez5 module disabled")); 21 elm_object_text_set(of, _("Bluez5 module disabled"));
@@ -93,7 +93,7 @@ _check_bluez5_owner(void *data, const Eldbus_Message *msg,
93 api->wizard_button_next_enable_set(1); 93 api->wizard_button_next_enable_set(1);
94 ecore_idler_add(_page_next_call, NULL); 94 ecore_idler_add(_page_next_call, NULL);
95 return; 95 return;
96 96
97fail: 97fail:
98 _bluez5_fail(data); 98 _bluez5_fail(data);
99} 99}
diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index 2b2565fbe..10a08ce47 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -105,7 +105,7 @@ _info_unconf_primary_find(E_Randr2 *r)
105 105
106 EINA_LIST_FOREACH(r->screens, l, s) 106 EINA_LIST_FOREACH(r->screens, l, s)
107 { 107 {
108 if (!((s->config.enabled) && 108 if (!((s->config.enabled) &&
109 (s->config.mode.w > 0) && (s->config.mode.h > 0) && 109 (s->config.mode.w > 0) && (s->config.mode.h > 0) &&
110 (s->config.geom.w > 0) && (s->config.geom.h > 0))) 110 (s->config.geom.w > 0) && (s->config.geom.h > 0)))
111 continue; 111 continue;
@@ -331,7 +331,7 @@ _drm2_randr_create(void)
331 type = MIN(ecore_drm2_output_connector_type_get(output), 331 type = MIN(ecore_drm2_output_connector_type_get(output),
332 EINA_C_ARRAY_LENGTH(conn_types) - 1); 332 EINA_C_ARRAY_LENGTH(conn_types) - 1);
333 s->info.connector = rtype[type]; 333 s->info.connector = rtype[type];
334 s->info.is_lid = ((type == DRM_MODE_CONNECTOR_LVDS) || 334 s->info.is_lid = ((type == DRM_MODE_CONNECTOR_LVDS) ||
335 (type == DRM_MODE_CONNECTOR_eDP)); 335 (type == DRM_MODE_CONNECTOR_eDP));
336 s->info.lid_closed = (s->info.is_lid && e_acpi_lid_is_closed()); 336 s->info.lid_closed = (s->info.is_lid && e_acpi_lid_is_closed());
337 printf("DRM2 RRR: ...... lid_closed = %i (%i && %i)\n", 337 printf("DRM2 RRR: ...... lid_closed = %i (%i && %i)\n",
@@ -411,7 +411,7 @@ _drm2_randr_create(void)
411 s->config.mode.w = s->config.geom.w; 411 s->config.mode.w = s->config.geom.w;
412 s->config.mode.h = s->config.geom.h; 412 s->config.mode.h = s->config.geom.h;
413 s->config.mode.refresh = refresh; 413 s->config.mode.refresh = refresh;
414 s->config.enabled = 414 s->config.enabled =
415 ((s->config.mode.w != 0) && (s->config.mode.h != 0)); 415 ((s->config.mode.w != 0) && (s->config.mode.h != 0));
416 416
417 printf("DRM2 RRR: '%s' %i %i %ix%i\n", s->info.name, 417 printf("DRM2 RRR: '%s' %i %i %ix%i\n", s->info.name,
diff --git a/src/modules/wl_fb/e_mod_main.c b/src/modules/wl_fb/e_mod_main.c
index 6bb7206d2..4b2d94929 100644
--- a/src/modules/wl_fb/e_mod_main.c
+++ b/src/modules/wl_fb/e_mod_main.c
@@ -46,7 +46,7 @@ e_modapi_init(E_Module *m)
46 return m; 46 return m;
47} 47}
48 48
49E_API int 49E_API int
50e_modapi_shutdown(E_Module *m EINA_UNUSED) 50e_modapi_shutdown(E_Module *m EINA_UNUSED)
51{ 51{
52 /* shutdown ecore_x */ 52 /* shutdown ecore_x */
diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c
index e64f02922..d3e43c813 100644
--- a/src/modules/wl_x11/e_mod_main.c
+++ b/src/modules/wl_x11/e_mod_main.c
@@ -54,7 +54,7 @@ e_modapi_init(E_Module *m)
54 return m; 54 return m;
55} 55}
56 56
57E_API int 57E_API int
58e_modapi_shutdown(E_Module *m EINA_UNUSED) 58e_modapi_shutdown(E_Module *m EINA_UNUSED)
59{ 59{
60 /* delete handler for keymap change */ 60 /* delete handler for keymap change */
diff --git a/src/modules/xwayland/e_mod_main.c b/src/modules/xwayland/e_mod_main.c
index 4b9b76d71..d02e2b65a 100644
--- a/src/modules/xwayland/e_mod_main.c
+++ b/src/modules/xwayland/e_mod_main.c
@@ -24,7 +24,7 @@ struct _E_XWayland_Server
24 Ecore_Fd_Handler *abs_hdlr, *unx_hdlr; 24 Ecore_Fd_Handler *abs_hdlr, *unx_hdlr;
25 Ecore_Event_Handler *sig_hdlr; 25 Ecore_Event_Handler *sig_hdlr;
26 26
27 struct 27 struct
28 { 28 {
29 pid_t pid; 29 pid_t pid;
30 /* cleanup_func func; */ 30 /* cleanup_func func; */
@@ -95,7 +95,7 @@ _lock_create(int lock)
95 return 1; 95 return 1;
96} 96}
97 97
98static int 98static int
99_abstract_socket_bind(int disp) 99_abstract_socket_bind(int disp)
100{ 100{
101 struct sockaddr_un addr; 101 struct sockaddr_un addr;
@@ -103,13 +103,13 @@ _abstract_socket_bind(int disp)
103 int fd; 103 int fd;
104 104
105 /* try to create a local socket */ 105 /* try to create a local socket */
106 if ((fd = socket(PF_LOCAL, (SOCK_STREAM | SOCK_CLOEXEC), 0)) < 0) 106 if ((fd = socket(PF_LOCAL, (SOCK_STREAM | SOCK_CLOEXEC), 0)) < 0)
107 return -1; 107 return -1;
108 108
109 ecore_file_mkpath("/tmp/.X11-unix"); 109 ecore_file_mkpath("/tmp/.X11-unix");
110 110
111 addr.sun_family = AF_LOCAL; 111 addr.sun_family = AF_LOCAL;
112 nsize = snprintf(addr.sun_path, sizeof(addr.sun_path), 112 nsize = snprintf(addr.sun_path, sizeof(addr.sun_path),
113 "%c/tmp/.X11-unix/X%d", 0, disp); 113 "%c/tmp/.X11-unix/X%d", 0, disp);
114 size = offsetof(struct sockaddr_un, sun_path) + nsize; 114 size = offsetof(struct sockaddr_un, sun_path) + nsize;
115 115
@@ -121,7 +121,7 @@ _abstract_socket_bind(int disp)
121 } 121 }
122 122
123 /* try to listen on the bound socket */ 123 /* try to listen on the bound socket */
124 if (listen(fd, 1) < 0) 124 if (listen(fd, 1) < 0)
125 { 125 {
126 ERR("Failed to listen to abstract fd: %d", fd); 126 ERR("Failed to listen to abstract fd: %d", fd);
127 goto err; 127 goto err;
@@ -134,7 +134,7 @@ err:
134 return -1; 134 return -1;
135} 135}
136 136
137static int 137static int
138_unix_socket_bind(int disp) 138_unix_socket_bind(int disp)
139{ 139{
140 struct sockaddr_un addr; 140 struct sockaddr_un addr;
@@ -142,11 +142,11 @@ _unix_socket_bind(int disp)
142 int fd; 142 int fd;
143 143
144 /* try to create a local socket */ 144 /* try to create a local socket */
145 if ((fd = socket(PF_LOCAL, (SOCK_STREAM | SOCK_CLOEXEC), 0)) < 0) 145 if ((fd = socket(PF_LOCAL, (SOCK_STREAM | SOCK_CLOEXEC), 0)) < 0)
146 return -1; 146 return -1;
147 147
148 addr.sun_family = AF_LOCAL; 148 addr.sun_family = AF_LOCAL;
149 nsize = snprintf(addr.sun_path, sizeof(addr.sun_path), 149 nsize = snprintf(addr.sun_path, sizeof(addr.sun_path),
150 "/tmp/.X11-unix/X%d", disp) + 1; 150 "/tmp/.X11-unix/X%d", disp) + 1;
151 size = offsetof(struct sockaddr_un, sun_path) + nsize; 151 size = offsetof(struct sockaddr_un, sun_path) + nsize;
152 152
@@ -160,7 +160,7 @@ _unix_socket_bind(int disp)
160 } 160 }
161 161
162 /* try to listen on the bound socket */ 162 /* try to listen on the bound socket */
163 if (listen(fd, 1) < 0) 163 if (listen(fd, 1) < 0)
164 { 164 {
165 ERR("Failed to listen to unix fd: %d", fd); 165 ERR("Failed to listen to unix fd: %d", fd);
166 goto err; 166 goto err;
@@ -173,7 +173,7 @@ err:
173 return -1; 173 return -1;
174} 174}
175 175
176static Eina_Bool 176static Eina_Bool
177_cb_xserver_event(void *data EINA_UNUSED, Ecore_Fd_Handler *hdlr EINA_UNUSED) 177_cb_xserver_event(void *data EINA_UNUSED, Ecore_Fd_Handler *hdlr EINA_UNUSED)
178{ 178{
179 int socks[2], wms[2], fd; 179 int socks[2], wms[2], fd;
@@ -298,7 +298,7 @@ xinit(void *d, Ecore_Thread *eth)
298static void 298static void
299xend(){} 299xend(){}
300 300
301static Eina_Bool 301static Eina_Bool
302_cb_signal_event(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) 302_cb_signal_event(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
303{ 303{
304 Ecore_Event_Signal_User *ev; 304 Ecore_Event_Signal_User *ev;
@@ -307,7 +307,7 @@ _cb_signal_event(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
307 ev = event; 307 ev = event;
308 if (ev->number != 1) return ECORE_CALLBACK_RENEW; 308 if (ev->number != 1) return ECORE_CALLBACK_RENEW;
309 309
310 /* NB: SIGUSR1 comes from XWayland Server when it has finished 310 /* NB: SIGUSR1 comes from XWayland Server when it has finished
311 * initialized. */ 311 * initialized. */
312 312
313 DBG("XWayland Finished Init"); 313 DBG("XWayland Finished Init");
@@ -411,15 +411,15 @@ xwl_init(void *d EINA_UNUSED)
411 ecore_event_add(E_EVENT_COMPOSITOR_XWAYLAND_INIT, NULL, NULL, NULL); 411 ecore_event_add(E_EVENT_COMPOSITOR_XWAYLAND_INIT, NULL, NULL, NULL);
412 412
413 /* setup ecore_fd handlers for abstract and unix socket fds */ 413 /* setup ecore_fd handlers for abstract and unix socket fds */
414 exs->abs_hdlr = 414 exs->abs_hdlr =
415 ecore_main_fd_handler_add(exs->abs_fd, ECORE_FD_READ, 415 ecore_main_fd_handler_add(exs->abs_fd, ECORE_FD_READ,
416 _cb_xserver_event, NULL, NULL, NULL); 416 _cb_xserver_event, NULL, NULL, NULL);
417 exs->unx_hdlr = 417 exs->unx_hdlr =
418 ecore_main_fd_handler_add(exs->unx_fd, ECORE_FD_READ, 418 ecore_main_fd_handler_add(exs->unx_fd, ECORE_FD_READ,
419 _cb_xserver_event, NULL, NULL, NULL); 419 _cb_xserver_event, NULL, NULL, NULL);
420 420
421 /* setup listener for SIGUSR1 */ 421 /* setup listener for SIGUSR1 */
422 exs->sig_hdlr = 422 exs->sig_hdlr =
423 ecore_event_handler_add(ECORE_EVENT_SIGNAL_USER, _cb_signal_event, exs); 423 ecore_event_handler_add(ECORE_EVENT_SIGNAL_USER, _cb_signal_event, exs);
424 return EINA_FALSE; 424 return EINA_FALSE;
425} 425}
@@ -464,7 +464,7 @@ e_modapi_init(E_Module *m)
464 return m; 464 return m;
465} 465}
466 466
467E_API int 467E_API int
468e_modapi_shutdown(E_Module *m EINA_UNUSED) 468e_modapi_shutdown(E_Module *m EINA_UNUSED)
469{ 469{
470 xwl_shutdown(); 470 xwl_shutdown();
diff --git a/src/tests/override_fullscreen.c b/src/tests/override_fullscreen.c
index a6adf333c..8d74843a5 100644
--- a/src/tests/override_fullscreen.c
+++ b/src/tests/override_fullscreen.c
@@ -16,7 +16,7 @@ test_state(void *d EINA_UNUSED)
16int 16int
17main(void) 17main(void)
18{ 18{
19 19
20 20
21 ecore_x_init(NULL); 21 ecore_x_init(NULL);
22 22