stefan pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=65441c214b204f375dcb91f7e835ab3a59c5f43c
commit 65441c214b204f375dcb91f7e835ab3a59c5f43c Author: Elyes HAOUAS <[email protected]> Date: Wed May 13 19:32:55 2020 +0000 tree-wide: get rid of trailing whitespace (part 10) Remove trailing whitespaces Reviewed-by: Stefan Schmidt <[email protected]> Differential Revision: https://phab.enlightenment.org/D11830 --- src/modules/fileman_opinfo/e_mod_main.c | 38 ++++++++++----------- src/modules/gadman/e_mod_gadman.c | 2 +- src/modules/gadman/e_mod_gadman.h | 4 +-- src/modules/ibar/e_mod_config.c | 4 +-- src/modules/ibar/e_mod_main.c | 58 ++++++++++++++++----------------- src/modules/ibox/e_mod_config.c | 16 ++++----- src/modules/ibox/e_mod_main.c | 2 +- src/modules/ibox/e_mod_main.h | 2 +- src/modules/luncher/bar.c | 24 +++++++------- src/modules/luncher/config.c | 4 +-- src/modules/notification/e_mod_config.c | 2 +- 11 files changed, 78 insertions(+), 78 deletions(-) diff --git a/src/modules/fileman_opinfo/e_mod_main.c b/src/modules/fileman_opinfo/e_mod_main.c index 266e0fce8..584d6243a 100644 --- a/src/modules/fileman_opinfo/e_mod_main.c +++ b/src/modules/fileman_opinfo/e_mod_main.c @@ -71,7 +71,7 @@ _opinfo_op_registry_listener(void *data, const E_Fm2_Op_Registry_Entry *ere) // Don't show if the operation keep less than 1 second if (!ere->needs_attention && (ere->start_time + 1.0 > ecore_loop_time_get())) return; - + // Update icon switch (ere->op) { @@ -228,34 +228,34 @@ static Eina_Bool _opinfo_op_registry_free_data_delayed(void *data) { Evas_Object *o = data; - + if (o) { evas_object_del(o); } - + return ECORE_CALLBACK_CANCEL; } -static void +static void _opinfo_op_registry_abort_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { int id; - + id = (long)data; if (!id) return; - + e_fm2_operation_abort(id); } -static void +static void _opinfo_op_registry_window_jump_cb(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { int id = (long)data; E_Fm2_Op_Registry_Entry *ere; Evas_Object *win; E_Client *ec; - + if (!id) return; ere = e_fm2_op_registry_entry_get(id); if (!ere) return; @@ -279,7 +279,7 @@ _opinfo_op_registry_entry_add_cb(void *data, EINA_UNUSED int type, void *event) E_Fm2_Op_Registry_Entry *ere = event; Instance *inst = data; Evas_Object *o; - + if (!inst || !ere) return ECORE_CALLBACK_RENEW; @@ -287,18 +287,18 @@ _opinfo_op_registry_entry_add_cb(void *data, EINA_UNUSED int type, void *event) if (!(ere->op == E_FM_OP_COPY || ere->op == E_FM_OP_MOVE || ere->op == E_FM_OP_REMOVE)) return ECORE_CALLBACK_RENEW; - + o = edje_object_add(evas_object_evas_get(inst->o_box)); e_theme_edje_object_set(o, "base/theme/fileman", "e/fileman/default/progress"); edje_object_signal_callback_add(o, "e,fm,operation,abort", "", _opinfo_op_registry_abort_cb, (void*)(long)ere->id); - edje_object_signal_callback_add(o, "e,fm,window,jump", "", - _opinfo_op_registry_window_jump_cb, (void*)(long)ere->id); + edje_object_signal_callback_add(o, "e,fm,window,jump", "", + _opinfo_op_registry_window_jump_cb, (void*)(long)ere->id); elm_box_pack_end(inst->o_box, o); - + e_fm2_op_registry_entry_listener_add(ere, _opinfo_op_registry_listener, o, _opinfo_op_registry_free_data); - + return ECORE_CALLBACK_RENEW; } @@ -306,7 +306,7 @@ static Eina_Bool _opinfo_op_registry_entry_del_cb(void *data, EINA_UNUSED int type, EINA_UNUSED void *event) { Instance *inst = data; - + if (!inst) return ECORE_CALLBACK_RENEW; @@ -329,12 +329,12 @@ _opinfo_op_registry_update_all(Instance *inst) _opinfo_op_registry_update_status(inst); } -static void +static void _opinfo_op_registry_update_status(Instance *inst) { int cnt; char buf[256]; - + cnt = e_fm2_op_registry_count(); if (cnt) { @@ -445,7 +445,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas) snprintf(buf, sizeof(buf), "%s/e-module-fileman_opinfo.edj", e_module_dir_get(opinfo_module)); edje_object_file_set(o, buf, "icon"); - + return o; } @@ -457,7 +457,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED) /******************** E MODULE ****************************************/ -E_API E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "EFM Info" diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c index 71349e6f3..b10fc3040 100644 --- a/src/modules/gadman/e_mod_gadman.c +++ b/src/modules/gadman/e_mod_gadman.c @@ -1191,7 +1191,7 @@ _menu_style_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) { w = ow, h = oh; } - else + else { /* just flip aspect */ w = oh; diff --git a/src/modules/gadman/e_mod_gadman.h b/src/modules/gadman/e_mod_gadman.h index ec76361ae..3be541628 100644 --- a/src/modules/gadman/e_mod_gadman.h +++ b/src/modules/gadman/e_mod_gadman.h @@ -57,12 +57,12 @@ struct _Manager Eina_List *waiting; Ecore_Event_Handler *add; - + int visible; Evas_Object *overlay; int width, height; - + E_Module *module; E_Config_Dialog *config_dialog; E_Int_Menu_Augmentation *maug; diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c index 1f9cd4516..baaaad537 100644 --- a/src/modules/ibar/e_mod_config.c +++ b/src/modules/ibar/e_mod_config.c @@ -243,11 +243,11 @@ _cb_entry_ok(void *data, char *text) f = fopen(buf, "w"); if (!f) break; /* Populate this .order file with some defaults */ - snprintf(tmp, sizeof(tmp), + snprintf(tmp, sizeof(tmp), "terminology.desktop\n" "sylpheed.desktop\n" "firefox.desktop\n" - "openoffice.desktop\n" + "openoffice.desktop\n" "xchat.desktop\n" "gimp.desktop\n"); fwrite(tmp, sizeof(char), strlen(tmp), f); diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index ff79fc4f8..e8d443c2a 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -588,7 +588,7 @@ _ibar_fill(IBar *b) } eina_iterator_free(it); } - + _ibar_empty_handle(b); _ibar_resize_handle(b); if (!b->inst->gcc) return; @@ -1698,7 +1698,7 @@ static Eina_Bool _ibar_cb_icon_reset(void *data) { IBar_Icon *ic = data; - + if (ic->focused) { _ibar_icon_signal_emit(ic, "e,state,focused", "e"); @@ -1780,7 +1780,7 @@ static void _ibar_instance_watch(void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type) { IBar_Icon *ic = data; - + switch (type) { case E_EXEC_WATCH_STARTED: @@ -1831,7 +1831,7 @@ _ibar_icon_go(IBar_Icon *ic, Eina_Bool keep_going) else { E_Exec_Instance *einst; - + einst = e_exec(ic->ibar->inst->gcc->gadcon->zone, ic->app, NULL, NULL, "ibar"); if (einst) @@ -1848,7 +1848,7 @@ _ibar_icon_go(IBar_Icon *ic, Eina_Bool keep_going) if (!strncasecmp(ic->app->url, "file:", 5)) { E_Action *act; - + act = e_action_find("fileman"); if (act) act->func.go(NULL, ic->app->url + 5); } @@ -2215,7 +2215,7 @@ _ibar_manager_find(void) E_Zone *z = e_zone_current_get(); IBar *b; Eina_List *l; - + if (!z) return NULL; // find iubar on current zone EINA_LIST_FOREACH(ibars, l, b) @@ -2256,7 +2256,7 @@ _ibar_focused_find(void) { IBar *b; Eina_List *l; - + EINA_LIST_FOREACH(ibars, l, b) { if (b->focused) return b; @@ -2268,7 +2268,7 @@ static int _ibar_cb_sort(IBar *b1, IBar *b2) { E_Zone *z1 = NULL, *z2 = NULL; - + if ((b1) && (b1->inst) && (b1->inst->gcc) && (b1->inst->gcc->gadcon)) z1 = b1->inst->gcc->gadcon->zone; if ((b2) && (b2->inst) && (b2->inst->gcc) && (b2->inst->gcc->gadcon)) @@ -2279,7 +2279,7 @@ _ibar_cb_sort(IBar *b1, IBar *b2) else { int id1, id2; - + id1 = z1->id; id2 = z2->id; return id2 - id1; @@ -2293,7 +2293,7 @@ _ibar_focused_next_find(void) IBar *b, *bn = NULL; Eina_List *l; Eina_List *tmpl = NULL; - + EINA_LIST_FOREACH(ibars, l, b) { if (!b->icons) continue; @@ -2327,7 +2327,7 @@ _ibar_focused_prev_find(void) IBar *b, *bn = NULL; Eina_List *l; Eina_List *tmpl = NULL; - + EINA_LIST_FOREACH(ibars, l, b) { if (!b->icons) continue; @@ -2359,7 +2359,7 @@ static void _ibar_focus(IBar *b) { IBar_Icon *ic; - + if (b->focused) return; b->focused = EINA_TRUE; EINA_INLIST_FOREACH(b->icons, ic) @@ -2395,7 +2395,7 @@ static void _ibar_focus_next(IBar *b) { IBar_Icon *ic, *ic1 = NULL, *ic2 = NULL; - + if (!b->focused) return; if (!b->icons) return; EINA_INLIST_FOREACH(b->icons, ic) @@ -2420,7 +2420,7 @@ static void _ibar_focus_prev(IBar *b) { IBar_Icon *ic, *ic1 = NULL, *ic2 = NULL; - + if (!b->focused) return; if (!b->icons) return; EINA_INLIST_FOREACH(b->icons, ic) @@ -2442,7 +2442,7 @@ static void _ibar_focus_launch(IBar *b) { IBar_Icon *ic; - + if (!b->focused) return; EINA_INLIST_FOREACH(b->icons, ic) { @@ -2459,7 +2459,7 @@ _ibar_focus_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *even { Ecore_Event_Key *ev; IBar *b, *b2; - + ev = event; if (ev->window != _ibar_focus_win) return ECORE_CALLBACK_PASS_ON; b = _ibar_focused_find(); @@ -2467,7 +2467,7 @@ _ibar_focus_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *even if (!strcmp(ev->key, "Up")) { if (b->inst) - { + { switch (b->inst->orient) { case E_GADCON_ORIENT_VERT: @@ -2487,7 +2487,7 @@ _ibar_focus_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *even else if (!strcmp(ev->key, "Down")) { if (b->inst) - { + { switch (b->inst->orient) { case E_GADCON_ORIENT_VERT: @@ -2507,7 +2507,7 @@ _ibar_focus_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *even else if (!strcmp(ev->key, "Left")) { if (b->inst) - { + { switch (b->inst->orient) { case E_GADCON_ORIENT_FLOAT: @@ -2528,7 +2528,7 @@ _ibar_focus_cb_key_down(void *data EINA_UNUSED, int type EINA_UNUSED, void *even else if (!strcmp(ev->key, "Right")) { if (b->inst) - { + { switch (b->inst->orient) { case E_GADCON_ORIENT_FLOAT: @@ -2597,7 +2597,7 @@ static void _ibar_go_focus(void) { IBar *b; - + if (_ibar_focus_win) return; b = _ibar_manager_find(); if (!b) return; @@ -2612,7 +2612,7 @@ static void _ibar_go_unfocus(void) { IBar *b; - + if (!_ibar_focus_win) return; b = _ibar_focused_find(); if (b) _ibar_unfocus(b); @@ -2621,7 +2621,7 @@ _ibar_go_unfocus(void) ecore_event_handler_del(_ibar_key_down_handler); _ibar_key_down_handler = NULL; } - + static void _ibar_cb_action_focus(E_Object *obj EINA_UNUSED, const char *params EINA_UNUSED, Ecore_Event_Key *ev EINA_UNUSED) { @@ -2636,7 +2636,7 @@ _ibar_cb_client_prop(void *d EINA_UNUSED, int t EINA_UNUSED, E_Event_Client_Prop E_Client *ec; Eina_Bool skip = EINA_TRUE; - if (e_client_util_ignored_get(ev->ec) || (!ev->ec->exe_inst) || + if (e_client_util_ignored_get(ev->ec) || (!ev->ec->exe_inst) || (!ev->ec->exe_inst->desktop)) return ECORE_CALLBACK_RENEW; if ((!(ev->property & E_CLIENT_PROPERTY_NETWM_STATE)) && (!(ev->property & E_CLIENT_PROPERTY_ICON))) return ECORE_CALLBACK_RENEW; @@ -2840,7 +2840,7 @@ e_modapi_init(E_Module *m) E_CONFIG_VAL(D, T, dont_add_nonorder, INT); E_CONFIG_VAL(D, T, dont_track_launch, UCHAR); E_CONFIG_VAL(D, T, dont_icon_menu_mouseover, UCHAR); - + conf_edd = E_CONFIG_DD_NEW("IBar_Config", Config); #undef T #undef D @@ -2885,7 +2885,7 @@ e_modapi_init(E_Module *m) e_gadcon_provider_register(&_gadcon_class); ibar_orders = eina_hash_string_superfast_new(NULL); - + act_ibar_focus = e_action_add("ibar_focus"); if (act_ibar_focus) { @@ -2893,7 +2893,7 @@ e_modapi_init(E_Module *m) e_action_predef_name_set(N_("IBar"), N_("Focus IBar"), "ibar_focus", "<none>", NULL, 0); } - + return m; } @@ -2904,11 +2904,11 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) Config_Item *ci; _ibar_go_unfocus(); - + e_action_del("ibar_focus"); e_action_predef_name_del("IBar", "Focus IBar"); act_ibar_focus = NULL; - + e_gadcon_provider_unregister(&_gadcon_class); if (ibar_config->config_dialog) diff --git a/src/modules/ibox/e_mod_config.c b/src/modules/ibox/e_mod_config.c index 97609ee26..d0ade272a 100644 --- a/src/modules/ibox/e_mod_config.c +++ b/src/modules/ibox/e_mod_config.c @@ -26,13 +26,13 @@ static void _cb_disable_check_list(void *data, Evas_Object *obj); static void _cb_zone_policy_change(void *data, Evas_Object *obj); // unused //static void _cb_disable_check(void *data, Evas_Object *obj); -void +void _config_ibox_module(Config_Item *ci) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; char buf[4096]; - + v = E_NEW(E_Config_Dialog_View, 1); /* Dialog Methods */ @@ -42,7 +42,7 @@ _config_ibox_module(Config_Item *ci) v->basic.create_widgets = _basic_create_widgets; v->advanced.apply_cfdata = NULL; v->advanced.create_widgets = NULL; - + /* Create The Dialog */ snprintf(buf, sizeof(buf), "%s/e-module-ibox.edj", e_module_dir_get(ibox_config->module)); cfd = e_config_dialog_new(NULL, @@ -52,7 +52,7 @@ _config_ibox_module(Config_Item *ci) ibox_config->config_dialog = eina_list_append(ibox_config->config_dialog, cfd); } -static void +static void _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata) { cfdata->show_label = ci->show_label; @@ -66,14 +66,14 @@ _create_data(E_Config_Dialog *cfd) { E_Config_Dialog_Data *cfdata; Config_Item *ci; - + ci = cfd->data; cfdata = E_NEW(E_Config_Dialog_Data, 1); _fill_data(ci, cfdata); return cfdata; } -static void +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { show_label_list = eina_list_free(show_label_list); @@ -170,7 +170,7 @@ static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { Config_Item *ci; - + ci = cfd->data; ci->show_label = cfdata->show_label; ci->icon_label = cfdata->icon_label; @@ -213,7 +213,7 @@ _cb_zone_policy_change(void *data, Evas_Object *obj EINA_UNUSED) static void _cb_disable_check(void *data, Evas_Object *obj) { - e_widget_disabled_set((Evas_Object *) data, + e_widget_disabled_set((Evas_Object *) data, !e_widget_check_checked_get(obj)); } #endif diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c index ab35c5196..3d7c00447 100644 --- a/src/modules/ibox/e_mod_main.c +++ b/src/modules/ibox/e_mod_main.c @@ -1033,7 +1033,7 @@ _ibox_cb_event_client_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev if (!ev->ec->iconic) return ECORE_CALLBACK_RENEW; if (!ev->ec->zone) return ECORE_CALLBACK_RENEW; desk = e_desk_current_get(ev->ec->zone); - + ibox = _ibox_zone_find(ev->ec->zone); EINA_LIST_FREE(ibox, b) { diff --git a/src/modules/ibox/e_mod_main.h b/src/modules/ibox/e_mod_main.h index 8c1054e7a..32a104c0c 100644 --- a/src/modules/ibox/e_mod_main.h +++ b/src/modules/ibox/e_mod_main.h @@ -14,7 +14,7 @@ struct _Config Eina_List *config_dialog; }; -struct _Config_Item +struct _Config_Item { const char *id; int show_label; diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c index 40f6f08d1..b9727c258 100644 --- a/src/modules/luncher/bar.c +++ b/src/modules/luncher/bar.c @@ -54,7 +54,7 @@ _bar_gadget_configure(Evas_Object *g) return config_luncher(e_zone_current_get(), inst, EINA_TRUE); } -static void +static void _bar_popup_dismissed(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { E_FREE_FUNC(obj, evas_object_del); @@ -64,9 +64,9 @@ static const char * _bar_location_get(Instance *inst) { const char *s = "float"; - + E_Gadget_Site_Orient orient = e_gadget_site_orient_get(e_gadget_site_get(inst->o_main)); - E_Gadget_Site_Anchor anchor = e_gadget_site_anchor_get(e_gadget_site_get(inst->o_main)); + E_Gadget_Site_Anchor anchor = e_gadget_site_anchor_get(e_gadget_site_get(inst->o_main)); if (anchor & E_GADGET_SITE_ANCHOR_LEFT) { @@ -152,7 +152,7 @@ _bar_location_get(Instance *inst) case E_GADGET_SITE_ORIENT_VERTICAL: s = "left"; break; - default: + default: s = "bottom"; break; } @@ -821,7 +821,7 @@ _bar_icon_preview_show(void *data) evas_object_size_hint_max_set(ic->preview_scroller, zone->w - 15, zone->h - 15); elm_object_style_set(ic->preview_scroller, "no_inset_shadow"); E_EXPAND(ic->preview_scroller); - + ic->preview_box = elm_box_add(ic->preview); evas_object_size_hint_align_set(ic->preview_box, 0, 0); switch (orient) @@ -905,10 +905,10 @@ _bar_icon_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *even else if (clients && !ic->inst->current_preview) ic->mouse_in_timer = ecore_timer_loop_add(0.3, _bar_icon_preview_show, ic); } - + static void _bar_exec_new_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_data EINA_UNUSED) -{ +{ Icon *ic = data; E_Client *ec = e_comp_object_client_get(obj); @@ -1207,7 +1207,7 @@ _bar_cb_client_remove(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Clie _bar_icon_del(inst, ic); } else if (ic->preview && (inst->current_preview == ic->preview)) - { + { _bar_icon_preview_show(ic); } } @@ -1280,7 +1280,7 @@ _bar_cb_exec_client_prop(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_C Eina_Bool has_desktop = EINA_TRUE; if (e_client_util_ignored_get(ev->ec)) - return ECORE_CALLBACK_RENEW; + return ECORE_CALLBACK_RENEW; if ((!(ev->property & E_CLIENT_PROPERTY_NETWM_STATE)) && (!(ev->property & E_CLIENT_PROPERTY_ICON)) && (!(ev->property & E_CLIENT_PROPERTY_URGENCY))) return ECORE_CALLBACK_RENEW; @@ -1485,7 +1485,7 @@ _bar_fill(Instance *inst) { const Eina_Hash *execs = e_exec_instances_get(); Eina_Iterator *it; - Eina_List *l, *ll, *lll; + Eina_List *l, *ll, *lll; E_Exec_Instance *ex; E_Client *ec; Icon *ic; @@ -1770,7 +1770,7 @@ static void _bar_drop_enter(void *data, const char *type EINA_UNUSED, void *event_data EINA_UNUSED) { Instance *inst = data; - + inst->inside = EINA_TRUE; inst->place_holder = evas_object_rectangle_add(evas_object_evas_get(inst->o_icon_con)); evas_object_color_set(inst->place_holder, 0, 0, 0, 0); @@ -1937,7 +1937,7 @@ _bar_recalculate_job(void *data) { _bar_empty(inst); _bar_fill(inst); - } + } inst->recalc_job = NULL; } } diff --git a/src/modules/luncher/config.c b/src/modules/luncher/config.c index 557691217..2ce4baf7e 100644 --- a/src/modules/luncher/config.c +++ b/src/modules/luncher/config.c @@ -70,7 +70,7 @@ _config_source_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_inf return; if (inst->cfg->dir) eina_stringshare_del(inst->cfg->dir); inst->cfg->dir = NULL; - inst->cfg->dir = eina_stringshare_ref(dir); + inst->cfg->dir = eina_stringshare_ref(dir); bar_reorder(inst); } @@ -147,7 +147,7 @@ _config_source_added(void *data, char *text) break; } config_luncher(e_zone_current_get(), inst, luncher_config->bar); -} +} static void _config_source_deleted(void *data) diff --git a/src/modules/notification/e_mod_config.c b/src/modules/notification/e_mod_config.c index e7dbb5c70..4893b367a 100644 --- a/src/modules/notification/e_mod_config.c +++ b/src/modules/notification/e_mod_config.c @@ -188,7 +188,7 @@ static int _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) { - return + return (cfdata->show_low != notification_cfg->show_low) || (cfdata->show_normal != notification_cfg->show_normal) || (cfdata->show_critical != notification_cfg->show_critical) || --
