styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Elyes HAOUAS 2020-05-13 19:34:25 +00:00 committed by Stefan Schmidt
parent 65441c214b
commit 4d51984286
21 changed files with 109 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/notification/e_mod_main.c
View File

@ -162,7 +162,7 @@ e_modapi_init(E_Module *m)
/* register config panel entry */ /* register config panel entry */
e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL,
"preferences-extensions"); "preferences-extensions");
e_configure_registry_item_add("extensions/notification", 30, e_configure_registry_item_add("extensions/notification", 30,
_("Notification"), NULL, _("Notification"), NULL,
buf, e_int_config_notification_module); buf, e_int_config_notification_module);

4
src/modules/notification/e_mod_main.h
View File

@ -29,7 +29,7 @@ typedef enum
POPUP_DISPLAY_POLICY_MULTI POPUP_DISPLAY_POLICY_MULTI
} Popup_Display_Policy; } Popup_Display_Policy;
struct _Config struct _Config
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
@ -48,7 +48,7 @@ struct _Config
Eina_Bool presentation; Eina_Bool presentation;
Eina_Bool offline; Eina_Bool offline;
} last_config_mode; } last_config_mode;
Ecore_Event_Handler *handler; Ecore_Event_Handler *handler;
Eina_List *popups; Eina_List *popups;
unsigned int next_id; unsigned int next_id;

12
src/modules/notification/e_mod_popup.c
View File

@ -449,7 +449,7 @@ _notification_popup_refresh(Popup_Data *popup)
unsigned int size; unsigned int size;
size = e_util_icon_size_normalize(width * e_scale); size = e_util_icon_size_normalize(width * e_scale);
new_path = efreet_icon_path_find(e_config->icon_theme, new_path = efreet_icon_path_find(e_config->icon_theme,
icon_path, size); icon_path, size);
if (new_path) if (new_path)
icon_path = new_path; icon_path = new_path;
@ -492,16 +492,16 @@ _notification_popup_refresh(Popup_Data *popup)
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%s/e-module-notification.edj", snprintf(buf, sizeof(buf), "%s/e-module-notification.edj",
notification_mod->dir); notification_mod->dir);
popup->app_icon = edje_object_add(popup->e); popup->app_icon = edje_object_add(popup->e);
if (!e_theme_edje_object_set(popup->app_icon, if (!e_theme_edje_object_set(popup->app_icon,
"base/theme/modules/notification", "base/theme/modules/notification",
"e/modules/notification/logo")) "e/modules/notification/logo"))
if (!e_theme_edje_object_set(popup->app_icon, if (!e_theme_edje_object_set(popup->app_icon,
"base/theme/modules/notification", "base/theme/modules/notification",
"modules/notification/logo")) "modules/notification/logo"))
edje_object_file_set(popup->app_icon, buf, edje_object_file_set(popup->app_icon, buf,
"modules/notification/logo"); "modules/notification/logo");
w = width; w = width;
h = height; h = height;
@ -518,7 +518,7 @@ _notification_popup_refresh(Popup_Data *popup)
evas_object_size_hint_min_set(popup->app_icon, w, h); evas_object_size_hint_min_set(popup->app_icon, w, h);
evas_object_size_hint_max_set(popup->app_icon, w, h); evas_object_size_hint_max_set(popup->app_icon, w, h);
edje_object_part_swallow(popup->theme, "notification.swallow.app_icon", edje_object_part_swallow(popup->theme, "notification.swallow.app_icon",
popup->app_icon); popup->app_icon);
edje_object_signal_emit(popup->theme, "notification,icon", "notification"); edje_object_signal_emit(popup->theme, "notification,icon", "notification");

48
src/modules/packagekit/e_mod_packagekit.c
View File

@ -205,7 +205,7 @@ _install_button_cb(void *data, Evas_Object *obj EINA_UNUSED,
} }
static void static void
_run_button_cb(void *data, Evas_Object *obj EINA_UNUSED, _run_button_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event EINA_UNUSED) void *event EINA_UNUSED)
{ {
E_PackageKit_Instance *inst = data; E_PackageKit_Instance *inst = data;
@ -250,11 +250,11 @@ packagekit_popup_update(E_PackageKit_Instance *inst, Eina_Bool rebuild_list)
EINA_LIST_FOREACH(ctxt->packages, l, pkg) EINA_LIST_FOREACH(ctxt->packages, l, pkg)
{ {
if (rebuild_list) if (rebuild_list)
elm_genlist_item_append(inst->popup_genlist, inst->popup_genlist_itc, elm_genlist_item_append(inst->popup_genlist, inst->popup_genlist_itc,
pkg, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); pkg, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
num_updates++; num_updates++;
} }
// show the progress bar if an operation is in progress // show the progress bar if an operation is in progress
if (ctxt->transaction) if (ctxt->transaction)
{ {
@ -275,7 +275,7 @@ packagekit_popup_update(E_PackageKit_Instance *inst, Eina_Bool rebuild_list)
snprintf(buf, sizeof(buf), _("Your system is updated")); snprintf(buf, sizeof(buf), _("Your system is updated"));
elm_object_text_set(inst->popup_title_entry, buf); elm_object_text_set(inst->popup_title_entry, buf);
elm_object_text_set(inst->popup_error_label, ""); elm_object_text_set(inst->popup_error_label, "");
// update the status of the install button // update the status of the install button
selected = elm_genlist_selected_items_get(inst->popup_genlist); selected = elm_genlist_selected_items_get(inst->popup_genlist);
if (ctxt->transaction) if (ctxt->transaction)
@ -290,7 +290,7 @@ packagekit_popup_update(E_PackageKit_Instance *inst, Eina_Bool rebuild_list)
} }
else if ((selected == NULL) || (eina_list_count(selected) == 0)) else if ((selected == NULL) || (eina_list_count(selected) == 0))
{ {
elm_object_text_set(inst->popup_install_button, elm_object_text_set(inst->popup_install_button,
_("Install all available updates")); _("Install all available updates"));
elm_object_disabled_set(inst->popup_install_button, EINA_FALSE); elm_object_disabled_set(inst->popup_install_button, EINA_FALSE);
} }
@ -306,18 +306,18 @@ packagekit_popup_update(E_PackageKit_Instance *inst, Eina_Bool rebuild_list)
} }
void void
packagekit_all_popups_update(E_PackageKit_Module_Context *ctxt, packagekit_all_popups_update(E_PackageKit_Module_Context *ctxt,
Eina_Bool rebuild_list) Eina_Bool rebuild_list)
{ {
E_PackageKit_Instance *inst; E_PackageKit_Instance *inst;
Eina_List *l; Eina_List *l;
EINA_LIST_FOREACH(ctxt->instances, l, inst) EINA_LIST_FOREACH(ctxt->instances, l, inst)
packagekit_popup_update(inst, rebuild_list); packagekit_popup_update(inst, rebuild_list);
} }
void void
packagekit_progress_percentage_update(E_PackageKit_Module_Context *ctxt, packagekit_progress_percentage_update(E_PackageKit_Module_Context *ctxt,
int percent) int percent)
{ {
E_PackageKit_Instance *inst; E_PackageKit_Instance *inst;
@ -426,7 +426,7 @@ _gl_item_content_get(void *data, Evas_Object *obj, const char *part)
} }
static void static void
_genlist_selunsel_cb(void *data, Evas_Object *obj EINA_UNUSED, _genlist_selunsel_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event EINA_UNUSED) void *event EINA_UNUSED)
{ {
packagekit_popup_update(data, EINA_FALSE); packagekit_popup_update(data, EINA_FALSE);
@ -481,7 +481,7 @@ packagekit_popup_new(E_PackageKit_Instance *inst, Eina_Bool is_gadcon)
// refresh button // refresh button
ic = elm_icon_add(table); ic = elm_icon_add(table);
evas_object_size_hint_min_set(ic, 16 * elm_config_scale_get(), evas_object_size_hint_min_set(ic, 16 * elm_config_scale_get(),
16 * elm_config_scale_get()); 16 * elm_config_scale_get());
elm_icon_standard_set(ic, "view-refresh"); elm_icon_standard_set(ic, "view-refresh");
bt = elm_button_add(table); bt = elm_button_add(table);
@ -492,7 +492,7 @@ packagekit_popup_new(E_PackageKit_Instance *inst, Eina_Bool is_gadcon)
// help button // help button
ic = elm_icon_add(table); ic = elm_icon_add(table);
evas_object_size_hint_min_set(ic, 16 * elm_config_scale_get(), evas_object_size_hint_min_set(ic, 16 * elm_config_scale_get(),
16 * elm_config_scale_get()); 16 * elm_config_scale_get());
elm_icon_standard_set(ic, "help-contents"); elm_icon_standard_set(ic, "help-contents");
bt = elm_button_add(table); bt = elm_button_add(table);
@ -692,9 +692,9 @@ packagekit_refresh_cache(E_PackageKit_Module_Context *ctxt, const char *transact
_store_error(ctxt, "could not call RefreshCache()"); _store_error(ctxt, "could not call RefreshCache()");
return; return;
} }
eldbus_proxy_signal_handler_add(proxy, "Finished", eldbus_proxy_signal_handler_add(proxy, "Finished",
_signal_cache_finished_cb, ctxt); _signal_cache_finished_cb, ctxt);
eldbus_proxy_signal_handler_add(proxy, "RepoDetail", eldbus_proxy_signal_handler_add(proxy, "RepoDetail",
_signal_repo_detail_cb, ctxt); _signal_repo_detail_cb, ctxt);
ctxt->transaction = proxy; ctxt->transaction = proxy;
} }
@ -838,7 +838,7 @@ _signal_update_error_code_cb(void *data, const Eldbus_Message *msg)
_store_error(ctxt, "could not get error code arguments"); _store_error(ctxt, "could not get error code arguments");
return; return;
} }
if (details) if (details)
_store_error(ctxt, details); _store_error(ctxt, details);
} }
@ -876,8 +876,8 @@ packagekit_update_packages(E_PackageKit_Module_Context *ctxt, const char *transa
proxy = eldbus_proxy_get(obj, "org.freedesktop.PackageKit.Transaction"); proxy = eldbus_proxy_get(obj, "org.freedesktop.PackageKit.Transaction");
msg = eldbus_proxy_method_call_new(proxy, "UpdatePackages"); msg = eldbus_proxy_method_call_new(proxy, "UpdatePackages");
iter = eldbus_message_iter_get(msg); iter = eldbus_message_iter_get(msg);
eldbus_message_iter_arguments_append(iter, "tas", eldbus_message_iter_arguments_append(iter, "tas",
PK_TRANSACTION_FLAG_ENUM_ONLY_TRUSTED, PK_TRANSACTION_FLAG_ENUM_ONLY_TRUSTED,
&array_of_string); &array_of_string);
EINA_LIST_FOREACH(ctxt->packages, l, pkg) EINA_LIST_FOREACH(ctxt->packages, l, pkg)
{ {
@ -895,16 +895,16 @@ packagekit_update_packages(E_PackageKit_Module_Context *ctxt, const char *transa
_store_error(ctxt, "could not call UpdatePackages()"); _store_error(ctxt, "could not call UpdatePackages()");
return; return;
} }
eldbus_proxy_signal_handler_add(proxy, "ErrorCode", eldbus_proxy_signal_handler_add(proxy, "ErrorCode",
_signal_update_error_code_cb, ctxt); _signal_update_error_code_cb, ctxt);
eldbus_proxy_signal_handler_add(proxy, "Finished", eldbus_proxy_signal_handler_add(proxy, "Finished",
_signal_update_finished_cb, ctxt); _signal_update_finished_cb, ctxt);
ctxt->transaction = proxy; ctxt->transaction = proxy;
} }
/* CreateTransaction() */ /* CreateTransaction() */
static void static void
_transaction_changed_props_iter(void *data, const void *key, _transaction_changed_props_iter(void *data, const void *key,
Eldbus_Message_Iter *val) Eldbus_Message_Iter *val)
{ {
E_PackageKit_Module_Context *ctxt = data; E_PackageKit_Module_Context *ctxt = data;
@ -933,7 +933,7 @@ _signal_transaction_props_changed_cb(void *data, const Eldbus_Message *msg)
} }
ret = eldbus_message_arguments_get(msg, "sa{sv}as", &interface_name, ret = eldbus_message_arguments_get(msg, "sa{sv}as", &interface_name,
&changed_properties, &changed_properties,
&invalidated_properties); &invalidated_properties);
if (!ret) if (!ret)
{ {
@ -941,7 +941,7 @@ _signal_transaction_props_changed_cb(void *data, const Eldbus_Message *msg)
return; return;
} }
eldbus_message_iter_dict_iterate(changed_properties, "sv", eldbus_message_iter_dict_iterate(changed_properties, "sv",
_transaction_changed_props_iter, ctxt); _transaction_changed_props_iter, ctxt);
} }
@ -974,13 +974,13 @@ _transaction_created_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *p
// monitor the "Percentage" property to update the progress bar // monitor the "Percentage" property to update the progress bar
obj = eldbus_object_get(ctxt->conn, "org.freedesktop.PackageKit", trans_path); obj = eldbus_object_get(ctxt->conn, "org.freedesktop.PackageKit", trans_path);
proxy = eldbus_proxy_get(obj, "org.freedesktop.DBus.Properties"); proxy = eldbus_proxy_get(obj, "org.freedesktop.DBus.Properties");
eldbus_proxy_signal_handler_add(proxy, "PropertiesChanged", eldbus_proxy_signal_handler_add(proxy, "PropertiesChanged",
_signal_transaction_props_changed_cb, ctxt); _signal_transaction_props_changed_cb, ctxt);
// call the operation function // call the operation function
func = eldbus_pending_data_get(pending, "func"); func = eldbus_pending_data_get(pending, "func");
func(ctxt, trans_path); func(ctxt, trans_path);
// update all the faces // update all the faces
packagekit_icon_update(ctxt, EINA_TRUE); packagekit_icon_update(ctxt, EINA_TRUE);
packagekit_all_popups_update(ctxt, EINA_FALSE); packagekit_all_popups_update(ctxt, EINA_FALSE);

2
src/modules/pager/e_mod_main.c
View File

@ -1960,7 +1960,7 @@ _pager_popup_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *eve
if (pp) if (pp)
{ {
E_Desk *desk; E_Desk *desk;
desk = e_desk_at_xy_get(pp->pager->zone, desk = e_desk_at_xy_get(pp->pager->zone,
current_desk->x, current_desk->y); current_desk->x, current_desk->y);
if (desk) e_desk_show(desk); if (desk) e_desk_show(desk);

2
src/modules/pager/gadget/pager.c
View File

@ -712,7 +712,7 @@ _pager_desk_free(Pager_Desk *pd)
evas_object_del(pd->drop_handler); evas_object_del(pd->drop_handler);
pd->drop_handler = NULL; pd->drop_handler = NULL;
evas_object_del(pd->o_desk); evas_object_del(pd->o_desk);
evas_object_del(pd->o_layout); evas_object_del(pd->o_layout);
EINA_LIST_FREE(pd->wins, w) EINA_LIST_FREE(pd->wins, w)
_pager_window_free(w); _pager_window_free(w);
e_object_unref(E_OBJECT(pd->desk)); e_object_unref(E_OBJECT(pd->desk));

14
src/modules/quickaccess/e_mod_quickaccess.c
View File

@ -222,7 +222,7 @@ static void
_e_qa_entry_border_props_apply(E_Quick_Access_Entry *entry) _e_qa_entry_border_props_apply(E_Quick_Access_Entry *entry)
{ {
if (!entry->client) return; if (!entry->client) return;
if (entry->config.autohide && (!entry->client->focused)) if (entry->config.autohide && (!entry->client->focused))
_e_qa_border_deactivate(entry); _e_qa_border_deactivate(entry);
#define SET(X) \ #define SET(X) \
@ -1011,7 +1011,7 @@ _e_qa_help5(void *data EINA_UNUSED)
ecore_job_add(_e_qa_help5, NULL); ecore_job_add(_e_qa_help5, NULL);
return; return;
} }
snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module));
qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf, qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf,
_("You deleted it on your own, you rascal!<ps/>" _("You deleted it on your own, you rascal!<ps/>"
"Way to go!"), "Way to go!"),
@ -1068,7 +1068,7 @@ _e_qa_help4(void *data EINA_UNUSED)
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module));
qa_mod->help_dia = (E_Object*)e_util_dialog_internal(_("Quickaccess Help"), qa_mod->help_dia = (E_Object*)e_util_dialog_internal(_("Quickaccess Help"),
_("The demo dialog has been bound to the keys you pressed.<ps/>" _("The demo dialog has been bound to the keys you pressed.<ps/>"
"Try pressing the same keys!")); "Try pressing the same keys!"));
@ -1113,7 +1113,7 @@ _e_qa_help_bd_menu2_del(void *data EINA_UNUSED)
qa_mod->demo_state = 0; qa_mod->demo_state = 0;
qa_mod->help_timer = NULL; qa_mod->help_timer = NULL;
if (!qa_config->transient_entries) return; if (!qa_config->transient_entries) return;
_e_qa_help_timeout(NULL); _e_qa_help_timeout(NULL);
} }
static Eina_Bool static Eina_Bool
@ -1263,7 +1263,7 @@ _e_qa_help2(void *data EINA_UNUSED)
ecore_job_add(_e_qa_help2, NULL); ecore_job_add(_e_qa_help2, NULL);
return; return;
} }
snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module));
qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf, qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf,
_("Quickaccess entries can be created from<ps/>" _("Quickaccess entries can be created from<ps/>"
"the border menu of any window.<ps/>" "the border menu of any window.<ps/>"
@ -1284,7 +1284,7 @@ _e_qa_help(void *data)
return; return;
} }
if (qa_mod->help_dia) return; if (qa_mod->help_dia) return;
snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module)); snprintf(buf, sizeof(buf), "%s/e-module-quickaccess.edj", e_module_dir_get(qa_mod->module));
qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf, qa_mod->help_dia = (E_Object*)e_confirm_dialog_show(_("Quickaccess Help"), buf,
_("Quickaccess is a way of binding user-selected<ps/>" _("Quickaccess is a way of binding user-selected<ps/>"
"windows and applications to keyboard shortcuts.<ps/>" "windows and applications to keyboard shortcuts.<ps/>"
@ -1349,7 +1349,7 @@ e_qa_init(void)
_e_qa_del->func.go = _e_qa_del_cb; _e_qa_del->func.go = _e_qa_del_cb;
e_action_predef_name_set(_e_qa_name, _lbl_del, _act_del, NULL, NULL, 0); e_action_predef_name_set(_e_qa_name, _lbl_del, _act_del, NULL, NULL, 0);
INF("loaded qa module, registered %s action.", _act_toggle); INF("loaded qa module, registered %s action.", _act_toggle);
border_hook = e_int_client_menu_hook_add(_e_qa_bd_menu_hook, NULL); border_hook = e_int_client_menu_hook_add(_e_qa_bd_menu_hook, NULL);
if (!qa_config->first_run) _e_qa_first_run(); if (!qa_config->first_run) _e_qa_first_run();
else else

6
src/modules/shot/e_mod_edit.c
View File

@ -612,12 +612,12 @@ draw_selectable_set(Eina_Bool sel)
evas_object_pass_events_set(o, !sel); evas_object_pass_events_set(o, !sel);
} }
} }
// //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// //
// //
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////

2
src/modules/sysinfo/batman/batman_upower.c
View File

@ -249,7 +249,7 @@ _device_type_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
upower_proxy_ac = eldbus_proxy_get(obj, IFACE_PROPERTIES); upower_proxy_ac = eldbus_proxy_get(obj, IFACE_PROPERTIES);
_process_ac(ud->proxy, ud->inst); _process_ac(ud->proxy, ud->inst);
} }
else if (type == 2) else if (type == 2)
{ {
obj = eldbus_object_get(conn, BUS, path); obj = eldbus_object_get(conn, BUS, path);
EINA_SAFETY_ON_FALSE_RETURN(obj); EINA_SAFETY_ON_FALSE_RETURN(obj);

2
src/modules/sysinfo/cpuclock/cpuclock.c
View File

@ -267,7 +267,7 @@ _cpuclock_popup_create(Instance *inst)
E_ALIGN(label, 0.5, 0.5); E_ALIGN(label, 0.5, 0.5);
elm_object_text_set(label, text); elm_object_text_set(label, text);
elm_table_pack(table, label, 0, 0, 2, 1); elm_table_pack(table, label, 0, 0, 2, 1);
evas_object_show(label); evas_object_show(label);
snprintf(buf, sizeof(buf), "%1.1f %s (%d %%%%)", f, u, snprintf(buf, sizeof(buf), "%1.1f %s (%d %%%%)", f, u,
inst->cfg->cpuclock.percent); inst->cfg->cpuclock.percent);

2
src/modules/sysinfo/netstatus/netstatus.h
View File

@ -21,7 +21,7 @@ EINTERN void _netstatus_proc_getstatus(Eina_Bool automax, time_t *last_checked,
unsigned long *prev_in, unsigned long *prev_incurrent, unsigned long *prev_inmax, unsigned long *prev_in, unsigned long *prev_incurrent, unsigned long *prev_inmax,
int *prev_inpercent, unsigned long *prev_out, unsigned long *prev_outcurrent, int *prev_inpercent, unsigned long *prev_out, unsigned long *prev_outcurrent,
unsigned long *prev_outmax, int *prev_outpercent); unsigned long *prev_outmax, int *prev_outpercent);
EINTERN void _netstatus_sysctl_getstatus(Eina_Bool automax, time_t *last_checked, EINTERN void _netstatus_sysctl_getstatus(Eina_Bool automax, time_t *last_checked,
unsigned long *prev_in, unsigned long *prev_incurrent, unsigned long *prev_inmax, unsigned long *prev_in, unsigned long *prev_incurrent, unsigned long *prev_inmax,
int *prev_inpercent, unsigned long *prev_out, unsigned long *prev_outcurrent, int *prev_inpercent, unsigned long *prev_out, unsigned long *prev_outcurrent,
unsigned long *prev_outmax, int *prev_outpercent); unsigned long *prev_outmax, int *prev_outpercent);

2
src/modules/sysinfo/netstatus/netstatus_proc.c
View File

@ -82,7 +82,7 @@ _netstatus_proc_getstatus(Eina_Bool automax,
} }
*prev_outcurrent = diffout; *prev_outcurrent = diffout;
if (*prev_outcurrent > 0) if (*prev_outcurrent > 0)
percent = 100 * ((float)*prev_outcurrent / (float)*prev_outmax); percent = 100 * ((float)*prev_outcurrent / (float)*prev_outmax);
if (percent > 100) percent = 100; if (percent > 100) percent = 100;
else if (percent < 0) else if (percent < 0)
percent = 0; percent = 0;

2
src/modules/sysinfo/netstatus/netstatus_sysctl.c
View File

@ -159,7 +159,7 @@ _netstatus_sysctl_getstatus(Eina_Bool automax,
percent = 0; percent = 0;
*prev_inpercent = percent; *prev_inpercent = percent;
} }
percent = 0; percent = 0;
diffout = tot_out - *prev_out; diffout = tot_out - *prev_out;

2
src/modules/systray/e_mod_notifier_host.c
View File

@ -415,7 +415,7 @@ void
systray_notifier_host_shutdown(void) systray_notifier_host_shutdown(void)
{ {
Eldbus_Pending *p; Eldbus_Pending *p;
EINA_LIST_FREE(ctx->pending, p) eldbus_pending_cancel(p); EINA_LIST_FREE(ctx->pending, p) eldbus_pending_cancel(p);
systray_notifier_dbus_shutdown(ctx); systray_notifier_dbus_shutdown(ctx);
free(ctx); free(ctx);

2
src/modules/systray/e_mod_notifier_host_dbus.c
View File

@ -568,7 +568,7 @@ void
systray_notifier_dbus_init(Context_Notifier_Host *ctx) systray_notifier_dbus_init(Context_Notifier_Host *ctx)
{ {
Eldbus_Pending *p; Eldbus_Pending *p;
ctx->conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION); ctx->conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
if (!ctx->conn) return; if (!ctx->conn) return;
p = eldbus_name_request(ctx->conn, p = eldbus_name_request(ctx->conn,

2
src/modules/teamwork/e_mod_main.h
View File

@ -69,7 +69,7 @@ extern Teamwork_Signal_Cb tw_signal_link_invalid[E_PIXMAP_TYPE_NONE];
extern Teamwork_Signal_Progress_Cb tw_signal_link_progress[E_PIXMAP_TYPE_NONE]; extern Teamwork_Signal_Progress_Cb tw_signal_link_progress[E_PIXMAP_TYPE_NONE];
extern Teamwork_Signal_Cb tw_signal_link_downloading[E_PIXMAP_TYPE_NONE]; extern Teamwork_Signal_Cb tw_signal_link_downloading[E_PIXMAP_TYPE_NONE];
EINTERN E_Config_Dialog *e_int_config_teamwork_module(Evas_Object *parent, const char *params EINA_UNUSED); EINTERN E_Config_Dialog *e_int_config_teamwork_module(Evas_Object *parent, const char *params EINA_UNUSED);
E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED); E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED);

2
src/modules/teamwork/e_mod_tw.c
View File

@ -1209,7 +1209,7 @@ e_tw_init(void)
E_FREE_FUNC(media[MEDIA_CACHE_TYPE_IMAGE], eet_close); E_FREE_FUNC(media[MEDIA_CACHE_TYPE_IMAGE], eet_close);
return 0; return 0;
} }
cache_edd = media_cache_edd_new(); cache_edd = media_cache_edd_new();
EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Media_Cache_List); EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Media_Cache_List);
cleaner_edd = eet_data_descriptor_file_new(&eddc); cleaner_edd = eet_data_descriptor_file_new(&eddc);

102
src/modules/temperature/e_mod_config.c
View File

@ -4,9 +4,9 @@
#define FAR_2_CEL(x) ((x - 32) / 9.0) * 5.0 #define FAR_2_CEL(x) ((x - 32) / 9.0) * 5.0
#define CEL_2_FAR(x) (x * 9.0 / 5.0) + 32 #define CEL_2_FAR(x) (x * 9.0 / 5.0) + 32
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
struct struct
{ {
int interval; int interval;
} poll; } poll;
@ -15,7 +15,7 @@ struct _E_Config_Dialog_Data
#ifdef HAVE_EEZE #ifdef HAVE_EEZE
int backend; int backend;
#endif #endif
struct struct
{ {
int low, high; int low, high;
} temp; } temp;
@ -81,8 +81,8 @@ temperature_get_bus_files(const char *bus)
} }
void void
config_temperature_module(Config_Face *inst) config_temperature_module(Config_Face *inst)
{ {
E_Config_Dialog_View *v; E_Config_Dialog_View *v;
char buff[PATH_MAX]; char buff[PATH_MAX];
@ -93,17 +93,17 @@ config_temperature_module(Config_Face *inst)
v->basic.create_widgets = _basic_create; v->basic.create_widgets = _basic_create;
v->basic.apply_cfdata = _basic_apply; v->basic.apply_cfdata = _basic_apply;
snprintf(buff, sizeof(buff), snprintf(buff, sizeof(buff),
"%s/e-module-temperature.edj", inst->module->dir); "%s/e-module-temperature.edj", inst->module->dir);
inst->config_dialog = inst->config_dialog =
e_config_dialog_new(NULL, e_config_dialog_new(NULL,
_("Temperature Settings"), "E", _("Temperature Settings"), "E",
"_e_mod_temperature_config_dialog", buff, 0, v, inst); "_e_mod_temperature_config_dialog", buff, 0, v, inst);
} }
/* local function prototypes */ /* local function prototypes */
static void * static void *
_create_data(E_Config_Dialog *cfd) _create_data(E_Config_Dialog *cfd)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
@ -113,8 +113,8 @@ _create_data(E_Config_Dialog *cfd)
return cfdata; return cfdata;
} }
static void static void
_fill_data_tempget(E_Config_Dialog_Data *cfdata) _fill_data_tempget(E_Config_Dialog_Data *cfdata)
{ {
cfdata->unit_method = cfdata->inst->units; cfdata->unit_method = cfdata->inst->units;
cfdata->poll.interval = cfdata->inst->poll_interval; cfdata->poll.interval = cfdata->inst->poll_interval;
@ -126,7 +126,7 @@ _fill_data_tempget(E_Config_Dialog_Data *cfdata)
if (cfdata->backend == TEMPGET) if (cfdata->backend == TEMPGET)
{ {
#endif #endif
switch (cfdata->inst->sensor_type) switch (cfdata->inst->sensor_type)
{ {
case SENSOR_TYPE_NONE: case SENSOR_TYPE_NONE:
case SENSOR_TYPE_FREEBSD: case SENSOR_TYPE_FREEBSD:
@ -141,7 +141,7 @@ _fill_data_tempget(E_Config_Dialog_Data *cfdata)
case SENSOR_TYPE_LINUX_PCI: case SENSOR_TYPE_LINUX_PCI:
_fill_sensors(cfdata, "pci"); _fill_sensors(cfdata, "pci");
break; break;
case SENSOR_TYPE_LINUX_ACPI: case SENSOR_TYPE_LINUX_ACPI:
{ {
Eina_List *l; Eina_List *l;
@ -150,9 +150,9 @@ _fill_data_tempget(E_Config_Dialog_Data *cfdata)
char *name; char *name;
int n = 0; int n = 0;
EINA_LIST_FREE(l, name) EINA_LIST_FREE(l, name)
{ {
cfdata->sensors = cfdata->sensors =
eina_list_append(cfdata->sensors, name); eina_list_append(cfdata->sensors, name);
if (!strcmp(cfdata->inst->sensor_name, name)) if (!strcmp(cfdata->inst->sensor_name, name))
cfdata->sensor = n; cfdata->sensor = n;
@ -161,20 +161,20 @@ _fill_data_tempget(E_Config_Dialog_Data *cfdata)
} }
break; break;
} }
case SENSOR_TYPE_LINUX_SYS: case SENSOR_TYPE_LINUX_SYS:
{ {
Eina_List *l; Eina_List *l;
if ((l = ecore_file_ls("/sys/class/thermal"))) if ((l = ecore_file_ls("/sys/class/thermal")))
{ {
char *name; char *name;
int n = 0; int n = 0;
EINA_LIST_FREE(l, name) EINA_LIST_FREE(l, name)
{ {
if (!strncmp(name, "thermal", 7)) if (!strncmp(name, "thermal", 7))
{ {
cfdata->sensors = cfdata->sensors =
eina_list_append(cfdata->sensors, name); eina_list_append(cfdata->sensors, name);
if (!strcmp(cfdata->inst->sensor_name, name)) if (!strcmp(cfdata->inst->sensor_name, name))
cfdata->sensor = n; cfdata->sensor = n;
@ -192,8 +192,8 @@ _fill_data_tempget(E_Config_Dialog_Data *cfdata)
#endif #endif
} }
static void static void
_fill_sensors(E_Config_Dialog_Data *cfdata, const char *name) _fill_sensors(E_Config_Dialog_Data *cfdata, const char *name)
{ {
Eina_List *therms, *l; Eina_List *therms, *l;
char *n; char *n;
@ -203,30 +203,30 @@ _fill_sensors(E_Config_Dialog_Data *cfdata, const char *name)
{ {
char path[PATH_MAX]; char path[PATH_MAX];
EINA_LIST_FREE(therms, n) EINA_LIST_FREE(therms, n)
{ {
if (ecore_file_exists(n)) if (ecore_file_exists(n))
{ {
int len; int len;
sprintf(path, "%s", ecore_file_file_get(n)); sprintf(path, "%s", ecore_file_file_get(n));
len = strlen(path); len = strlen(path);
if (len > 6) path[len - 6] = '\0'; if (len > 6) path[len - 6] = '\0';
cfdata->sensors = cfdata->sensors =
eina_list_append(cfdata->sensors, strdup(path)); eina_list_append(cfdata->sensors, strdup(path));
} }
free(n); free(n);
} }
} }
EINA_LIST_FOREACH(cfdata->sensors, l, n) EINA_LIST_FOREACH(cfdata->sensors, l, n)
{ {
if (!strcmp(cfdata->inst->sensor_name, n)) break; if (!strcmp(cfdata->inst->sensor_name, n)) break;
cfdata->sensor++; cfdata->sensor++;
} }
} }
static void static void
_free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
{ {
char *sensor; char *sensor;
@ -237,7 +237,7 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
} }
static Evas_Object * static Evas_Object *
_basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *otb, *ol, *ow; Evas_Object *otb, *ol, *ow;
E_Radio_Group *rg; E_Radio_Group *rg;
@ -246,7 +246,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
otb = e_widget_toolbook_add(evas, 24, 24); otb = e_widget_toolbook_add(evas, 24, 24);
if (cfdata->sensors) if (cfdata->sensors)
{ {
Eina_List *l; Eina_List *l;
char *name; char *name;
@ -254,13 +254,13 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
ol = e_widget_list_add(evas, 0, 0); ol = e_widget_list_add(evas, 0, 0);
rg = e_widget_radio_group_new(&(cfdata->sensor)); rg = e_widget_radio_group_new(&(cfdata->sensor));
EINA_LIST_FOREACH(cfdata->sensors, l, name) EINA_LIST_FOREACH(cfdata->sensors, l, name)
{ {
ow = e_widget_radio_add(evas, _(name), n, rg); ow = e_widget_radio_add(evas, _(name), n, rg);
e_widget_list_object_append(ol, ow, 1, 0, 0.5); e_widget_list_object_append(ol, ow, 1, 0, 0.5);
n++; n++;
} }
e_widget_toolbook_page_append(otb, NULL, _("Sensors"), ol, e_widget_toolbook_page_append(otb, NULL, _("Sensors"), ol,
1, 1, 1, 0, 0.0, 0.0); 1, 1, 1, 0, 0.0, 0.0);
} }
@ -272,42 +272,42 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
ow = e_widget_radio_add(evas, _("Fahrenheit"), FAHRENHEIT, rg); ow = e_widget_radio_add(evas, _("Fahrenheit"), FAHRENHEIT, rg);
e_widget_on_change_hook_set(ow, _cb_display_changed, cfdata); e_widget_on_change_hook_set(ow, _cb_display_changed, cfdata);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Display Units"), ol, e_widget_toolbook_page_append(otb, NULL, _("Display Units"), ol,
1, 1, 1, 0, 0.0, 0.0); 1, 1, 1, 0, 0.0, 0.0);
ol = e_widget_list_add(evas, 0, 0); ol = e_widget_list_add(evas, 0, 0);
ow = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 1, 1024, 4, 0, ow = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 1, 1024, 4, 0,
NULL, &(cfdata->poll.interval), 150); NULL, &(cfdata->poll.interval), 150);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Check Interval"), ol, e_widget_toolbook_page_append(otb, NULL, _("Check Interval"), ol,
1, 1, 1, 0, 0.0, 0.0); 1, 1, 1, 0, 0.0, 0.0);
ol = e_widget_list_add(evas, 0, 0); ol = e_widget_list_add(evas, 0, 0);
ow = e_widget_label_add(evas, _("High Temperature")); ow = e_widget_label_add(evas, _("High Temperature"));
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
if (cfdata->unit_method == FAHRENHEIT) if (cfdata->unit_method == FAHRENHEIT)
cfdata->o_high = cfdata->o_high =
e_widget_slider_add(evas, 1, 0, _("%1.0f F"), 0, 230, 5, 0, e_widget_slider_add(evas, 1, 0, _("%1.0f F"), 0, 230, 5, 0,
NULL, &(cfdata->temp.high), 150); NULL, &(cfdata->temp.high), 150);
else else
cfdata->o_high = cfdata->o_high =
e_widget_slider_add(evas, 1, 0, _("%1.0f C"), 0, 110, 5, 0, e_widget_slider_add(evas, 1, 0, _("%1.0f C"), 0, 110, 5, 0,
NULL, &(cfdata->temp.high), 150); NULL, &(cfdata->temp.high), 150);
e_widget_list_object_append(ol, cfdata->o_high, 1, 1, 0.5); e_widget_list_object_append(ol, cfdata->o_high, 1, 1, 0.5);
ow = e_widget_label_add(evas, _("Low Temperature")); ow = e_widget_label_add(evas, _("Low Temperature"));
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
if (cfdata->unit_method == FAHRENHEIT) if (cfdata->unit_method == FAHRENHEIT)
cfdata->o_low = cfdata->o_low =
e_widget_slider_add(evas, 1, 0, _("%1.0f F"), 0, 200, 5, 0, e_widget_slider_add(evas, 1, 0, _("%1.0f F"), 0, 200, 5, 0,
NULL, &(cfdata->temp.low), 150); NULL, &(cfdata->temp.low), 150);
else else
cfdata->o_low = cfdata->o_low =
e_widget_slider_add(evas, 1, 0, _("%1.0f C"), 0, 95, 5, 0, e_widget_slider_add(evas, 1, 0, _("%1.0f C"), 0, 95, 5, 0,
NULL, &(cfdata->temp.low), 150); NULL, &(cfdata->temp.low), 150);
e_widget_list_object_append(ol, cfdata->o_low, 1, 1, 0.5); e_widget_list_object_append(ol, cfdata->o_low, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Temperatures"), ol, e_widget_toolbook_page_append(otb, NULL, _("Temperatures"), ol,
1, 1, 1, 0, 0.0, 0.0); 1, 1, 1, 0, 0.0, 0.0);
#ifdef HAVE_EEZE #ifdef HAVE_EEZE
ol = e_widget_list_add(evas, 0, 0); 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
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
ow = e_widget_radio_add(evas, _("udev"), UDEV, rg); ow = e_widget_radio_add(evas, _("udev"), UDEV, rg);
e_widget_list_object_append(ol, ow, 1, 1, 0.5); e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Hardware"), ol, e_widget_toolbook_page_append(otb, NULL, _("Hardware"), ol,
1, 1, 1, 0, 0.0, 0.0); 1, 1, 1, 0, 0.0, 0.0);
#endif #endif
e_widget_toolbook_page_show(otb, 0); e_widget_toolbook_page_show(otb, 0);
return otb; return otb;
} }
static int static int
_basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
{ {
cfdata->inst->poll_interval = cfdata->poll.interval; cfdata->inst->poll_interval = cfdata->poll.interval;
cfdata->inst->units = cfdata->unit_method; cfdata->inst->units = cfdata->unit_method;
@ -334,7 +334,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
cfdata->inst->backend = cfdata->backend; cfdata->inst->backend = cfdata->backend;
#endif #endif
eina_stringshare_replace(&cfdata->inst->sensor_name, eina_stringshare_replace(&cfdata->inst->sensor_name,
eina_list_nth(cfdata->sensors, cfdata->sensor)); eina_list_nth(cfdata->sensors, cfdata->sensor));
e_config_save_queue(); e_config_save_queue();
@ -342,8 +342,8 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
return 1; return 1;
} }
static void static void
_cb_display_changed(void *data, Evas_Object *obj EINA_UNUSED) _cb_display_changed(void *data, Evas_Object *obj EINA_UNUSED)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
int val; int val;

2
src/modules/temperature/e_mod_main.c
View File

@ -384,7 +384,7 @@ temperature_face_update_config(Config_Face *inst)
} }
/* module setup */ /* module setup */
E_API E_Module_Api e_modapi = E_API E_Module_Api e_modapi =
{ {
E_MODULE_API_VERSION, E_MODULE_API_VERSION,
"Temperature" "Temperature"

4
src/modules/time/config.c
View File

@ -405,7 +405,7 @@ _config_digital_rows_setup(Config_Item *ci, Evas_Object *tb)
evas_object_smart_callback_add(o, "changed", _config_changed, ci); evas_object_smart_callback_add(o, "changed", _config_changed, ci);
elm_table_pack(tb, o, 1, row++, 1, 1); elm_table_pack(tb, o, 1, row++, 1, 1);
} }
_config_label_add(tb, _("Show Seconds:"), row); _config_label_add(tb, _("Show Seconds:"), row);
o = elm_check_add(tb); o = elm_check_add(tb);
E_FILL(o); E_FILL(o);
@ -549,7 +549,7 @@ config_clock(Config_Item *ci, E_Zone *zone)
if (!ccname) ccname = ccnames[i]; if (!ccname) ccname = ccnames[i];
edje_color_class_get(ccname, &r, &g, &b, &a, edje_color_class_get(ccname, &r, &g, &b, &a,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
it = elm_colorselector_palette_color_add(cs, r, g, b, a); it = elm_colorselector_palette_color_add(cs, r, g, b, a);
o = elm_button_add(tb); o = elm_button_add(tb);
elm_object_text_set(o, names[i]); elm_object_text_set(o, names[i]);

2
src/modules/wireless/connman.c
View File

@ -180,7 +180,7 @@ _connman_service_connect_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendin
eldbus_message_error_get(msg, NULL, &error); eldbus_message_error_get(msg, NULL, &error);
} }
static Eina_Bool static Eina_Bool
_connman_service_connect(Wireless_Network *wn) _connman_service_connect(Wireless_Network *wn)
{ {
Connman_Service *cs; Connman_Service *cs;