summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2020-05-13 19:20:04 +0000
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-14 13:49:18 +0200
commitf47d1a789efed7996b2abde673ee3e5d3e72709d (patch)
treee4c2c0cd3317accba7039e614d9caea7cc4c499b /src
parent44b029378aa5ac85d74f53e3bad4734b675387c7 (diff)
tree-wide: get rid of trailing whitespace (part 6)
Remove trailing whitespaces Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11825
Diffstat (limited to 'src')
-rw-r--r--src/modules/backlight/e_mod_main.c60
-rw-r--r--src/modules/backlight/gadget/backlight.c4
-rw-r--r--src/modules/battery/e_mod_main.h4
-rw-r--r--src/modules/battery/e_mod_sysctl.c4
-rw-r--r--src/modules/battery/e_mod_udev.c6
-rw-r--r--src/modules/battery/e_mod_upower.c8
-rw-r--r--src/modules/bluez5/bz_obj.c4
-rw-r--r--src/modules/bluez5/e_mod_main.c2
-rw-r--r--src/modules/clock/e_mod_config.c6
-rw-r--r--src/modules/clock/e_mod_main.c4
-rw-r--r--src/modules/conf/e_mod_main.h2
-rw-r--r--src/modules/conf_applications/e_int_config_apps.c2
-rw-r--r--src/modules/conf_applications/e_int_config_apps_personal.c2
-rw-r--r--src/modules/conf_applications/e_int_config_deskenv.c4
-rw-r--r--src/modules/conf_bindings/e_int_config_mousebindings.c8
-rw-r--r--src/modules/conf_bindings/e_int_config_signalbindings.c4
-rw-r--r--src/modules/conf_dialogs/e_int_config_dialogs.c30
17 files changed, 77 insertions, 77 deletions
diff --git a/src/modules/backlight/e_mod_main.c b/src/modules/backlight/e_mod_main.c
index 75356ed1a..96c7d756d 100644
--- a/src/modules/backlight/e_mod_main.c
+++ b/src/modules/backlight/e_mod_main.c
@@ -56,7 +56,7 @@ static void
56_backlight_gadget_update(Instance *inst) 56_backlight_gadget_update(Instance *inst)
57{ 57{
58 Edje_Message_Float msg; 58 Edje_Message_Float msg;
59 59
60 msg.val = inst->val; 60 msg.val = inst->val;
61 if (msg.val < 0.0) msg.val = 0.0; 61 if (msg.val < 0.0) msg.val = 0.0;
62 else if (msg.val > 1.0) msg.val = 1.0; 62 else if (msg.val > 1.0) msg.val = 1.0;
@@ -82,7 +82,7 @@ _backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev)
82{ 82{
83 Instance *inst = data; 83 Instance *inst = data;
84 const char *keysym; 84 const char *keysym;
85 85
86 keysym = ev->key; 86 keysym = ev->key;
87 if (!strcmp(keysym, "Escape")) 87 if (!strcmp(keysym, "Escape"))
88 _backlight_popup_free(inst); 88 _backlight_popup_free(inst);
@@ -133,9 +133,9 @@ _backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev)
133 EINA_LIST_FOREACH(e_bindings->key_bindings, l, binding) 133 EINA_LIST_FOREACH(e_bindings->key_bindings, l, binding)
134 { 134 {
135 if (binding->action && strcmp(binding->action, "backlight")) continue; 135 if (binding->action && strcmp(binding->action, "backlight")) continue;
136 136
137 mod = 0; 137 mod = 0;
138 138
139 if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) 139 if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
140 mod |= E_BINDING_MODIFIER_SHIFT; 140 mod |= E_BINDING_MODIFIER_SHIFT;
141 if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) 141 if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
@@ -144,7 +144,7 @@ _backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev)
144 mod |= E_BINDING_MODIFIER_ALT; 144 mod |= E_BINDING_MODIFIER_ALT;
145 if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) 145 if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
146 mod |= E_BINDING_MODIFIER_WIN; 146 mod |= E_BINDING_MODIFIER_WIN;
147 147
148 if (binding->key && (!strcmp(binding->key, ev->key)) && 148 if (binding->key && (!strcmp(binding->key, ev->key)) &&
149 ((binding->modifiers == mod) || (binding->any_mod))) 149 ((binding->modifiers == mod) || (binding->any_mod)))
150 { 150 {
@@ -188,29 +188,29 @@ _backlight_popup_new(Instance *inst)
188{ 188{
189 Evas *evas; 189 Evas *evas;
190 Evas_Object *o; 190 Evas_Object *o;
191 191
192 if (inst->popup) return; 192 if (inst->popup) return;
193 193
194 e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL); 194 e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL);
195 inst->val = e_backlight_level_get(inst->gcc->gadcon->zone); 195 inst->val = e_backlight_level_get(inst->gcc->gadcon->zone);
196 _backlight_gadget_update(inst); 196 _backlight_gadget_update(inst);
197 197
198 inst->popup = e_gadcon_popup_new(inst->gcc, 0); 198 inst->popup = e_gadcon_popup_new(inst->gcc, 0);
199 evas = e_comp->evas; 199 evas = e_comp->evas;
200 200
201 inst->o_table = e_widget_table_add(e_win_evas_win_get(evas), 0); 201 inst->o_table = e_widget_table_add(e_win_evas_win_get(evas), 0);
202 202
203 o = e_widget_slider_add(evas, 0, 0, NULL, 0.05, 1.0, 0.05, 0, &(inst->val), NULL, 100); 203 o = e_widget_slider_add(evas, 0, 0, NULL, 0.05, 1.0, 0.05, 0, &(inst->val), NULL, 100);
204 evas_object_smart_callback_add(o, "changed", _slider_cb, inst); 204 evas_object_smart_callback_add(o, "changed", _slider_cb, inst);
205 inst->o_slider = o; 205 inst->o_slider = o;
206 e_widget_table_object_align_append(inst->o_table, o, 206 e_widget_table_object_align_append(inst->o_table, o,
207 0, 0, 1, 1, 0, 0, 0, 0, 0.5, 0.5); 207 0, 0, 1, 1, 0, 0, 0, 0, 0.5, 0.5);
208 208
209 o = e_widget_button_add(evas, NULL, "preferences-system", 209 o = e_widget_button_add(evas, NULL, "preferences-system",
210 _backlight_settings_cb, inst, NULL); 210 _backlight_settings_cb, inst, NULL);
211 e_widget_table_object_align_append(inst->o_table, o, 211 e_widget_table_object_align_append(inst->o_table, o,
212 0, 1, 1, 1, 0, 0, 0, 0, 0.5, 1.0); 212 0, 1, 1, 1, 0, 0, 0, 0, 0.5, 1.0);
213 213
214 e_gadcon_popup_content_set(inst->popup, inst->o_table); 214 e_gadcon_popup_content_set(inst->popup, inst->o_table);
215 e_gadcon_popup_show(inst->popup); 215 e_gadcon_popup_show(inst->popup);
216 e_comp_object_util_autoclose(inst->popup->comp_object, _backlight_popup_comp_del_cb, 216 e_comp_object_util_autoclose(inst->popup->comp_object, _backlight_popup_comp_del_cb,
@@ -239,7 +239,7 @@ _backlight_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EI
239{ 239{
240 Instance *inst = data; 240 Instance *inst = data;
241 Evas_Event_Mouse_Down *ev = event; 241 Evas_Event_Mouse_Down *ev = event;
242 242
243 if (ev->button == 1) 243 if (ev->button == 1)
244 { 244 {
245 if (inst->popup) _backlight_popup_free(inst); 245 if (inst->popup) _backlight_popup_free(inst);
@@ -251,18 +251,18 @@ _backlight_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EI
251 E_Menu *m; 251 E_Menu *m;
252 E_Menu_Item *mi; 252 E_Menu_Item *mi;
253 int x, y; 253 int x, y;
254 254
255 zone = e_zone_current_get(); 255 zone = e_zone_current_get();
256 256
257 m = e_menu_new(); 257 m = e_menu_new();
258 258
259 mi = e_menu_item_new(m); 259 mi = e_menu_item_new(m);
260 e_menu_item_label_set(mi, _("Settings")); 260 e_menu_item_label_set(mi, _("Settings"));
261 e_util_menu_item_theme_icon_set(mi, "configure"); 261 e_util_menu_item_theme_icon_set(mi, "configure");
262 e_menu_item_callback_set(mi, _backlight_menu_cb_cfg, inst); 262 e_menu_item_callback_set(mi, _backlight_menu_cb_cfg, inst);
263 263
264 m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0); 264 m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
265 265
266 e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, NULL, NULL); 266 e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, NULL, NULL);
267 e_menu_activate_mouse(m, zone, x + ev->output.x, y + ev->output.y, 267 e_menu_activate_mouse(m, zone, x + ev->output.x, y + ev->output.y,
268 1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp); 268 1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
@@ -290,32 +290,32 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
290 Evas_Object *o; 290 Evas_Object *o;
291 E_Gadcon_Client *gcc; 291 E_Gadcon_Client *gcc;
292 Instance *inst; 292 Instance *inst;
293 293
294 inst = E_NEW(Instance, 1); 294 inst = E_NEW(Instance, 1);
295 295
296 o = edje_object_add(gc->evas); 296 o = edje_object_add(gc->evas);
297 e_theme_edje_object_set(o, "base/theme/modules/backlight", 297 e_theme_edje_object_set(o, "base/theme/modules/backlight",
298 "e/modules/backlight/main"); 298 "e/modules/backlight/main");
299 evas_object_show(o); 299 evas_object_show(o);
300 300
301 gcc = e_gadcon_client_new(gc, name, id, style, o); 301 gcc = e_gadcon_client_new(gc, name, id, style, o);
302 gcc->data = inst; 302 gcc->data = inst;
303 303
304 inst->gcc = gcc; 304 inst->gcc = gcc;
305 inst->o_backlight = o; 305 inst->o_backlight = o;
306 306
307 inst->val = e_backlight_level_get(inst->gcc->gadcon->zone); 307 inst->val = e_backlight_level_get(inst->gcc->gadcon->zone);
308 _backlight_gadget_update(inst); 308 _backlight_gadget_update(inst);
309 309
310 evas_object_event_callback_add(inst->o_backlight, 310 evas_object_event_callback_add(inst->o_backlight,
311 EVAS_CALLBACK_MOUSE_DOWN, 311 EVAS_CALLBACK_MOUSE_DOWN,
312 _backlight_cb_mouse_down, 312 _backlight_cb_mouse_down,
313 inst); 313 inst);
314 evas_object_event_callback_add(inst->o_backlight, 314 evas_object_event_callback_add(inst->o_backlight,
315 EVAS_CALLBACK_MOUSE_WHEEL, 315 EVAS_CALLBACK_MOUSE_WHEEL,
316 _backlight_cb_mouse_wheel, 316 _backlight_cb_mouse_wheel,
317 inst); 317 inst);
318 318
319 backlight_instances = eina_list_append(backlight_instances, inst); 319 backlight_instances = eina_list_append(backlight_instances, inst);
320 return gcc; 320 return gcc;
321} 321}
@@ -324,7 +324,7 @@ static void
324_gc_shutdown(E_Gadcon_Client *gcc) 324_gc_shutdown(E_Gadcon_Client *gcc)
325{ 325{
326 Instance *inst; 326 Instance *inst;
327 327
328 inst = gcc->data; 328 inst = gcc->data;
329 _backlight_popup_free(inst); 329 _backlight_popup_free(inst);
330 backlight_instances = eina_list_remove(backlight_instances, inst); 330 backlight_instances = eina_list_remove(backlight_instances, inst);
@@ -337,7 +337,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED)
337{ 337{
338 Instance *inst; 338 Instance *inst;
339 Evas_Coord mw, mh; 339 Evas_Coord mw, mh;
340 340
341 inst = gcc->data; 341 inst = gcc->data;
342 mw = 0, mh = 0; 342 mw = 0, mh = 0;
343 edje_object_size_min_get(inst->o_backlight, &mw, &mh); 343 edje_object_size_min_get(inst->o_backlight, &mw, &mh);
@@ -360,7 +360,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas)
360{ 360{
361 Evas_Object *o; 361 Evas_Object *o;
362 char buf[4096]; 362 char buf[4096];
363 363
364 o = edje_object_add(evas); 364 o = edje_object_add(evas);
365 snprintf(buf, sizeof(buf), "%s/e-module-backlight.edj", 365 snprintf(buf, sizeof(buf), "%s/e-module-backlight.edj",
366 e_module_dir_get(backlight_module)); 366 e_module_dir_get(backlight_module));
@@ -373,7 +373,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class)
373{ 373{
374 static char buf[4096]; 374 static char buf[4096];
375 375
376 snprintf(buf, sizeof(buf), "%s.%d", client_class->name, 376 snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
377 eina_list_count(backlight_instances) + 1); 377 eina_list_count(backlight_instances) + 1);
378 return buf; 378 return buf;
379} 379}
@@ -416,7 +416,7 @@ _e_mod_action_cb(E_Object *obj EINA_UNUSED,
416{ 416{
417 Eina_List *l; 417 Eina_List *l;
418 Instance *inst; 418 Instance *inst;
419 419
420 EINA_LIST_FOREACH(backlight_instances, l, inst) 420 EINA_LIST_FOREACH(backlight_instances, l, inst)
421 { 421 {
422 if (!params) 422 if (!params)
diff --git a/src/modules/backlight/gadget/backlight.c b/src/modules/backlight/gadget/backlight.c
index ce89756a3..9eaf2d9c2 100644
--- a/src/modules/backlight/gadget/backlight.c
+++ b/src/modules/backlight/gadget/backlight.c
@@ -36,10 +36,10 @@ _backlight_level_set(Instance *inst, double val, Eina_Bool set_slider)
36 if (val > 1.0) val = 1.0; 36 if (val > 1.0) val = 1.0;
37 if (val < 0.0) val = 0.0; 37 if (val < 0.0) val = 0.0;
38 inst->val = val; 38 inst->val = val;
39 39
40 if (set_slider) 40 if (set_slider)
41 elm_slider_value_set(inst->o_slider, inst->val * 100); 41 elm_slider_value_set(inst->o_slider, inst->val * 100);
42 42
43 e_backlight_mode_set(e_comp_object_util_zone_get(inst->o_main), E_BACKLIGHT_MODE_NORMAL); 43 e_backlight_mode_set(e_comp_object_util_zone_get(inst->o_main), E_BACKLIGHT_MODE_NORMAL);
44 e_backlight_level_set(e_comp_object_util_zone_get(inst->o_main), inst->val, 0.0); 44 e_backlight_level_set(e_comp_object_util_zone_get(inst->o_main), inst->val, 0.0);
45 e_config->backlight.normal = inst->val; 45 e_config->backlight.normal = inst->val;
diff --git a/src/modules/battery/e_mod_main.h b/src/modules/battery/e_mod_main.h
index e79d97586..d509e0106 100644
--- a/src/modules/battery/e_mod_main.h
+++ b/src/modules/battery/e_mod_main.h
@@ -97,7 +97,7 @@ struct _Battery
97 Eldbus_Proxy *proxy; 97 Eldbus_Proxy *proxy;
98 int * mib; 98 int * mib;
99#if defined(__FreeBSD__) || defined(__DragonFly__) 99#if defined(__FreeBSD__) || defined(__DragonFly__)
100 int * mib_state; 100 int * mib_state;
101 int * mib_units; 101 int * mib_units;
102 int * mib_time; 102 int * mib_time;
103 int batteries; 103 int batteries;
@@ -141,7 +141,7 @@ E_API int e_modapi_shutdown (E_Module *m);
141E_API int e_modapi_save (E_Module *m); 141E_API int e_modapi_save (E_Module *m);
142 142
143E_Config_Dialog *e_int_config_battery_module(Evas_Object *parent, const char *params EINA_UNUSED); 143E_Config_Dialog *e_int_config_battery_module(Evas_Object *parent, const char *params EINA_UNUSED);
144 144
145void _battery_config_updated(void); 145void _battery_config_updated(void);
146extern Config *battery_config; 146extern Config *battery_config;
147 147
diff --git a/src/modules/battery/e_mod_sysctl.c b/src/modules/battery/e_mod_sysctl.c
index ed6ee1032..23518b298 100644
--- a/src/modules/battery/e_mod_sysctl.c
+++ b/src/modules/battery/e_mod_sysctl.c
@@ -83,7 +83,7 @@ _battery_sysctl_start(void)
83 83
84 bat->mib = malloc(sizeof(int) * 4); 84 bat->mib = malloc(sizeof(int) * 4);
85 if (!bat->mib) return 0; 85 if (!bat->mib) return 0;
86 sysctlnametomib("hw.acpi.battery.life", bat->mib, &len); 86 sysctlnametomib("hw.acpi.battery.life", bat->mib, &len);
87 87
88 bat->mib_state = malloc(sizeof(int) * 4); 88 bat->mib_state = malloc(sizeof(int) * 4);
89 if (!bat->mib_state) return 0; 89 if (!bat->mib_state) return 0;
@@ -203,7 +203,7 @@ _battery_sysctl_battery_update()
203 charge = (double)s.value; 203 charge = (double)s.value;
204 } 204 }
205 205
206 /* This is a workaround because there's an ACPI bug */ 206 /* This is a workaround because there's an ACPI bug */
207 if ((EINA_FLT_EQ(charge, 0.0)) || (EINA_FLT_EQ(bat->last_full_charge, 0.0))) 207 if ((EINA_FLT_EQ(charge, 0.0)) || (EINA_FLT_EQ(bat->last_full_charge, 0.0)))
208 { 208 {
209 /* last full capacity */ 209 /* last full capacity */
diff --git a/src/modules/battery/e_mod_udev.c b/src/modules/battery/e_mod_udev.c
index 999d87223..eeb23502f 100644
--- a/src/modules/battery/e_mod_udev.c
+++ b/src/modules/battery/e_mod_udev.c
@@ -111,8 +111,8 @@ _battery_udev_battery_add(const char *syspath)
111 } 111 }
112 bat->last_update = ecore_time_get(); 112 bat->last_update = ecore_time_get();
113 bat->udi = eina_stringshare_add(syspath); 113 bat->udi = eina_stringshare_add(syspath);
114 bat->poll = ecore_poller_add(ECORE_POLLER_CORE, 114 bat->poll = ecore_poller_add(ECORE_POLLER_CORE,
115 battery_config->poll_interval, 115 battery_config->poll_interval,
116 _battery_udev_battery_update_poll, bat); 116 _battery_udev_battery_update_poll, bat);
117 device_batteries = eina_list_append(device_batteries, bat); 117 device_batteries = eina_list_append(device_batteries, bat);
118 _battery_udev_battery_update(syspath, bat); 118 _battery_udev_battery_update(syspath, bat);
@@ -178,7 +178,7 @@ _battery_udev_ac_del(const char *syspath)
178 free(ac); 178 free(ac);
179} 179}
180 180
181static Eina_Bool 181static Eina_Bool
182_battery_udev_battery_update_poll(void *data) 182_battery_udev_battery_update_poll(void *data)
183{ 183{
184 _battery_udev_battery_update(NULL, data); 184 _battery_udev_battery_update(NULL, data);
diff --git a/src/modules/battery/e_mod_upower.c b/src/modules/battery/e_mod_upower.c
index 80307d9de..ad0b933e1 100644
--- a/src/modules/battery/e_mod_upower.c
+++ b/src/modules/battery/e_mod_upower.c
@@ -237,14 +237,14 @@ _device_type_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending E
237 goto error; 237 goto error;
238 238
239 eldbus_message_iter_arguments_get(variant, "u", &type); 239 eldbus_message_iter_arguments_get(variant, "u", &type);
240 if (type == 1) 240 if (type == 1)
241 { 241 {
242 obj = eldbus_object_get(conn, BUS, path); 242 obj = eldbus_object_get(conn, BUS, path);
243 EINA_SAFETY_ON_FALSE_RETURN(obj); 243 EINA_SAFETY_ON_FALSE_RETURN(obj);
244 upower_proxy_ac = eldbus_proxy_get(obj, IFACE_PROPERTIES); 244 upower_proxy_ac = eldbus_proxy_get(obj, IFACE_PROPERTIES);
245 _process_ac(proxy); 245 _process_ac(proxy);
246 } 246 }
247 else if (type == 2) 247 else if (type == 2)
248 { 248 {
249 obj = eldbus_object_get(conn, BUS, path); 249 obj = eldbus_object_get(conn, BUS, path);
250 EINA_SAFETY_ON_FALSE_RETURN(obj); 250 EINA_SAFETY_ON_FALSE_RETURN(obj);
@@ -366,14 +366,14 @@ _battery_upower_stop(void)
366 obj = eldbus_proxy_object_get(upower_proxy); 366 obj = eldbus_proxy_object_get(upower_proxy);
367 eldbus_proxy_unref(upower_proxy); 367 eldbus_proxy_unref(upower_proxy);
368 eldbus_object_unref(obj); 368 eldbus_object_unref(obj);
369 if (upower_proxy_ac) 369 if (upower_proxy_ac)
370 { 370 {
371 obj_ac = eldbus_proxy_object_get(upower_proxy_ac); 371 obj_ac = eldbus_proxy_object_get(upower_proxy_ac);
372 eldbus_proxy_unref(upower_proxy_ac); 372 eldbus_proxy_unref(upower_proxy_ac);
373 eldbus_object_unref(obj_ac); 373 eldbus_object_unref(obj_ac);
374 upower_proxy_ac = NULL; 374 upower_proxy_ac = NULL;
375 } 375 }
376 if (upower_proxy_bat) 376 if (upower_proxy_bat)
377 { 377 {
378 obj_bat = eldbus_proxy_object_get(upower_proxy_bat); 378 obj_bat = eldbus_proxy_object_get(upower_proxy_bat);
379 eldbus_proxy_unref(upower_proxy_bat); 379 eldbus_proxy_unref(upower_proxy_bat);
diff --git a/src/modules/bluez5/bz_obj.c b/src/modules/bluez5/bz_obj.c
index feb1e64a9..867181c7d 100644
--- a/src/modules/bluez5/bz_obj.c
+++ b/src/modules/bluez5/bz_obj.c
@@ -195,10 +195,10 @@ cb_obj_prop_entry(void *data, const void *key, Eldbus_Message_Iter *var)
195 // dict ServiceData [readonly, optional] 195 // dict ServiceData [readonly, optional]
196 // Service advertisement data. Keys are the UUIDs in 196 // Service advertisement data. Keys are the UUIDs in
197 // string format followed by its byte array value. 197 // string format followed by its byte array value.
198 // 198 //
199 // array{byte} AdvertisingFlags [readonly, experimental] 199 // array{byte} AdvertisingFlags [readonly, experimental]
200 // The Advertising Data Flags of the remote device. 200 // The Advertising Data Flags of the remote device.
201 // 201 //
202 // dict AdvertisingData [readonly, experimental] 202 // dict AdvertisingData [readonly, experimental]
203 // The Advertising Data of the remote device. Keys are 203 // The Advertising Data of the remote device. Keys are
204 // are 8 bits AD Type followed by data as byte array. 204 // are 8 bits AD Type followed by data as byte array.
diff --git a/src/modules/bluez5/e_mod_main.c b/src/modules/bluez5/e_mod_main.c
index a8e2b1a74..6a115f04a 100644
--- a/src/modules/bluez5/e_mod_main.c
+++ b/src/modules/bluez5/e_mod_main.c
@@ -112,7 +112,7 @@ _gad_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient)
112 inst->o_bluez5 = o = elm_layout_add(parent); 112 inst->o_bluez5 = o = elm_layout_add(parent);
113 _mod_icon_set(o, EINA_TRUE); 113 _mod_icon_set(o, EINA_TRUE);
114 evas_object_size_hint_aspect_set(o, EVAS_ASPECT_CONTROL_BOTH, 1, 1); 114 evas_object_size_hint_aspect_set(o, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
115// XXX: fill in later when we have gotten this far 115// XXX: fill in later when we have gotten this far
116// e_gadget_configure_cb_set(o, _gad_config); 116// e_gadget_configure_cb_set(o, _gad_config);
117 evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _gad_mouse_up, inst); 117 evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _gad_mouse_up, inst);
118 if (*id != -1) 118 if (*id != -1)
diff --git a/src/modules/clock/e_mod_config.c b/src/modules/clock/e_mod_config.c
index efa48486f..1c5fc371f 100644
--- a/src/modules/clock/e_mod_config.c
+++ b/src/modules/clock/e_mod_config.c
@@ -94,11 +94,11 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED,
94 e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 0, 0); 94 e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 0, 0);
95 ob = e_widget_radio_add(evas, _("24 h"), 1, rg); 95 ob = e_widget_radio_add(evas, _("24 h"), 1, rg);
96 e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 0, 0); 96 e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 0, 0);
97 97
98 e_widget_table_object_append(tab, of, 0, 0, 1, 1, 1, 1, 1, 1); 98 e_widget_table_object_append(tab, of, 0, 0, 1, 1, 1, 1, 1, 1);
99 99
100 of = e_widget_frametable_add(evas, _("Date"), 0); 100 of = e_widget_frametable_add(evas, _("Date"), 0);
101 101
102 rg = e_widget_radio_group_new(&(cfdata->cfg.show_date)); 102 rg = e_widget_radio_group_new(&(cfdata->cfg.show_date));
103 ob = e_widget_radio_add(evas, _("None"), 0, rg); 103 ob = e_widget_radio_add(evas, _("None"), 0, rg);
104 e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 0, 0); 104 e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 0, 0);
@@ -112,7 +112,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED,
112 e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 0, 0); 112 e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 0, 0);
113 113
114 e_widget_table_object_append(tab, of, 0, 1, 1, 1, 1, 1, 1, 1); 114 e_widget_table_object_append(tab, of, 0, 1, 1, 1, 1, 1, 1, 1);
115 115
116 of = e_widget_frametable_add(evas, _("Week"), 0); 116 of = e_widget_frametable_add(evas, _("Week"), 0);
117 117
118 ob = e_widget_label_add(evas, _("Start")); 118 ob = e_widget_label_add(evas, _("Start"));
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index 5d396c711..638d7e847 100644
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -490,7 +490,7 @@ e_int_clock_instances_redo(Eina_Bool all)
490 edje_object_part_text_set(o, "e.text.today", todaystr); 490 edje_object_part_text_set(o, "e.text.today", todaystr);
491 edje_object_message_signal_process(o); 491 edje_object_message_signal_process(o);
492 _eval_instance_size(inst); 492 _eval_instance_size(inst);
493 493
494 if (inst->o_popclock) 494 if (inst->o_popclock)
495 { 495 {
496 o = inst->o_popclock; 496 o = inst->o_popclock;
@@ -619,7 +619,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
619 inst->cfg = _conf_item_get(id); 619 inst->cfg = _conf_item_get(id);
620 620
621 _todaystr_eval(inst, todaystr, sizeof(todaystr) - 1); 621 _todaystr_eval(inst, todaystr, sizeof(todaystr) - 1);
622 622
623 o = edje_object_add(gc->evas); 623 o = edje_object_add(gc->evas);
624 edje_object_signal_callback_add(o, "e,state,sizing,changed", "*", 624 edje_object_signal_callback_add(o, "e,state,sizing,changed", "*",
625 _clock_sizing_changed_cb, inst); 625 _clock_sizing_changed_cb, inst);
diff --git a/src/modules/conf/e_mod_main.h b/src/modules/conf/e_mod_main.h
index a285ece5f..581172fe8 100644
--- a/src/modules/conf/e_mod_main.h
+++ b/src/modules/conf/e_mod_main.h
@@ -8,7 +8,7 @@
8#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION) 8#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION)
9 9
10typedef struct _Config Config; 10typedef struct _Config Config;
11struct _Config 11struct _Config
12{ 12{
13 E_Module *module; 13 E_Module *module;
14 E_Config_Dialog *cfd; 14 E_Config_Dialog *cfd;
diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c
index 203b34b73..0ce817596 100644
--- a/src/modules/conf_applications/e_int_config_apps.c
+++ b/src/modules/conf_applications/e_int_config_apps.c
@@ -488,7 +488,7 @@ _list_items_icon_set_cb(E_Config_App_List *apps)
488 EINA_LIST_FREE(apps->icons, o) 488 EINA_LIST_FREE(apps->icons, o)
489 { 489 {
490 if (count++ == 5) break; 490 if (count++ == 5) break;
491 491
492 _list_item_icon_set(o, evas_object_data_get(o, "deskicon")); 492 _list_item_icon_set(o, evas_object_data_get(o, "deskicon"));
493 } 493 }
494 if (!apps->icons) apps->idler = NULL; 494 if (!apps->icons) apps->idler = NULL;
diff --git a/src/modules/conf_applications/e_int_config_apps_personal.c b/src/modules/conf_applications/e_int_config_apps_personal.c
index 30cda9525..e4b1d038e 100644
--- a/src/modules/conf_applications/e_int_config_apps_personal.c
+++ b/src/modules/conf_applications/e_int_config_apps_personal.c
@@ -187,7 +187,7 @@ _fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il)
187static void 187static void
188_btn_cb_add(void *data EINA_UNUSED, void *data2 EINA_UNUSED) 188_btn_cb_add(void *data EINA_UNUSED, void *data2 EINA_UNUSED)
189{ 189{
190 e_desktop_edit(NULL); 190 e_desktop_edit(NULL);
191} 191}
192 192
193static void 193static void
diff --git a/src/modules/conf_applications/e_int_config_deskenv.c b/src/modules/conf_applications/e_int_config_deskenv.c
index cec587f72..933c405a6 100644
--- a/src/modules/conf_applications/e_int_config_deskenv.c
+++ b/src/modules/conf_applications/e_int_config_deskenv.c
@@ -135,7 +135,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
135 int cde = 0; 135 int cde = 0;
136 136
137 o = e_widget_list_add(evas, 0, 0); 137 o = e_widget_list_add(evas, 0, 0);
138 138
139 fr = e_widget_framelist_add(evas, _("Execution"), 0); 139 fr = e_widget_framelist_add(evas, _("Execution"), 0);
140 ob = e_widget_check_add(evas, _("Only launch single instances"), 140 ob = e_widget_check_add(evas, _("Only launch single instances"),
141 &(cfdata->exe_always_single_instance)); 141 &(cfdata->exe_always_single_instance));
@@ -155,7 +155,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
155 e_widget_list_object_append(o, fr, 1, 0, 0.0); 155 e_widget_list_object_append(o, fr, 1, 0, 0.0);
156 } 156 }
157#endif 157#endif
158 158
159 fr = e_widget_framelist_add(evas, _("Major Desktops"), 0); 159 fr = e_widget_framelist_add(evas, _("Major Desktops"), 0);
160 ob = e_widget_check_add(evas, _("Start GNOME services on login"), 160 ob = e_widget_check_add(evas, _("Start GNOME services on login"),
161 &(cfdata->load_gnome)); 161 &(cfdata->load_gnome));
diff --git a/src/modules/conf_bindings/e_int_config_mousebindings.c b/src/modules/conf_bindings/e_int_config_mousebindings.c
index 1d8ef595b..9acf0dfbd 100644
--- a/src/modules/conf_bindings/e_int_config_mousebindings.c
+++ b/src/modules/conf_bindings/e_int_config_mousebindings.c
@@ -236,7 +236,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata
236 236
237 EINA_LIST_FOREACH_SAFE(cfdata->binding.wheel, l, l2, bw) 237 EINA_LIST_FOREACH_SAFE(cfdata->binding.wheel, l, l2, bw)
238 { 238 {
239 if ((!bw->modifiers) && 239 if ((!bw->modifiers) &&
240 (bw->direction == 0) && 240 (bw->direction == 0) &&
241 ((bw->context == E_BINDING_CONTEXT_WINDOW) || (bw->context == E_BINDING_CONTEXT_ANY))) 241 ((bw->context == E_BINDING_CONTEXT_WINDOW) || (bw->context == E_BINDING_CONTEXT_ANY)))
242 { 242 {
@@ -1184,13 +1184,13 @@ _helper_wheel_name_get(E_Config_Binding_Wheel *bw)
1184 switch (bw->direction) 1184 switch (bw->direction)
1185 { 1185 {
1186 case 0: 1186 case 0:
1187 if (bw->z < 0) 1187 if (bw->z < 0)
1188 name = strdup(_("Mouse Wheel Up")); 1188 name = strdup(_("Mouse Wheel Up"));
1189 else 1189 else
1190 name = strdup(_("Mouse Wheel Down")); 1190 name = strdup(_("Mouse Wheel Down"));
1191 break; 1191 break;
1192 default: 1192 default:
1193 if (bw->z < 0) 1193 if (bw->z < 0)
1194 snprintf(buf, sizeof(buf), _("Extra Wheel (%d) Up"), bw->direction); 1194 snprintf(buf, sizeof(buf), _("Extra Wheel (%d) Up"), bw->direction);
1195 else 1195 else
1196 snprintf(buf, sizeof(buf), _("Extra Wheel (%d) Down"), bw->direction); 1196 snprintf(buf, sizeof(buf), _("Extra Wheel (%d) Down"), bw->direction);
@@ -1414,7 +1414,7 @@ _grab_mouse_wheel_cb(void *data, int type EINA_UNUSED, void *event)
1414 if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) 1414 if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)
1415 mod |= E_BINDING_MODIFIER_ALT; 1415 mod |= E_BINDING_MODIFIER_ALT;
1416 if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) 1416 if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
1417 mod |= E_BINDING_MODIFIER_WIN; 1417 mod |= E_BINDING_MODIFIER_WIN;
1418 1418
1419 if (cfdata->locals.add) 1419 if (cfdata->locals.add)
1420 { 1420 {
diff --git a/src/modules/conf_bindings/e_int_config_signalbindings.c b/src/modules/conf_bindings/e_int_config_signalbindings.c
index cf2fa2a49..87839de11 100644
--- a/src/modules/conf_bindings/e_int_config_signalbindings.c
+++ b/src/modules/conf_bindings/e_int_config_signalbindings.c
@@ -633,7 +633,7 @@ _signal_add_show(E_Config_Dialog_Data *cfdata)
633 entry = o = e_widget_entry_add(cfdata->locals.dia->win, &cfdata->locals.dia_source, NULL, NULL, NULL); 633 entry = o = e_widget_entry_add(cfdata->locals.dia->win, &cfdata->locals.dia_source, NULL, NULL, NULL);
634 e_widget_framelist_object_append(ol, o); 634 e_widget_framelist_object_append(ol, o);
635 e_widget_list_object_append(obg, ol, 1, 0, 0.5); 635 e_widget_list_object_append(obg, ol, 1, 0, 0.5);
636 636
637 ol = e_widget_framelist_add(evas, _("Signal:"), 0); 637 ol = e_widget_framelist_add(evas, _("Signal:"), 0);
638 o = e_widget_entry_add(cfdata->locals.dia->win, &cfdata->locals.dia_signal, NULL, NULL, NULL); 638 o = e_widget_entry_add(cfdata->locals.dia->win, &cfdata->locals.dia_signal, NULL, NULL, NULL);
639 e_widget_framelist_object_append(ol, o); 639 e_widget_framelist_object_append(ol, o);
@@ -650,7 +650,7 @@ static void
650_add_signal_binding_cb(void *data, void *data2 EINA_UNUSED) 650_add_signal_binding_cb(void *data, void *data2 EINA_UNUSED)
651{ 651{
652 E_Config_Dialog_Data *cfdata = data; 652 E_Config_Dialog_Data *cfdata = data;
653 653
654 _auto_apply_changes(cfdata); 654 _auto_apply_changes(cfdata);
655 _signal_add_show(cfdata); 655 _signal_add_show(cfdata);
656} 656}
diff --git a/src/modules/conf_dialogs/e_int_config_dialogs.c b/src/modules/conf_dialogs/e_int_config_dialogs.c
index e929b2c46..6bf6cfd85 100644
--- a/src/modules/conf_dialogs/e_int_config_dialogs.c
+++ b/src/modules/conf_dialogs/e_int_config_dialogs.c
@@ -10,7 +10,7 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfda
10static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); 10static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
11#endif 11#endif
12 12
13struct _E_Config_Dialog_Data 13struct _E_Config_Dialog_Data
14{ 14{
15 int cnfmdlg_disabled; 15 int cnfmdlg_disabled;
16 int cfgdlg_auto_apply; 16 int cfgdlg_auto_apply;
@@ -20,21 +20,21 @@ struct _E_Config_Dialog_Data
20}; 20};
21 21
22E_Config_Dialog * 22E_Config_Dialog *
23e_int_config_dialogs(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED) 23e_int_config_dialogs(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
24{ 24{
25 E_Config_Dialog *cfd; 25 E_Config_Dialog *cfd;
26 E_Config_Dialog_View *v; 26 E_Config_Dialog_View *v;
27 27
28 if (e_config_dialog_find("E", "settings/dialogs")) return NULL; 28 if (e_config_dialog_find("E", "settings/dialogs")) return NULL;
29 v = E_NEW(E_Config_Dialog_View, 1); 29 v = E_NEW(E_Config_Dialog_View, 1);
30 30
31 v->create_cfdata = _create_data; 31 v->create_cfdata = _create_data;
32 v->free_cfdata = _free_data; 32 v->free_cfdata = _free_data;
33 v->basic.apply_cfdata = _basic_apply_data; 33 v->basic.apply_cfdata = _basic_apply_data;
34 v->basic.create_widgets = _basic_create_widgets; 34 v->basic.create_widgets = _basic_create_widgets;
35 v->basic.check_changed = _basic_check_changed; 35 v->basic.check_changed = _basic_check_changed;
36 v->override_auto_apply = 1; 36 v->override_auto_apply = 1;
37 37
38 cfd = e_config_dialog_new(NULL, _("Dialog Settings"), 38 cfd = e_config_dialog_new(NULL, _("Dialog Settings"),
39 "E", "settings/dialogs", 39 "E", "settings/dialogs",
40 "preferences-system", 0, v, NULL); 40 "preferences-system", 0, v, NULL);
@@ -78,7 +78,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata
78 e_config->remember_internal_windows |= E_REMEMBER_INTERNAL_DIALOGS; 78 e_config->remember_internal_windows |= E_REMEMBER_INTERNAL_DIALOGS;
79 else 79 else
80 e_config->remember_internal_windows &= ~E_REMEMBER_INTERNAL_DIALOGS; 80 e_config->remember_internal_windows &= ~E_REMEMBER_INTERNAL_DIALOGS;
81 81
82 e_config_save_queue(); 82 e_config_save_queue();
83 return 1; 83 return 1;
84} 84}
@@ -103,7 +103,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
103{ 103{
104 Evas_Object *o, *of, *ob; 104 Evas_Object *o, *of, *ob;
105 E_Radio_Group *rg; 105 E_Radio_Group *rg;
106 106
107 o = e_widget_list_add(evas, 0, 0); 107 o = e_widget_list_add(evas, 0, 0);
108 108
109 of = e_widget_framelist_add(evas, _("General Settings"), 0); 109 of = e_widget_framelist_add(evas, _("General Settings"), 0);
@@ -126,7 +126,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
126 e_widget_list_object_append(o, of, 1, 0, 0.5); 126 e_widget_list_object_append(o, of, 1, 0, 0.5);
127 127
128 of = e_widget_framelist_add(evas, _("Remember"), 0); 128 of = e_widget_framelist_add(evas, _("Remember"), 0);
129 ob = e_widget_check_add(evas, _("Remember size and position of dialogs"), 129 ob = e_widget_check_add(evas, _("Remember size and position of dialogs"),
130 &(cfdata->remember_windows)); 130 &(cfdata->remember_windows));
131 e_widget_framelist_object_append(of, ob); 131 e_widget_framelist_object_append(of, ob);
132 e_widget_list_object_append(o, of, 1, 0, 0.5); 132 e_widget_list_object_append(o, of, 1, 0, 0.5);
@@ -136,7 +136,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
136 136
137#if 0 137#if 0
138static int 138static int
139_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 139_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
140{ 140{
141 /* Auto Apply is disabled in E for now */ 141 /* Auto Apply is disabled in E for now */
142 /* (e_config->cfgdlg_auto_apply = cfdata->auto_apply; */ 142 /* (e_config->cfgdlg_auto_apply = cfdata->auto_apply; */
@@ -148,18 +148,18 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
148} 148}
149 149
150static Evas_Object * 150static Evas_Object *
151_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 151_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
152{ 152{
153 Evas_Object *o, *ob, *of; 153 Evas_Object *o, *ob, *of;
154 E_Radio_Group *rg; 154 E_Radio_Group *rg;
155 155
156 o = e_widget_list_add(evas, 0, 0); 156 o = e_widget_list_add(evas, 0, 0);
157 157
158// of = e_widget_framelist_add(evas, _("General Settings"), 0); 158// of = e_widget_framelist_add(evas, _("General Settings"), 0);
159// ob = e_widget_check_add(evas, _("Auto-Apply Settings Changes"), &(cfdata->auto_apply)); 159// ob = e_widget_check_add(evas, _("Auto-Apply Settings Changes"), &(cfdata->auto_apply));
160// e_widget_framelist_object_append(of, ob); 160// e_widget_framelist_object_append(of, ob);
161// e_widget_list_object_append(o, of, 1, 1, 0.5); 161// e_widget_list_object_append(o, of, 1, 1, 0.5);
162 162
163 of = e_widget_framelist_add(evas, _("Default Dialog Mode"), 0); 163 of = e_widget_framelist_add(evas, _("Default Dialog Mode"), 0);
164 rg = e_widget_radio_group_new(&(cfdata->default_mode)); 164 rg = e_widget_radio_group_new(&(cfdata->default_mode));
165 165
@@ -167,8 +167,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
167 e_widget_framelist_object_append(of, ob); 167 e_widget_framelist_object_append(of, ob);
168 ob = e_widget_radio_add(evas, _("Advanced Mode"), E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED, rg); 168 ob = e_widget_radio_add(evas, _("Advanced Mode"), E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED, rg);
169 e_widget_framelist_object_append(of, ob); 169 e_widget_framelist_object_append(of, ob);
170 170
171 e_widget_list_object_append(o, of, 1, 1, 0.5); 171 e_widget_list_object_append(o, of, 1, 1, 0.5);
172 return o; 172 return o;
173} 173}
174#endif 174#endif