summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElyes HAOUAS <ehaouas@noos.fr>2020-05-13 19:34:25 +0000
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-14 14:17:17 +0200
commit4d519842865d540b707265eb8047b9e12ed130c5 (patch)
tree543ae034be4db6777e83f0bffb56502adb731ba3 /src
parent65441c214b204f375dcb91f7e835ab3a59c5f43c (diff)
tree-wide: get rid of trailing whitespace (part 11)
Remove trailing whitespaces Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11831
Diffstat (limited to 'src')
-rw-r--r--src/modules/notification/e_mod_main.c2
-rw-r--r--src/modules/notification/e_mod_main.h4
-rw-r--r--src/modules/notification/e_mod_popup.c12
-rw-r--r--src/modules/packagekit/e_mod_packagekit.c48
-rw-r--r--src/modules/pager/e_mod_main.c2
-rw-r--r--src/modules/pager/gadget/pager.c2
-rw-r--r--src/modules/quickaccess/e_mod_quickaccess.c14
-rw-r--r--src/modules/shot/e_mod_edit.c6
-rw-r--r--src/modules/sysinfo/batman/batman_upower.c2
-rw-r--r--src/modules/sysinfo/cpuclock/cpuclock.c2
-rw-r--r--src/modules/sysinfo/netstatus/netstatus.h2
-rw-r--r--src/modules/sysinfo/netstatus/netstatus_proc.c2
-rw-r--r--src/modules/sysinfo/netstatus/netstatus_sysctl.c2
-rw-r--r--src/modules/systray/e_mod_notifier_host.c2
-rw-r--r--src/modules/systray/e_mod_notifier_host_dbus.c2
-rw-r--r--src/modules/teamwork/e_mod_main.h2
-rw-r--r--src/modules/teamwork/e_mod_tw.c2
-rw-r--r--src/modules/temperature/e_mod_config.c102
-rw-r--r--src/modules/temperature/e_mod_main.c2
-rw-r--r--src/modules/time/config.c4
-rw-r--r--src/modules/wireless/connman.c2
21 files changed, 109 insertions, 109 deletions
diff --git a/src/modules/notification/e_mod_main.c b/src/modules/notification/e_mod_main.c
index 027880234..b326dd93d 100644
--- a/src/modules/notification/e_mod_main.c
+++ b/src/modules/notification/e_mod_main.c
@@ -162,7 +162,7 @@ e_modapi_init(E_Module *m)
162 /* register config panel entry */ 162 /* register config panel entry */
163 e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, 163 e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL,
164 "preferences-extensions"); 164 "preferences-extensions");
165 e_configure_registry_item_add("extensions/notification", 30, 165 e_configure_registry_item_add("extensions/notification", 30,
166 _("Notification"), NULL, 166 _("Notification"), NULL,
167 buf, e_int_config_notification_module); 167 buf, e_int_config_notification_module);
168 168
diff --git a/src/modules/notification/e_mod_main.h b/src/modules/notification/e_mod_main.h
index 077a5e494..b5bb9fc7a 100644
--- a/src/modules/notification/e_mod_main.h
+++ b/src/modules/notification/e_mod_main.h
@@ -29,7 +29,7 @@ typedef enum
29 POPUP_DISPLAY_POLICY_MULTI 29 POPUP_DISPLAY_POLICY_MULTI
30} Popup_Display_Policy; 30} Popup_Display_Policy;
31 31
32struct _Config 32struct _Config
33{ 33{
34 E_Config_Dialog *cfd; 34 E_Config_Dialog *cfd;
35 35
@@ -48,7 +48,7 @@ struct _Config
48 Eina_Bool presentation; 48 Eina_Bool presentation;
49 Eina_Bool offline; 49 Eina_Bool offline;
50 } last_config_mode; 50 } last_config_mode;
51 51
52 Ecore_Event_Handler *handler; 52 Ecore_Event_Handler *handler;
53 Eina_List *popups; 53 Eina_List *popups;
54 unsigned int next_id; 54 unsigned int next_id;
diff --git a/src/modules/notification/e_mod_popup.c b/src/modules/notification/e_mod_popup.c
index cad8897f7..9c2c7b077 100644
--- a/src/modules/notification/e_mod_popup.c
+++ b/src/modules/notification/e_mod_popup.c
@@ -449,7 +449,7 @@ _notification_popup_refresh(Popup_Data *popup)
449 unsigned int size; 449 unsigned int size;
450 450
451 size = e_util_icon_size_normalize(width * e_scale); 451 size = e_util_icon_size_normalize(width * e_scale);
452 new_path = efreet_icon_path_find(e_config->icon_theme, 452 new_path = efreet_icon_path_find(e_config->icon_theme,
453 icon_path, size); 453 icon_path, size);
454 if (new_path) 454 if (new_path)
455 icon_path = new_path; 455 icon_path = new_path;
@@ -492,16 +492,16 @@ _notification_popup_refresh(Popup_Data *popup)
492 { 492 {
493 char buf[PATH_MAX]; 493 char buf[PATH_MAX];
494 494
495 snprintf(buf, sizeof(buf), "%s/e-module-notification.edj", 495 snprintf(buf, sizeof(buf), "%s/e-module-notification.edj",
496 notification_mod->dir); 496 notification_mod->dir);
497 popup->app_icon = edje_object_add(popup->e); 497 popup->app_icon = edje_object_add(popup->e);
498 if (!e_theme_edje_object_set(popup->app_icon, 498 if (!e_theme_edje_object_set(popup->app_icon,
499 "base/theme/modules/notification", 499 "base/theme/modules/notification",
500 "e/modules/notification/logo")) 500 "e/modules/notification/logo"))
501 if (!e_theme_edje_object_set(popup->app_icon, 501 if (!e_theme_edje_object_set(popup->app_icon,
502 "base/theme/modules/notification", 502 "base/theme/modules/notification",
503 "modules/notification/logo")) 503 "modules/notification/logo"))
504 edje_object_file_set(popup->app_icon, buf, 504 edje_object_file_set(popup->app_icon, buf,
505 "modules/notification/logo"); 505 "modules/notification/logo");
506 w = width; 506 w = width;
507 h = height; 507 h = height;
@@ -518,7 +518,7 @@ _notification_popup_refresh(Popup_Data *popup)
518 evas_object_size_hint_min_set(popup->app_icon, w, h); 518 evas_object_size_hint_min_set(popup->app_icon, w, h);
519 evas_object_size_hint_max_set(popup->app_icon, w, h); 519 evas_object_size_hint_max_set(popup->app_icon, w, h);
520 520
521 edje_object_part_swallow(popup->theme, "notification.swallow.app_icon", 521 edje_object_part_swallow(popup->theme, "notification.swallow.app_icon",
522 popup->app_icon); 522 popup->app_icon);
523 edje_object_signal_emit(popup->theme, "notification,icon", "notification"); 523 edje_object_signal_emit(popup->theme, "notification,icon", "notification");
524 524
diff --git a/src/modules/packagekit/e_mod_packagekit.c b/src/modules/packagekit/e_mod_packagekit.c
index dddba02dd..cb412dc65 100644
--- a/src/modules/packagekit/e_mod_packagekit.c
+++ b/src/modules/packagekit/e_mod_packagekit.c
@@ -205,7 +205,7 @@ _install_button_cb(void *data, Evas_Object *obj EINA_UNUSED,
205} 205}
206 206
207static void 207static void
208_run_button_cb(void *data, Evas_Object *obj EINA_UNUSED, 208_run_button_cb(void *data, Evas_Object *obj EINA_UNUSED,
209 void *event EINA_UNUSED) 209 void *event EINA_UNUSED)
210{ 210{
211 E_PackageKit_Instance *inst = data; 211 E_PackageKit_Instance *inst = data;
@@ -250,11 +250,11 @@ packagekit_popup_update(E_PackageKit_Instance *inst, Eina_Bool rebuild_list)
250 EINA_LIST_FOREACH(ctxt->packages, l, pkg) 250 EINA_LIST_FOREACH(ctxt->packages, l, pkg)
251 { 251 {
252 if (rebuild_list) 252 if (rebuild_list)
253 elm_genlist_item_append(inst->popup_genlist, inst->popup_genlist_itc, 253 elm_genlist_item_append(inst->popup_genlist, inst->popup_genlist_itc,
254 pkg, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 254 pkg, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
255 num_updates++; 255 num_updates++;
256 } 256 }
257 257
258 // show the progress bar if an operation is in progress 258 // show the progress bar if an operation is in progress
259 if (ctxt->transaction) 259 if (ctxt->transaction)
260 { 260 {
@@ -275,7 +275,7 @@ packagekit_popup_update(E_PackageKit_Instance *inst, Eina_Bool rebuild_list)
275 snprintf(buf, sizeof(buf), _("Your system is updated")); 275 snprintf(buf, sizeof(buf), _("Your system is updated"));
276 elm_object_text_set(inst->popup_title_entry, buf); 276 elm_object_text_set(inst->popup_title_entry, buf);
277 elm_object_text_set(inst->popup_error_label, ""); 277 elm_object_text_set(inst->popup_error_label, "");
278 278
279 // update the status of the install button 279 // update the status of the install button
280 selected = elm_genlist_selected_items_get(inst->popup_genlist); 280 selected = elm_genlist_selected_items_get(inst->popup_genlist);
281 if (ctxt->transaction) 281 if (ctxt->transaction)
@@ -290,7 +290,7 @@ packagekit_popup_update(E_PackageKit_Instance *inst, Eina_Bool rebuild_list)
290 } 290 }
291 else if ((selected == NULL) || (eina_list_count(selected) == 0)) 291 else if ((selected == NULL) || (eina_list_count(selected) == 0))
292 { 292 {
293 elm_object_text_set(inst->popup_install_button, 293 elm_object_text_set(inst->popup_install_button,
294 _("Install all available updates")); 294 _("Install all available updates"));
295 elm_object_disabled_set(inst->popup_install_button, EINA_FALSE); 295 elm_object_disabled_set(inst->popup_install_button, EINA_FALSE);
296 } 296 }
@@ -306,18 +306,18 @@ packagekit_popup_update(E_PackageKit_Instance *inst, Eina_Bool rebuild_list)
306} 306}
307 307
308void 308void
309packagekit_all_popups_update(E_PackageKit_Module_Context *ctxt, 309packagekit_all_popups_update(E_PackageKit_Module_Context *ctxt,
310 Eina_Bool rebuild_list) 310 Eina_Bool rebuild_list)
311{ 311{
312 E_PackageKit_Instance *inst; 312 E_PackageKit_Instance *inst;
313 Eina_List *l; 313 Eina_List *l;
314 314
315 EINA_LIST_FOREACH(ctxt->instances, l, inst) 315 EINA_LIST_FOREACH(ctxt->instances, l, inst)
316 packagekit_popup_update(inst, rebuild_list); 316 packagekit_popup_update(inst, rebuild_list);
317} 317}
318 318
319void 319void
320packagekit_progress_percentage_update(E_PackageKit_Module_Context *ctxt, 320packagekit_progress_percentage_update(E_PackageKit_Module_Context *ctxt,
321 int percent) 321 int percent)
322{ 322{
323 E_PackageKit_Instance *inst; 323 E_PackageKit_Instance *inst;
@@ -426,7 +426,7 @@ _gl_item_content_get(void *data, Evas_Object *obj, const char *part)
426} 426}
427 427
428static void 428static void
429_genlist_selunsel_cb(void *data, Evas_Object *obj EINA_UNUSED, 429_genlist_selunsel_cb(void *data, Evas_Object *obj EINA_UNUSED,
430 void *event EINA_UNUSED) 430 void *event EINA_UNUSED)
431{ 431{
432 packagekit_popup_update(data, EINA_FALSE); 432 packagekit_popup_update(data, EINA_FALSE);
@@ -481,7 +481,7 @@ packagekit_popup_new(E_PackageKit_Instance *inst, Eina_Bool is_gadcon)
481 481
482 // refresh button 482 // refresh button
483 ic = elm_icon_add(table); 483 ic = elm_icon_add(table);
484 evas_object_size_hint_min_set(ic, 16 * elm_config_scale_get(), 484 evas_object_size_hint_min_set(ic, 16 * elm_config_scale_get(),
485 16 * elm_config_scale_get()); 485 16 * elm_config_scale_get());
486 elm_icon_standard_set(ic, "view-refresh"); 486 elm_icon_standard_set(ic, "view-refresh");
487 bt = elm_button_add(table); 487 bt = elm_button_add(table);
@@ -492,7 +492,7 @@ packagekit_popup_new(E_PackageKit_Instance *inst, Eina_Bool is_gadcon)
492 492
493 // help button 493 // help button
494 ic = elm_icon_add(table); 494 ic = elm_icon_add(table);
495 evas_object_size_hint_min_set(ic, 16 * elm_config_scale_get(), 495 evas_object_size_hint_min_set(ic, 16 * elm_config_scale_get(),
496 16 * elm_config_scale_get()); 496 16 * elm_config_scale_get());
497 elm_icon_standard_set(ic, "help-contents"); 497 elm_icon_standard_set(ic, "help-contents");
498 bt = elm_button_add(table); 498 bt = elm_button_add(table);
@@ -692,9 +692,9 @@ packagekit_refresh_cache(E_PackageKit_Module_Context *ctxt, const char *transact
692 _store_error(ctxt, "could not call RefreshCache()"); 692 _store_error(ctxt, "could not call RefreshCache()");
693 return; 693 return;
694 } 694 }
695 eldbus_proxy_signal_handler_add(proxy, "Finished", 695 eldbus_proxy_signal_handler_add(proxy, "Finished",
696 _signal_cache_finished_cb, ctxt); 696 _signal_cache_finished_cb, ctxt);
697 eldbus_proxy_signal_handler_add(proxy, "RepoDetail", 697 eldbus_proxy_signal_handler_add(proxy, "RepoDetail",
698 _signal_repo_detail_cb, ctxt); 698 _signal_repo_detail_cb, ctxt);
699 ctxt->transaction = proxy; 699 ctxt->transaction = proxy;
700} 700}
@@ -838,7 +838,7 @@ _signal_update_error_code_cb(void *data, const Eldbus_Message *msg)
838 _store_error(ctxt, "could not get error code arguments"); 838 _store_error(ctxt, "could not get error code arguments");
839 return; 839 return;
840 } 840 }
841 841
842 if (details) 842 if (details)
843 _store_error(ctxt, details); 843 _store_error(ctxt, details);
844} 844}
@@ -876,8 +876,8 @@ packagekit_update_packages(E_PackageKit_Module_Context *ctxt, const char *transa
876 proxy = eldbus_proxy_get(obj, "org.freedesktop.PackageKit.Transaction"); 876 proxy = eldbus_proxy_get(obj, "org.freedesktop.PackageKit.Transaction");
877 msg = eldbus_proxy_method_call_new(proxy, "UpdatePackages"); 877 msg = eldbus_proxy_method_call_new(proxy, "UpdatePackages");
878 iter = eldbus_message_iter_get(msg); 878 iter = eldbus_message_iter_get(msg);
879 eldbus_message_iter_arguments_append(iter, "tas", 879 eldbus_message_iter_arguments_append(iter, "tas",
880 PK_TRANSACTION_FLAG_ENUM_ONLY_TRUSTED, 880 PK_TRANSACTION_FLAG_ENUM_ONLY_TRUSTED,
881 &array_of_string); 881 &array_of_string);
882 EINA_LIST_FOREACH(ctxt->packages, l, pkg) 882 EINA_LIST_FOREACH(ctxt->packages, l, pkg)
883 { 883 {
@@ -895,16 +895,16 @@ packagekit_update_packages(E_PackageKit_Module_Context *ctxt, const char *transa
895 _store_error(ctxt, "could not call UpdatePackages()"); 895 _store_error(ctxt, "could not call UpdatePackages()");
896 return; 896 return;
897 } 897 }
898 eldbus_proxy_signal_handler_add(proxy, "ErrorCode", 898 eldbus_proxy_signal_handler_add(proxy, "ErrorCode",
899 _signal_update_error_code_cb, ctxt); 899 _signal_update_error_code_cb, ctxt);
900 eldbus_proxy_signal_handler_add(proxy, "Finished", 900 eldbus_proxy_signal_handler_add(proxy, "Finished",
901 _signal_update_finished_cb, ctxt); 901 _signal_update_finished_cb, ctxt);
902 ctxt->transaction = proxy; 902 ctxt->transaction = proxy;
903} 903}
904 904
905/* CreateTransaction() */ 905/* CreateTransaction() */
906static void 906static void
907_transaction_changed_props_iter(void *data, const void *key, 907_transaction_changed_props_iter(void *data, const void *key,
908 Eldbus_Message_Iter *val) 908 Eldbus_Message_Iter *val)
909{ 909{
910 E_PackageKit_Module_Context *ctxt = data; 910 E_PackageKit_Module_Context *ctxt = data;
@@ -933,7 +933,7 @@ _signal_transaction_props_changed_cb(void *data, const Eldbus_Message *msg)
933 } 933 }
934 934
935 ret = eldbus_message_arguments_get(msg, "sa{sv}as", &interface_name, 935 ret = eldbus_message_arguments_get(msg, "sa{sv}as", &interface_name,
936 &changed_properties, 936 &changed_properties,
937 &invalidated_properties); 937 &invalidated_properties);
938 if (!ret) 938 if (!ret)
939 { 939 {
@@ -941,7 +941,7 @@ _signal_transaction_props_changed_cb(void *data, const Eldbus_Message *msg)
941 return; 941 return;
942 } 942 }
943 943
944 eldbus_message_iter_dict_iterate(changed_properties, "sv", 944 eldbus_message_iter_dict_iterate(changed_properties, "sv",
945 _transaction_changed_props_iter, ctxt); 945 _transaction_changed_props_iter, ctxt);
946} 946}
947 947
@@ -974,13 +974,13 @@ _transaction_created_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *p
974 // monitor the "Percentage" property to update the progress bar 974 // monitor the "Percentage" property to update the progress bar
975 obj = eldbus_object_get(ctxt->conn, "org.freedesktop.PackageKit", trans_path); 975 obj = eldbus_object_get(ctxt->conn, "org.freedesktop.PackageKit", trans_path);
976 proxy = eldbus_proxy_get(obj, "org.freedesktop.DBus.Properties"); 976 proxy = eldbus_proxy_get(obj, "org.freedesktop.DBus.Properties");
977 eldbus_proxy_signal_handler_add(proxy, "PropertiesChanged", 977 eldbus_proxy_signal_handler_add(proxy, "PropertiesChanged",
978 _signal_transaction_props_changed_cb, ctxt); 978 _signal_transaction_props_changed_cb, ctxt);
979 979
980 // call the operation function 980 // call the operation function
981 func = eldbus_pending_data_get(pending, "func"); 981 func = eldbus_pending_data_get(pending, "func");
982 func(ctxt, trans_path); 982 func(ctxt, trans_path);
983 983
984 // update all the faces 984 // update all the faces
985 packagekit_icon_update(ctxt, EINA_TRUE); 985 packagekit_icon_update(ctxt, EINA_TRUE);
986 packagekit_all_popups_update(ctxt, EINA_FALSE); 986 packagekit_all_popups_update(ctxt, EINA_FALSE);
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index e6fdc1f7a..a99be300b 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -1960,7 +1960,7 @@ _pager_popup_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *eve
1960 if (pp) 1960 if (pp)
1961 { 1961 {
1962 E_Desk *desk; 1962 E_Desk *desk;
1963 1963
1964 desk = e_desk_at_xy_get(pp->pager->zone, 1964 desk = e_desk_at_xy_get(pp->pager->zone,
1965 current_desk->x, current_desk->y); 1965 current_desk->x, current_desk->y);
1966 if (desk) e_desk_show(desk); 1966 if (desk) e_desk_show(desk);
diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c
index dab861b0e..deea78485 100644
--- a/src/modules/pager/gadget/pager.c
+++ b/src/modules/pager/gadget/pager.c
@@ -712,7 +712,7 @@ _pager_desk_free(Pager_Desk *pd)
712 evas_object_del(pd->drop_handler); 712 evas_object_del(pd->drop_handler);
713 pd->drop_handler = NULL; 713 pd->drop_handler = NULL;
714 evas_object_del(pd->o_desk); 714 evas_object_del(pd->o_desk);
715 evas_object_del(pd->o_layout); 715 evas_object_del(pd->o_layout);
716 EINA_LIST_FREE(pd->wins, w) 716 EINA_LIST_FREE(pd->wins, w)
717 _pager_window_free(w); 717 _pager_window_free(w);
718 e_object_unref(E_OBJECT(pd->desk)); 718 e_object_unref(E_OBJECT(pd->desk));
diff --git a/src/modules/quickaccess/e_mod_quickaccess.c b/src/modules/quickaccess/e_mod_quickaccess.c
index 6482f5832..c053bc572 100644
--- a/src/modules/quickaccess/e_mod_quickaccess.c
+++ b/src/modules/quickaccess/e_mod_quickaccess.c
@@ -222,7 +222,7 @@ static void
222_e_qa_entry_border_props_apply(E_Quick_Access_Entry *entry) 222_e_qa_entry_border_props_apply(E_Quick_Access_Entry *entry)
223{ 223{
224 if (!entry->client) return; 224 if (!entry->client) return;
225 225
226 if (entry->config.autohide && (!entry->client->focused)) 226 if (entry->config.autohide && (!entry->client->focused))
227 _e_qa_border_deactivate(entry); 227 _e_qa_border_deactivate(entry);
228#define SET(X) \ 228#define SET(X) \
@@ -1011,7 +1011,7 @@ _e_qa_help5(void *data EINA_UNUSED)
1011 ecore_job_add(_e_qa_help5, NULL); 1011 ecore_job_add(_e_qa_help5, NULL);
1012 return; 1012 return;
1013 } 1013 }
1014 snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); 1014 snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module));
1015 qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf, 1015 qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf,
1016 _("You deleted it on your own, you rascal!<ps/>" 1016 _("You deleted it on your own, you rascal!<ps/>"
1017 "Way to go!"), 1017 "Way to go!"),
@@ -1068,7 +1068,7 @@ _e_qa_help4(void *data EINA_UNUSED)
1068{ 1068{
1069 char buf[PATH_MAX]; 1069 char buf[PATH_MAX];
1070 1070
1071 snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); 1071 snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module));
1072 qa_mod->help_dia = (E_Object*)e_util_dialog_internal(_("Quickaccess Help"), 1072 qa_mod->help_dia = (E_Object*)e_util_dialog_internal(_("Quickaccess Help"),
1073 _("The demo dialog has been bound to the keys you pressed.<ps/>" 1073 _("The demo dialog has been bound to the keys you pressed.<ps/>"
1074 "Try pressing the same keys!")); 1074 "Try pressing the same keys!"));
@@ -1113,7 +1113,7 @@ _e_qa_help_bd_menu2_del(void *data EINA_UNUSED)
1113 qa_mod->demo_state = 0; 1113 qa_mod->demo_state = 0;
1114 qa_mod->help_timer = NULL; 1114 qa_mod->help_timer = NULL;
1115 if (!qa_config->transient_entries) return; 1115 if (!qa_config->transient_entries) return;
1116 _e_qa_help_timeout(NULL); 1116 _e_qa_help_timeout(NULL);
1117} 1117}
1118 1118
1119static Eina_Bool 1119static Eina_Bool
@@ -1263,7 +1263,7 @@ _e_qa_help2(void *data EINA_UNUSED)
1263 ecore_job_add(_e_qa_help2, NULL); 1263 ecore_job_add(_e_qa_help2, NULL);
1264 return; 1264 return;
1265 } 1265 }
1266 snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); 1266 snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module));
1267 qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf, 1267 qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf,
1268 _("Quickaccess entries can be created from<ps/>" 1268 _("Quickaccess entries can be created from<ps/>"
1269 "the border menu of any window.<ps/>" 1269 "the border menu of any window.<ps/>"
@@ -1284,7 +1284,7 @@ _e_qa_help(void *data)
1284 return; 1284 return;
1285 } 1285 }
1286 if (qa_mod->help_dia) return; 1286 if (qa_mod->help_dia) return;
1287 snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); 1287 snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module));
1288 qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf, 1288 qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf,
1289 _("Quickaccess is a way of binding user-selected<ps/>" 1289 _("Quickaccess is a way of binding user-selected<ps/>"
1290 "windows and applications to keyboard shortcuts.<ps/>" 1290 "windows and applications to keyboard shortcuts.<ps/>"
@@ -1349,7 +1349,7 @@ e_qa_init(void)
1349 _e_qa_del->func.go = _e_qa_del_cb; 1349 _e_qa_del->func.go = _e_qa_del_cb;
1350 e_action_predef_name_set(_e_qa_name, _lbl_del, _act_del, NULL, NULL, 0); 1350 e_action_predef_name_set(_e_qa_name, _lbl_del, _act_del, NULL, NULL, 0);
1351 INF("loaded qa module, registered %s action.", _act_toggle); 1351 INF("loaded qa module, registered %s action.", _act_toggle);
1352 1352
1353 border_hook = e_int_client_menu_hook_add(_e_qa_bd_menu_hook, NULL); 1353 border_hook = e_int_client_menu_hook_add(_e_qa_bd_menu_hook, NULL);
1354 if (!qa_config->first_run) _e_qa_first_run(); 1354 if (!qa_config->first_run) _e_qa_first_run();
1355 else 1355 else
diff --git a/src/modules/shot/e_mod_edit.c b/src/modules/shot/e_mod_edit.c
index 102a7d468..ef69f5a79 100644
--- a/src/modules/shot/e_mod_edit.c
+++ b/src/modules/shot/e_mod_edit.c
@@ -612,12 +612,12 @@ draw_selectable_set(Eina_Bool sel)
612 evas_object_pass_events_set(o, !sel); 612 evas_object_pass_events_set(o, !sel);
613 } 613 }
614} 614}
615// 615//
616////////////////////////////////////////////////////////////////////////////// 616//////////////////////////////////////////////////////////////////////////////
617 617
618////////////////////////////////////////////////////////////////////////////// 618//////////////////////////////////////////////////////////////////////////////
619// 619//
620// 620//
621////////////////////////////////////////////////////////////////////////////// 621//////////////////////////////////////////////////////////////////////////////
622 622
623////////////////////////////////////////////////////////////////////////////// 623//////////////////////////////////////////////////////////////////////////////
diff --git a/src/modules/sysinfo/batman/batman_upower.c b/src/modules/sysinfo/batman/batman_upower.c
index 5ac8a6b49..7fe8493d4 100644
--- a/src/modules/sysinfo/batman/batman_upower.c
+++ b/src/modules/sysinfo/batman/batman_upower.c
@@ -249,7 +249,7 @@ _device_type_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
249 upower_proxy_ac = eldbus_proxy_get(obj, IFACE_PROPERTIES); 249 upower_proxy_ac = eldbus_proxy_get(obj, IFACE_PROPERTIES);
250 _process_ac(ud->proxy, ud->inst); 250 _process_ac(ud->proxy, ud->inst);
251 } 251 }
252 else if (type == 2) 252 else if (type == 2)
253 { 253 {
254 obj = eldbus_object_get(conn, BUS, path); 254 obj = eldbus_object_get(conn, BUS, path);
255 EINA_SAFETY_ON_FALSE_RETURN(obj); 255 EINA_SAFETY_ON_FALSE_RETURN(obj);
diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c b/src/modules/sysinfo/cpuclock/cpuclock.c
index 0ff04581b..df2cb717d 100644
--- a/src/modules/sysinfo/cpuclock/cpuclock.c
+++ b/src/modules/sysinfo/cpuclock/cpuclock.c
@@ -267,7 +267,7 @@ _cpuclock_popup_create(Instance *inst)
267 E_ALIGN(label, 0.5, 0.5); 267 E_ALIGN(label, 0.5, 0.5);
268 elm_object_text_set(label, text); 268 elm_object_text_set(label, text);
269 elm_table_pack(table, label, 0, 0, 2, 1); 269 elm_table_pack(table, label, 0, 0, 2, 1);
270 evas_object_show(label); 270 evas_object_show(label);
271 271
272 snprintf(buf, sizeof(buf), "%1.1f %s (%d %%%%)", f, u, 272 snprintf(buf, sizeof(buf), "%1.1f %s (%d %%%%)", f, u,
273 inst->cfg->cpuclock.percent); 273 inst->cfg->cpuclock.percent);
diff --git a/src/modules/sysinfo/netstatus/netstatus.h b/src/modules/sysinfo/netstatus/netstatus.h
index ee1a36f90..c49ca1582 100644
--- a/src/modules/sysinfo/netstatus/netstatus.h
+++ b/src/modules/sysinfo/netstatus/netstatus.h
@@ -21,7 +21,7 @@ EINTERN void _netstatus_proc_getstatus(Eina_Bool automax, time_t *last_checked,
21 unsigned long *prev_in, unsigned long *prev_incurrent, unsigned long *prev_inmax, 21 unsigned long *prev_in, unsigned long *prev_incurrent, unsigned long *prev_inmax,
22 int *prev_inpercent, unsigned long *prev_out, unsigned long *prev_outcurrent, 22 int *prev_inpercent, unsigned long *prev_out, unsigned long *prev_outcurrent,
23 unsigned long *prev_outmax, int *prev_outpercent); 23 unsigned long *prev_outmax, int *prev_outpercent);
24EINTERN void _netstatus_sysctl_getstatus(Eina_Bool automax, time_t *last_checked, 24EINTERN void _netstatus_sysctl_getstatus(Eina_Bool automax, time_t *last_checked,
25 unsigned long *prev_in, unsigned long *prev_incurrent, unsigned long *prev_inmax, 25 unsigned long *prev_in, unsigned long *prev_incurrent, unsigned long *prev_inmax,
26 int *prev_inpercent, unsigned long *prev_out, unsigned long *prev_outcurrent, 26 int *prev_inpercent, unsigned long *prev_out, unsigned long *prev_outcurrent,
27 unsigned long *prev_outmax, int *prev_outpercent); 27 unsigned long *prev_outmax, int *prev_outpercent);
diff --git a/src/modules/sysinfo/netstatus/netstatus_proc.c b/src/modules/sysinfo/netstatus/netstatus_proc.c
index 1f9376ddf..29de6e39b 100644
--- a/src/modules/sysinfo/netstatus/netstatus_proc.c
+++ b/src/modules/sysinfo/netstatus/netstatus_proc.c
@@ -82,7 +82,7 @@ _netstatus_proc_getstatus(Eina_Bool automax,
82 } 82 }
83 *prev_outcurrent = diffout; 83 *prev_outcurrent = diffout;
84 if (*prev_outcurrent > 0) 84 if (*prev_outcurrent > 0)
85 percent = 100 * ((float)*prev_outcurrent / (float)*prev_outmax); 85 percent = 100 * ((float)*prev_outcurrent / (float)*prev_outmax);
86 if (percent > 100) percent = 100; 86 if (percent > 100) percent = 100;
87 else if (percent < 0) 87 else if (percent < 0)
88 percent = 0; 88 percent = 0;
diff --git a/src/modules/sysinfo/netstatus/netstatus_sysctl.c b/src/modules/sysinfo/netstatus/netstatus_sysctl.c
index 9caf2b0c3..63cddb8cd 100644
--- a/src/modules/sysinfo/netstatus/netstatus_sysctl.c
+++ b/src/modules/sysinfo/netstatus/netstatus_sysctl.c
@@ -159,7 +159,7 @@ _netstatus_sysctl_getstatus(Eina_Bool automax,
159 percent = 0; 159 percent = 0;
160 *prev_inpercent = percent; 160 *prev_inpercent = percent;
161 } 161 }
162 162
163 percent = 0; 163 percent = 0;
164 164
165 diffout = tot_out - *prev_out; 165 diffout = tot_out - *prev_out;
diff --git a/src/modules/systray/e_mod_notifier_host.c b/src/modules/systray/e_mod_notifier_host.c
index ea15fd57f..ca3c3b646 100644
--- a/src/modules/systray/e_mod_notifier_host.c
+++ b/src/modules/systray/e_mod_notifier_host.c
@@ -415,7 +415,7 @@ void
415systray_notifier_host_shutdown(void) 415systray_notifier_host_shutdown(void)
416{ 416{
417 Eldbus_Pending *p; 417 Eldbus_Pending *p;
418 418
419 EINA_LIST_FREE(ctx->pending, p) eldbus_pending_cancel(p); 419 EINA_LIST_FREE(ctx->pending, p) eldbus_pending_cancel(p);
420 systray_notifier_dbus_shutdown(ctx); 420 systray_notifier_dbus_shutdown(ctx);
421 free(ctx); 421 free(ctx);
diff --git a/src/modules/systray/e_mod_notifier_host_dbus.c b/src/modules/systray/e_mod_notifier_host_dbus.c
index febb474f7..79b2fd121 100644
--- a/src/modules/systray/e_mod_notifier_host_dbus.c
+++ b/src/modules/systray/e_mod_notifier_host_dbus.c
@@ -568,7 +568,7 @@ void
568systray_notifier_dbus_init(Context_Notifier_Host *ctx) 568systray_notifier_dbus_init(Context_Notifier_Host *ctx)
569{ 569{
570 Eldbus_Pending *p; 570 Eldbus_Pending *p;
571 571
572 ctx->conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION); 572 ctx->conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
573 if (!ctx->conn) return; 573 if (!ctx->conn) return;
574 p = eldbus_name_request(ctx->conn, 574 p = eldbus_name_request(ctx->conn,
diff --git a/src/modules/teamwork/e_mod_main.h b/src/modules/teamwork/e_mod_main.h
index e9ff6252a..c570d3198 100644
--- a/src/modules/teamwork/e_mod_main.h
+++ b/src/modules/teamwork/e_mod_main.h
@@ -69,7 +69,7 @@ extern Teamwork_Signal_Cb tw_signal_link_invalid[E_PIXMAP_TYPE_NONE];
69extern Teamwork_Signal_Progress_Cb tw_signal_link_progress[E_PIXMAP_TYPE_NONE]; 69extern Teamwork_Signal_Progress_Cb tw_signal_link_progress[E_PIXMAP_TYPE_NONE];
70extern Teamwork_Signal_Cb tw_signal_link_downloading[E_PIXMAP_TYPE_NONE]; 70extern Teamwork_Signal_Cb tw_signal_link_downloading[E_PIXMAP_TYPE_NONE];
71 71
72EINTERN E_Config_Dialog *e_int_config_teamwork_module(Evas_Object *parent, const char *params EINA_UNUSED); 72EINTERN E_Config_Dialog *e_int_config_teamwork_module(Evas_Object *parent, const char *params EINA_UNUSED);
73 73
74E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED); 74E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED);
75 75
diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c
index 86a8d8fc4..bbf4dc4e6 100644
--- a/src/modules/teamwork/e_mod_tw.c
+++ b/src/modules/teamwork/e_mod_tw.c
@@ -1209,7 +1209,7 @@ e_tw_init(void)
1209 E_FREE_FUNC(media[MEDIA_CACHE_TYPE_IMAGE], eet_close); 1209 E_FREE_FUNC(media[MEDIA_CACHE_TYPE_IMAGE], eet_close);
1210 return 0; 1210 return 0;
1211 } 1211 }
1212 1212
1213 cache_edd = media_cache_edd_new(); 1213 cache_edd = media_cache_edd_new();
1214 EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Media_Cache_List); 1214 EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Media_Cache_List);
1215 cleaner_edd = eet_data_descriptor_file_new(&eddc); 1215 cleaner_edd = eet_data_descriptor_file_new(&eddc);
diff --git a/src/modules/temperature/e_mod_config.c b/src/modules/temperature/e_mod_config.c
index 3d4b72635..a355160e2 100644
--- a/src/modules/temperature/e_mod_config.c
+++ b/src/modules/temperature/e_mod_config.c
@@ -4,9 +4,9 @@
4#define FAR_2_CEL(x) ((x - 32) / 9.0) * 5.0 4#define FAR_2_CEL(x) ((x - 32) / 9.0) * 5.0
5#define CEL_2_FAR(x) (x * 9.0 / 5.0) + 32 5#define CEL_2_FAR(x) (x * 9.0 / 5.0) + 32
6 6
7struct _E_Config_Dialog_Data 7struct _E_Config_Dialog_Data
8{ 8{
9 struct 9 struct
10 { 10 {
11 int interval; 11 int interval;
12 } poll; 12 } poll;
@@ -15,7 +15,7 @@ struct _E_Config_Dialog_Data
15#ifdef HAVE_EEZE 15#ifdef HAVE_EEZE
16 int backend; 16 int backend;
17#endif 17#endif
18 struct 18 struct
19 { 19 {
20 int low, high; 20 int low, high;
21 } temp; 21 } temp;
@@ -81,8 +81,8 @@ temperature_get_bus_files(const char *bus)
81} 81}
82 82
83 83
84void 84void
85config_temperature_module(Config_Face *inst) 85config_temperature_module(Config_Face *inst)
86{ 86{
87 E_Config_Dialog_View *v; 87 E_Config_Dialog_View *v;
88 char buff[PATH_MAX]; 88 char buff[PATH_MAX];
@@ -93,17 +93,17 @@ config_temperature_module(Config_Face *inst)
93 v->basic.create_widgets = _basic_create; 93 v->basic.create_widgets = _basic_create;
94 v->basic.apply_cfdata = _basic_apply; 94 v->basic.apply_cfdata = _basic_apply;
95 95
96 snprintf(buff, sizeof(buff), 96 snprintf(buff, sizeof(buff),
97 "%s/e-module-temperature.edj", inst->module->dir); 97 "%s/e-module-temperature.edj", inst->module->dir);
98 inst->config_dialog = 98 inst->config_dialog =
99 e_config_dialog_new(NULL, 99 e_config_dialog_new(NULL,
100 _("Temperature Settings"), "E", 100 _("Temperature Settings"), "E",
101 "_e_mod_temperature_config_dialog", buff, 0, v, inst); 101 "_e_mod_temperature_config_dialog", buff, 0, v, inst);
102} 102}
103 103
104/* local function prototypes */ 104/* local function prototypes */
105static void * 105static void *
106_create_data(E_Config_Dialog *cfd) 106_create_data(E_Config_Dialog *cfd)
107{ 107{
108 E_Config_Dialog_Data *cfdata; 108 E_Config_Dialog_Data *cfdata;
109 109
@@ -113,8 +113,8 @@ _create_data(E_Config_Dialog *cfd)
113 return cfdata; 113 return cfdata;
114} 114}
115 115
116static void 116static void
117_fill_data_tempget(E_Config_Dialog_Data *cfdata) 117_fill_data_tempget(E_Config_Dialog_Data *cfdata)
118{ 118{
119 cfdata->unit_method = cfdata->inst->units; 119 cfdata->unit_method = cfdata->inst->units;
120 cfdata->poll.interval = cfdata->inst->poll_interval; 120 cfdata->poll.interval = cfdata->inst->poll_interval;
@@ -126,7 +126,7 @@ _fill_data_tempget(E_Config_Dialog_Data *cfdata)
126 if (cfdata->backend == TEMPGET) 126 if (cfdata->backend == TEMPGET)
127 { 127 {
128#endif 128#endif
129 switch (cfdata->inst->sensor_type) 129 switch (cfdata->inst->sensor_type)
130 { 130 {
131 case SENSOR_TYPE_NONE: 131 case SENSOR_TYPE_NONE:
132 case SENSOR_TYPE_FREEBSD: 132 case SENSOR_TYPE_FREEBSD:
@@ -141,7 +141,7 @@ _fill_data_tempget(E_Config_Dialog_Data *cfdata)
141 case SENSOR_TYPE_LINUX_PCI: 141 case SENSOR_TYPE_LINUX_PCI:
142 _fill_sensors(cfdata, "pci"); 142 _fill_sensors(cfdata, "pci");
143 break; 143 break;
144 case SENSOR_TYPE_LINUX_ACPI: 144 case SENSOR_TYPE_LINUX_ACPI:
145 { 145 {
146 Eina_List *l; 146 Eina_List *l;
147 147
@@ -150,9 +150,9 @@ _fill_data_tempget(E_Config_Dialog_Data *cfdata)
150 char *name; 150 char *name;
151 int n = 0; 151 int n = 0;
152 152
153 EINA_LIST_FREE(l, name) 153 EINA_LIST_FREE(l, name)
154 { 154 {
155 cfdata->sensors = 155 cfdata->sensors =
156 eina_list_append(cfdata->sensors, name); 156 eina_list_append(cfdata->sensors, name);
157 if (!strcmp(cfdata->inst->sensor_name, name)) 157 if (!strcmp(cfdata->inst->sensor_name, name))
158 cfdata->sensor = n; 158 cfdata->sensor = n;
@@ -161,20 +161,20 @@ _fill_data_tempget(E_Config_Dialog_Data *cfdata)
161 } 161 }
162 break; 162 break;
163 } 163 }
164 case SENSOR_TYPE_LINUX_SYS: 164 case SENSOR_TYPE_LINUX_SYS:
165 { 165 {
166 Eina_List *l; 166 Eina_List *l;
167 167
168 if ((l = ecore_file_ls("/sys/class/thermal"))) 168 if ((l = ecore_file_ls("/sys/class/thermal")))
169 { 169 {
170 char *name; 170 char *name;
171 int n = 0; 171 int n = 0;
172 172
173 EINA_LIST_FREE(l, name) 173 EINA_LIST_FREE(l, name)
174 { 174 {
175 if (!strncmp(name, "thermal", 7)) 175 if (!strncmp(name, "thermal", 7))
176 { 176 {
177 cfdata->sensors = 177 cfdata->sensors =
178 eina_list_append(cfdata->sensors, name); 178 eina_list_append(cfdata->sensors, name);
179 if (!strcmp(cfdata->inst->sensor_name, name)) 179 if (!strcmp(cfdata->inst->sensor_name, name))
180 cfdata->sensor = n; 180 cfdata->sensor = n;
@@ -192,8 +192,8 @@ _fill_data_tempget(E_Config_Dialog_Data *cfdata)
192#endif 192#endif
193} 193}
194 194
195static void 195static void
196_fill_sensors(E_Config_Dialog_Data *cfdata, const char *name) 196_fill_sensors(E_Config_Dialog_Data *cfdata, const char *name)
197{ 197{
198 Eina_List *therms, *l; 198 Eina_List *therms, *l;
199 char *n; 199 char *n;
@@ -203,30 +203,30 @@ _fill_sensors(E_Config_Dialog_Data *cfdata, const char *name)
203 { 203 {
204 char path[PATH_MAX]; 204 char path[PATH_MAX];
205 205
206 EINA_LIST_FREE(therms, n) 206 EINA_LIST_FREE(therms, n)
207 { 207 {
208 if (ecore_file_exists(n)) 208 if (ecore_file_exists(n))
209 { 209 {
210 int len; 210 int len;
211 211
212 sprintf(path, "%s", ecore_file_file_get(n)); 212 sprintf(path, "%s", ecore_file_file_get(n));
213 len = strlen(path); 213 len = strlen(path);
214 if (len > 6) path[len - 6] = '\0'; 214 if (len > 6) path[len - 6] = '\0';
215 cfdata->sensors = 215 cfdata->sensors =
216 eina_list_append(cfdata->sensors, strdup(path)); 216 eina_list_append(cfdata->sensors, strdup(path));
217 } 217 }
218 free(n); 218 free(n);
219 } 219 }
220 } 220 }
221 EINA_LIST_FOREACH(cfdata->sensors, l, n) 221 EINA_LIST_FOREACH(cfdata->sensors, l, n)
222 { 222 {
223 if (!strcmp(cfdata->inst->sensor_name, n)) break; 223 if (!strcmp(cfdata->inst->sensor_name, n)) break;
224 cfdata->sensor++; 224 cfdata->sensor++;
225 } 225 }
226} 226}
227 227
228static void 228static void
229_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 229_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
230{ 230{
231 char *sensor; 231 char *sensor;
232 232
@@ -237,7 +237,7 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
237} 237}
238 238
239static Evas_Object * 239static Evas_Object *
240_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) 240_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
241{ 241{
242 Evas_Object *otb, *ol, *ow; 242 Evas_Object *otb, *ol, *ow;
243 E_Radio_Group *rg; 243 E_Radio_Group *rg;
@@ -246,7 +246,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
246 246
247 otb = e_widget_toolbook_add(evas, 24, 24); 247 otb = e_widget_toolbook_add(evas, 24, 24);
248 248
249 if (cfdata->sensors) 249 if (cfdata->sensors)
250 { 250 {
251 Eina_List *l; 251 Eina_List *l;
252 char *name; 252 char *name;
@@ -254,13 +254,13 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
254 254
255 ol = e_widget_list_add(evas, 0, 0); 255 ol = e_widget_list_add(evas, 0, 0);
256 rg = e_widget_radio_group_new(&(cfdata->sensor)); 256 rg = e_widget_radio_group_new(&(cfdata->sensor));
257 EINA_LIST_FOREACH(cfdata->sensors, l, name) 257 EINA_LIST_FOREACH(cfdata->sensors, l, name)
258 { 258 {
259 ow = e_widget_radio_add(evas, _(name), n, rg); 259 ow = e_widget_radio_add(evas, _(name), n, rg);
260 e_widget_list_object_append(ol, ow, 1, 0, 0.5); 260 e_widget_list_object_append(ol, ow, 1, 0, 0.5);
261 n++; 261 n++;
262 } 262 }
263 e_widget_toolbook_page_append(otb, NULL, _("Sensors"), ol, 263 e_widget_toolbook_page_append(otb, NULL, _("Sensors"), ol,
264 1, 1, 1, 0, 0.0, 0.0); 264 1, 1, 1, 0, 0.0, 0.0);
265 } 265 }
266 266
@@ -272,42 +272,42 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
272 ow = e_widget_radio_add(evas, _("Fahrenheit"), FAHRENHEIT, rg); 272 ow = e_widget_radio_add(evas, _("Fahrenheit"), FAHRENHEIT, rg);
273 e_widget_on_change_hook_set(ow, _cb_display_changed, cfdata); 273 e_widget_on_change_hook_set(ow, _cb_display_changed, cfdata);
274 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 274 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
275 e_widget_toolbook_page_append(otb, NULL, _("Display Units"), ol, 275 e_widget_toolbook_page_append(otb, NULL, _("Display Units"), ol,
276 1, 1, 1, 0, 0.0, 0.0); 276 1, 1, 1, 0, 0.0, 0.0);
277 277
278 ol = e_widget_list_add(evas, 0, 0); 278 ol = e_widget_list_add(evas, 0, 0);
279 ow = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 1, 1024, 4, 0, 279 ow = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 1, 1024, 4, 0,
280 NULL, &(cfdata->poll.interval), 150); 280 NULL, &(cfdata->poll.interval), 150);
281 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 281 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
282 e_widget_toolbook_page_append(otb, NULL, _("Check Interval"), ol, 282 e_widget_toolbook_page_append(otb, NULL, _("Check Interval"), ol,
283 1, 1, 1, 0, 0.0, 0.0); 283 1, 1, 1, 0, 0.0, 0.0);
284 284
285 ol = e_widget_list_add(evas, 0, 0); 285 ol = e_widget_list_add(evas, 0, 0);
286 ow = e_widget_label_add(evas, _("High Temperature")); 286 ow = e_widget_label_add(evas, _("High Temperature"));
287 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 287 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
288 if (cfdata->unit_method == FAHRENHEIT) 288 if (cfdata->unit_method == FAHRENHEIT)
289 cfdata->o_high = 289 cfdata->o_high =
290 e_widget_slider_add(evas, 1, 0, _("%1.0f F"), 0, 230, 5, 0, 290 e_widget_slider_add(evas, 1, 0, _("%1.0f F"), 0, 230, 5, 0,
291 NULL, &(cfdata->temp.high), 150); 291 NULL, &(cfdata->temp.high), 150);
292 else 292 else
293 cfdata->o_high = 293 cfdata->o_high =
294 e_widget_slider_add(evas, 1, 0, _("%1.0f C"), 0, 110, 5, 0, 294 e_widget_slider_add(evas, 1, 0, _("%1.0f C"), 0, 110, 5, 0,
295 NULL, &(cfdata->temp.high), 150); 295 NULL, &(cfdata->temp.high), 150);
296 e_widget_list_object_append(ol, cfdata->o_high, 1, 1, 0.5); 296 e_widget_list_object_append(ol, cfdata->o_high, 1, 1, 0.5);
297 297
298 ow = e_widget_label_add(evas, _("Low Temperature")); 298 ow = e_widget_label_add(evas, _("Low Temperature"));
299 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 299 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
300 if (cfdata->unit_method == FAHRENHEIT) 300 if (cfdata->unit_method == FAHRENHEIT)
301 cfdata->o_low = 301 cfdata->o_low =
302 e_widget_slider_add(evas, 1, 0, _("%1.0f F"), 0, 200, 5, 0, 302 e_widget_slider_add(evas, 1, 0, _("%1.0f F"), 0, 200, 5, 0,
303 NULL, &(cfdata->temp.low), 150); 303 NULL, &(cfdata->temp.low), 150);
304 else 304 else
305 cfdata->o_low = 305 cfdata->o_low =
306 e_widget_slider_add(evas, 1, 0, _("%1.0f C"), 0, 95, 5, 0, 306 e_widget_slider_add(evas, 1, 0, _("%1.0f C"), 0, 95, 5, 0,
307 NULL, &(cfdata->temp.low), 150); 307 NULL, &(cfdata->temp.low), 150);
308 e_widget_list_object_append(ol, cfdata->o_low, 1, 1, 0.5); 308 e_widget_list_object_append(ol, cfdata->o_low, 1, 1, 0.5);
309 309
310 e_widget_toolbook_page_append(otb, NULL, _("Temperatures"), ol, 310 e_widget_toolbook_page_append(otb, NULL, _("Temperatures"), ol,
311 1, 1, 1, 0, 0.0, 0.0); 311 1, 1, 1, 0, 0.0, 0.0);
312#ifdef HAVE_EEZE 312#ifdef HAVE_EEZE
313 ol = e_widget_list_add(evas, 0, 0); 313 ol = e_widget_list_add(evas, 0, 0);
@@ -316,15 +316,15 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
316 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 316 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
317 ow = e_widget_radio_add(evas, _("udev"), UDEV, rg); 317 ow = e_widget_radio_add(evas, _("udev"), UDEV, rg);
318 e_widget_list_object_append(ol, ow, 1, 1, 0.5); 318 e_widget_list_object_append(ol, ow, 1, 1, 0.5);
319 e_widget_toolbook_page_append(otb, NULL, _("Hardware"), ol, 319 e_widget_toolbook_page_append(otb, NULL, _("Hardware"), ol,
320 1, 1, 1, 0, 0.0, 0.0); 320 1, 1, 1, 0, 0.0, 0.0);
321#endif 321#endif
322 e_widget_toolbook_page_show(otb, 0); 322 e_widget_toolbook_page_show(otb, 0);
323 return otb; 323 return otb;
324} 324}
325 325
326static int 326static int
327_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) 327_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
328{ 328{
329 cfdata->inst->poll_interval = cfdata->poll.interval; 329 cfdata->inst->poll_interval = cfdata->poll.interval;
330 cfdata->inst->units = cfdata->unit_method; 330 cfdata->inst->units = cfdata->unit_method;
@@ -334,7 +334,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
334 cfdata->inst->backend = cfdata->backend; 334 cfdata->inst->backend = cfdata->backend;
335#endif 335#endif
336 336
337 eina_stringshare_replace(&cfdata->inst->sensor_name, 337 eina_stringshare_replace(&cfdata->inst->sensor_name,
338 eina_list_nth(cfdata->sensors, cfdata->sensor)); 338 eina_list_nth(cfdata->sensors, cfdata->sensor));
339 339
340 e_config_save_queue(); 340 e_config_save_queue();
@@ -342,8 +342,8 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
342 return 1; 342 return 1;
343} 343}
344 344
345static void 345static void
346_cb_display_changed(void *data, Evas_Object *obj EINA_UNUSED) 346_cb_display_changed(void *data, Evas_Object *obj EINA_UNUSED)
347{ 347{
348 E_Config_Dialog_Data *cfdata; 348 E_Config_Dialog_Data *cfdata;
349 int val; 349 int val;
diff --git a/src/modules/temperature/e_mod_main.c b/src/modules/temperature/e_mod_main.c
index a4e99a5c9..a5892bc21 100644
--- a/src/modules/temperature/e_mod_main.c
+++ b/src/modules/temperature/e_mod_main.c
@@ -384,7 +384,7 @@ temperature_face_update_config(Config_Face *inst)
384} 384}
385 385
386/* module setup */ 386/* module setup */
387E_API E_Module_Api e_modapi = 387E_API E_Module_Api e_modapi =
388{ 388{
389 E_MODULE_API_VERSION, 389 E_MODULE_API_VERSION,
390 "Temperature" 390 "Temperature"
diff --git a/src/modules/time/config.c b/src/modules/time/config.c
index 5cc23c37f..153a84640 100644
--- a/src/modules/time/config.c
+++ b/src/modules/time/config.c
@@ -405,7 +405,7 @@ _config_digital_rows_setup(Config_Item *ci, Evas_Object *tb)
405 evas_object_smart_callback_add(o, "changed", _config_changed, ci); 405 evas_object_smart_callback_add(o, "changed", _config_changed, ci);
406 elm_table_pack(tb, o, 1, row++, 1, 1); 406 elm_table_pack(tb, o, 1, row++, 1, 1);
407 } 407 }
408 408
409 _config_label_add(tb, _("Show Seconds:"), row); 409 _config_label_add(tb, _("Show Seconds:"), row);
410 o = elm_check_add(tb); 410 o = elm_check_add(tb);
411 E_FILL(o); 411 E_FILL(o);
@@ -549,7 +549,7 @@ config_clock(Config_Item *ci, E_Zone *zone)
549 if (!ccname) ccname = ccnames[i]; 549 if (!ccname) ccname = ccnames[i];
550 edje_color_class_get(ccname, &r, &g, &b, &a, 550 edje_color_class_get(ccname, &r, &g, &b, &a,
551 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); 551 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
552 552
553 it = elm_colorselector_palette_color_add(cs, r, g, b, a); 553 it = elm_colorselector_palette_color_add(cs, r, g, b, a);
554 o = elm_button_add(tb); 554 o = elm_button_add(tb);
555 elm_object_text_set(o, names[i]); 555 elm_object_text_set(o, names[i]);
diff --git a/src/modules/wireless/connman.c b/src/modules/wireless/connman.c
index a135a57c6..21fa98e8a 100644
--- a/src/modules/wireless/connman.c
+++ b/src/modules/wireless/connman.c
@@ -180,7 +180,7 @@ _connman_service_connect_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendin
180 eldbus_message_error_get(msg, NULL, &error); 180 eldbus_message_error_get(msg, NULL, &error);
181} 181}
182 182
183static Eina_Bool 183static Eina_Bool
184_connman_service_connect(Wireless_Network *wn) 184_connman_service_connect(Wireless_Network *wn)
185{ 185{
186 Connman_Service *cs; 186 Connman_Service *cs;