stefan pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=0a9e0003d8c3cf7c9b26715423863e4033799183
commit 0a9e0003d8c3cf7c9b26715423863e4033799183 Author: Elyes HAOUAS <[email protected]> Date: Wed May 13 19:29:58 2020 +0000 tree-wide: get rid of trailing whitespace (part 8) Remove trailing whitespaces Reviewed-by: Stefan Schmidt <[email protected]> Differential Revision: https://phab.enlightenment.org/D11828 --- src/modules/conf_theme/e_int_config_theme.c | 44 ++++++++--------- src/modules/conf_theme/e_int_config_wallpaper.c | 4 +- src/modules/conf_theme/e_int_config_xsettings.c | 6 +-- .../e_int_config_clientlist.c | 56 +++++++++++----------- .../e_int_config_window_geometry.c | 46 +++++++++--------- .../e_int_config_window_process.c | 6 +-- src/modules/conf_window_remembers/e_mod_main.c | 14 +++--- src/modules/connman/e_connman.c | 6 +-- src/modules/cpufreq/e_mod_config.c | 6 +-- src/modules/cpufreq/e_mod_main.c | 10 ++-- src/modules/everything/e_mod_main.h | 8 ++-- src/modules/everything/evry.c | 4 +- src/modules/everything/evry_api.h | 2 +- 13 files changed, 106 insertions(+), 106 deletions(-) diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c index 807989402..1003bf0e1 100644 --- a/src/modules/conf_theme/e_int_config_theme.c +++ b/src/modules/conf_theme/e_int_config_theme.c @@ -65,7 +65,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) win = elm_win_fake_add(ecore_evas_ecore_evas_get(e)); evas_object_size_hint_min_get(preview, &w, &h); w *= 2; h *= 2; - + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/desktop/background"); evas_object_move(o, 0, 0); @@ -82,7 +82,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) edje_object_signal_emit(o, "e,state,visible,on", "e"); objs = eina_list_append(objs, o); po = o; - + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/shelf/default/base"); evas_object_show(o); @@ -91,16 +91,16 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) objs = eina_list_append(objs, o); po = o; po2 = po; - + o = elm_box_add(win); elm_box_horizontal_set(o, 1); evas_object_show(o); edje_object_part_swallow(po, "e.swallow.content", o); objs = eina_list_append(objs, o); po = o; - + mh = 42 * e_scale; - + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/modules/start/main"); evas_object_show(o); @@ -124,7 +124,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) edje_object_part_swallow(po2, "e.swallow.content", o); objs = eina_list_append(objs, o); po3 = o; - + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/modules/pager/desk"); evas_object_show(o); @@ -177,7 +177,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) elm_box_pack_end(po, o); evas_object_size_hint_min_set(o, mh, 0); objs = eina_list_append(objs, o); - + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/modules/clock/main"); evas_object_show(o); @@ -185,8 +185,8 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) elm_box_pack_end(po, o); evas_object_size_hint_min_set(o, mh, 0); objs = eina_list_append(objs, o); - - + + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/comp/frame/default"); evas_object_move(o, w / 2, h / 9); @@ -198,7 +198,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) objs = eina_list_append(objs, o); po = o; po2 = po; - + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/widgets/border/default/border"); edje_object_part_text_set(o, "e.text.title", "Title"); @@ -207,7 +207,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) edje_object_part_swallow(po, "e.swallow.content", o); objs = eina_list_append(objs, o); po = o; - + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/theme/about"); edje_object_size_min_get(o, &mw, &mh); @@ -218,9 +218,9 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) edje_object_part_swallow(po, "e.swallow.client", o); objs = eina_list_append(objs, o); - - - + + + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/comp/frame/default"); evas_object_move(o, w / 10, h / 5); @@ -231,7 +231,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) edje_object_signal_emit(o, "e,state,focus,on", "e"); objs = eina_list_append(objs, o); po = o; - + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/widgets/border/default/border"); edje_object_part_text_set(o, "e.text.title", "Title"); @@ -240,7 +240,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) edje_object_part_swallow(po, "e.swallow.content", o); objs = eina_list_append(objs, o); po = o; - + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/widgets/dialog/main"); evas_object_show(o); @@ -249,10 +249,10 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) objs = eina_list_append(objs, o); po = o; po2 = po; - + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/widgets/dialog/text"); - edje_object_part_text_set(o, "e.textblock.message", + edje_object_part_text_set(o, "e.textblock.message", "<hilight>Welcome to enlightenment.</hilight><ps/>" "<ps/>" "This is a sample set of content for a<ps/>" @@ -260,7 +260,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) evas_object_show(o); edje_object_part_swallow(po, "e.swallow.content", o); objs = eina_list_append(objs, o); - + o = e_icon_add(e); e_util_icon_theme_set(o, "dialog-warning"); evas_object_show(o); @@ -275,7 +275,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) edje_object_part_swallow(po, "e.swallow.buttons", o); objs = eina_list_append(objs, o); po = o; - + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/widgets/button"); evas_object_show(o); @@ -285,7 +285,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) elm_box_pack_end(po, o); evas_object_size_hint_min_set(o, 50, 20); objs = eina_list_append(objs, o); - + o = edje_object_add(e); _e_int_theme_edje_file_set(o, file, "e/widgets/button"); evas_object_show(o); @@ -302,7 +302,7 @@ _e_int_theme_preview_set(Evas_Object *preview, const char *file) edje_object_part_swallow(po2, "e.swallow.buttons", po); evas_object_data_set(preview, "objects", objs); - + // e_widget_preview_edje_set(preview, file, "e/desktop/background"); return EINA_TRUE; } diff --git a/src/modules/conf_theme/e_int_config_wallpaper.c b/src/modules/conf_theme/e_int_config_wallpaper.c index 74dce4ceb..0da95e326 100644 --- a/src/modules/conf_theme/e_int_config_wallpaper.c +++ b/src/modules/conf_theme/e_int_config_wallpaper.c @@ -469,7 +469,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data _cb_button_up, cfdata, NULL); cfdata->o_up_button = ow; e_widget_table_object_append(rt, ow, 2, 0, 1, 1, 0, 0, 0, 0); - + e_widget_table_object_align_append(ot, rt, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0); if (cfdata->fmdir == 1) @@ -539,7 +539,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data e_widget_radio_toggle_set(cfdata->o_system, EINA_TRUE); else e_widget_radio_toggle_set(cfdata->o_personal, EINA_TRUE); - + if (cfdata->use_theme_bg) _disable_set(cfdata, 1); diff --git a/src/modules/conf_theme/e_int_config_xsettings.c b/src/modules/conf_theme/e_int_config_xsettings.c index 3af2ea0ab..a8e52244d 100644 --- a/src/modules/conf_theme/e_int_config_xsettings.c +++ b/src/modules/conf_theme/e_int_config_xsettings.c @@ -304,7 +304,7 @@ _fill_files_ilist(void *data) strcat(label, " (v3)"); len -= 5; } - + /* value pointer will exist as long as ilist item so val remains valid */ e_widget_ilist_append(o, NULL, label, NULL, NULL, value); @@ -490,7 +490,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data #endif e_widget_check_widget_disable_on_unchecked_add(oc, ilist); e_widget_check_widget_disable_on_unchecked_add(oc, ow); - e_widget_toolbook_page_append(otb, NULL, _("GTK Applications"), ol, + e_widget_toolbook_page_append(otb, NULL, _("GTK Applications"), ol, 1, 1, 1, 1, 0.5, 0.0); ol = e_widget_list_add(evas, 0, 0); @@ -530,7 +530,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data &(cfdata->icon_overrides)); e_widget_list_object_append(ol, ow, 0, 0, 0.0); - e_widget_toolbook_page_append(otb, NULL, _("Icons"), ol, + e_widget_toolbook_page_append(otb, NULL, _("Icons"), ol, 1, 1, 1, 1, 0.5, 0.0); e_widget_toolbook_page_show(otb, 0); diff --git a/src/modules/conf_window_manipulation/e_int_config_clientlist.c b/src/modules/conf_window_manipulation/e_int_config_clientlist.c index 5e852980d..ff21e574c 100644 --- a/src/modules/conf_window_manipulation/e_int_config_clientlist.c +++ b/src/modules/conf_window_manipulation/e_int_config_clientlist.c @@ -7,7 +7,7 @@ static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfda static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -struct _E_Config_Dialog_Data +struct _E_Config_Dialog_Data { int group_by; int include_all_zones; @@ -25,7 +25,7 @@ e_int_config_clientlist(Evas_Object *parent EINA_UNUSED, const char *params EINA E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "windows/window_list_menu")) + if (e_config_dialog_find("E", "windows/window_list_menu")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); @@ -35,14 +35,14 @@ e_int_config_clientlist(Evas_Object *parent EINA_UNUSED, const char *params EINA v->basic.create_widgets = _basic_create; v->basic.check_changed = _basic_check_changed; - cfd = e_config_dialog_new(NULL, _("Window List Menu Settings"), "E", + cfd = e_config_dialog_new(NULL, _("Window List Menu Settings"), "E", "windows/window_list_menu", "preferences-winlist", 0, v, NULL); return cfd; } static void -_fill_data(E_Config_Dialog_Data *cfdata) +_fill_data(E_Config_Dialog_Data *cfdata) { cfdata->group_by = e_config->clientlist_group_by; cfdata->include_all_zones = e_config->clientlist_include_all_zones; @@ -55,17 +55,17 @@ _fill_data(E_Config_Dialog_Data *cfdata) } static void * -_create_data(E_Config_Dialog *cfd EINA_UNUSED) +_create_data(E_Config_Dialog *cfd EINA_UNUSED) { E_Config_Dialog_Data *cfdata; - + cfdata = E_NEW(E_Config_Dialog_Data, 1); _fill_data(cfdata); return cfdata; } 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) { E_FREE(cfdata); } @@ -86,15 +86,15 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd } 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) { e_config->clientlist_group_by = cfdata->group_by; e_config->clientlist_include_all_zones = cfdata->include_all_zones; e_config->clientlist_separate_with = cfdata->separate_with; e_config->clientlist_sort_by = cfdata->sort_by; - e_config->clientlist_separate_iconified_apps = + e_config->clientlist_separate_iconified_apps = cfdata->separate_iconified_apps; - e_config->clientlist_warp_to_iconified_desktop = + e_config->clientlist_warp_to_iconified_desktop = cfdata->warp_to_iconified_desktop; e_config->clientlist_limit_caption_len = cfdata->limit_caption_len; e_config->clientlist_max_caption_len = cfdata->max_caption_len; @@ -103,7 +103,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) } 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, *of, *ow; E_Radio_Group *rg; @@ -120,7 +120,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data e_widget_framelist_object_append(of, ow); ow = e_widget_radio_add(evas, _("Window Class"), E_CLIENTLIST_GROUP_CLASS, rg); e_widget_framelist_object_append(of, ow); - ow = e_widget_check_add(evas, _("Include windows from other screens"), + ow = e_widget_check_add(evas, _("Include windows from other screens"), &(cfdata->include_all_zones)); e_widget_framelist_object_append(of, ow); e_widget_list_object_append(ol, of, 1, 1, 0.5); @@ -129,58 +129,58 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data rg = e_widget_radio_group_new(&(cfdata->separate_with)); ow = e_widget_radio_add(evas, _("None"), E_CLIENTLIST_GROUP_SEP_NONE, rg); e_widget_framelist_object_append(of, ow); - ow = e_widget_radio_add(evas, _("Using separator bars"), + ow = e_widget_radio_add(evas, _("Using separator bars"), E_CLIENTLIST_GROUP_SEP_BAR, rg); e_widget_framelist_object_append(of, ow); - ow = e_widget_radio_add(evas, _("Using menus"), + ow = e_widget_radio_add(evas, _("Using menus"), E_CLIENTLIST_GROUP_SEP_MENU, rg); e_widget_framelist_object_append(of, ow); e_widget_list_object_append(ol, of, 1, 1, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Grouping"), ol, + e_widget_toolbook_page_append(otb, NULL, _("Grouping"), ol, 1, 1, 1, 0, 0.0, 0.0); ol = e_widget_list_add(evas, 0, 0); rg = e_widget_radio_group_new(&(cfdata->sort_by)); ow = e_widget_radio_add(evas, _("None"), E_CLIENTLIST_SORT_NONE, rg); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - ow = e_widget_radio_add(evas, _("Alphabetical"), + ow = e_widget_radio_add(evas, _("Alphabetical"), E_CLIENTLIST_SORT_ALPHA, rg); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - ow = e_widget_radio_add(evas, _("Window stacking layer"), + ow = e_widget_radio_add(evas, _("Window stacking layer"), E_CLIENTLIST_SORT_ZORDER, rg); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - ow = e_widget_radio_add(evas, _("Most recently used"), + ow = e_widget_radio_add(evas, _("Most recently used"), E_CLIENTLIST_SORT_MOST_RECENT, rg); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Sort Order"), ol, + e_widget_toolbook_page_append(otb, NULL, _("Sort Order"), ol, 1, 1, 1, 0, 0.0, 0.0); ol = e_widget_list_add(evas, 0, 0); rg = e_widget_radio_group_new(&(cfdata->separate_iconified_apps)); - ow = e_widget_radio_add(evas, _("Group with owning desktop"), + ow = e_widget_radio_add(evas, _("Group with owning desktop"), E_CLIENTLIST_GROUPICONS_OWNER, rg); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - ow = e_widget_radio_add(evas, _("Group with current desktop"), + ow = e_widget_radio_add(evas, _("Group with current desktop"), E_CLIENTLIST_GROUPICONS_CURRENT, rg); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - ow = e_widget_radio_add(evas, _("Separate group"), + ow = e_widget_radio_add(evas, _("Separate group"), E_CLIENTLIST_GROUPICONS_SEP, rg); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - ow = e_widget_check_add(evas, _("Warp to owning desktop"), + ow = e_widget_check_add(evas, _("Warp to owning desktop"), &(cfdata->warp_to_iconified_desktop)); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Iconified Windows"), ol, + e_widget_toolbook_page_append(otb, NULL, _("Iconified Windows"), ol, 1, 1, 1, 0, 0.0, 0.0); ol = e_widget_list_add(evas, 0, 0); - ow = e_widget_check_add(evas, _("Limit caption length"), + ow = e_widget_check_add(evas, _("Limit caption length"), &(cfdata->limit_caption_len)); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - ow = e_widget_slider_add(evas, 1, 0, _("%1.0f Chars"), 2.0, - E_CLIENTLIST_MAX_CAPTION_LEN, 2.0, 0, NULL, + ow = e_widget_slider_add(evas, 1, 0, _("%1.0f Chars"), 2.0, + E_CLIENTLIST_MAX_CAPTION_LEN, 2.0, 0, NULL, &(cfdata->max_caption_len), 100); e_widget_list_object_append(ol, ow, 1, 1, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Captions"), ol, + e_widget_toolbook_page_append(otb, NULL, _("Captions"), ol, 1, 1, 1, 0, 0.0, 0.0); e_widget_toolbook_page_show(otb, 0); diff --git a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c index d6f323b18..7c33b0e63 100644 --- a/src/modules/conf_window_manipulation/e_int_config_window_geometry.c +++ b/src/modules/conf_window_manipulation/e_int_config_window_geometry.c @@ -92,7 +92,7 @@ _create_data(E_Config_Dialog *cfd EINA_UNUSED) cfdata->allow_above_fullscreen = e_config->allow_above_fullscreen; if (cfdata->maximize_policy == E_MAXIMIZE_NONE) cfdata->maximize_policy = E_MAXIMIZE_FULLSCREEN; - cfdata->maximize_direction = + cfdata->maximize_direction = (e_config->maximize_policy & E_MAXIMIZE_DIRECTION); if (!cfdata->maximize_direction) cfdata->maximize_direction = E_MAXIMIZE_BOTH; @@ -115,7 +115,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) e_config->window_resist = cfdata->window_resist; e_config->gadget_resist = cfdata->gadget_resist; e_config->geometry_auto_resize_limit = cfdata->geometry_auto_resize_limit; - e_config->geometry_auto_move = cfdata->geometry_auto_move; + e_config->geometry_auto_move = cfdata->geometry_auto_move; e_config->border_keyboard.timeout = cfdata->border_keyboard.timeout; e_config->border_keyboard.move.dx = cfdata->border_keyboard.move.dx; e_config->border_keyboard.move.dy = cfdata->border_keyboard.move.dx; @@ -180,25 +180,25 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data ow = e_widget_label_add(evas, _("Other windows")); e_widget_check_widget_disable_on_unchecked_add(oc, ow); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 64.0, 1.0, 0, + ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 64.0, 1.0, 0, NULL, &(cfdata->window_resist), 100); e_widget_check_widget_disable_on_unchecked_add(oc, ow); e_widget_list_object_append(ol, ow, 1, 0, 0.5); ow = e_widget_label_add(evas, _("Edge of the screen")); e_widget_check_widget_disable_on_unchecked_add(oc, ow); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 64.0, 1.0, 0, + ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 64.0, 1.0, 0, NULL, &(cfdata->desk_resist), 100); e_widget_check_widget_disable_on_unchecked_add(oc, ow); e_widget_list_object_append(ol, ow, 1, 0, 0.5); ow = e_widget_label_add(evas, _("Desktop gadgets")); e_widget_check_widget_disable_on_unchecked_add(oc, ow); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 64.0, 1.0, 0, + ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 0, 64.0, 1.0, 0, NULL, &(cfdata->gadget_resist), 100); e_widget_check_widget_disable_on_unchecked_add(oc, ow); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Resistance"), ol, + e_widget_toolbook_page_append(otb, NULL, _("Resistance"), ol, 1, 1, 1, 0, 0.0, 0.0); /* Maximization */ @@ -225,49 +225,49 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data e_widget_framelist_object_append(of, ow); e_widget_list_object_append(ol, of, 1, 0, 0.5); of = e_widget_framelist_add(evas, _("Manipulation"), 0); - ow = e_widget_check_add(evas, _("Allow manipulation of maximized windows"), + ow = e_widget_check_add(evas, _("Allow manipulation of maximized windows"), &(cfdata->maximized_allow_manip)); e_widget_framelist_object_append(of, ow); ow = e_widget_check_add(evas, _("Allow windows above fullscreen window"), &(cfdata->allow_above_fullscreen)); e_widget_framelist_object_append(of, ow); e_widget_list_object_append(ol, of, 1, 0, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Maximization"), ol, + e_widget_toolbook_page_append(otb, NULL, _("Maximization"), ol, 1, 1, 1, 0, 0.0, 0.0); /* Keyboard Move and resize */ ol = e_widget_list_add(evas, 0, 0); ow = e_widget_label_add(evas, _("Automatically accept changes after:")); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_slider_add(evas, 1, 0, _("%1.1f s"), 0.0, 9.9, 0.1, 0, + ow = e_widget_slider_add(evas, 1, 0, _("%1.1f s"), 0.0, 9.9, 0.1, 0, &(cfdata->border_keyboard.timeout), NULL, 100); e_widget_list_object_append(ol, ow, 1, 0, 0.5); ow = e_widget_label_add(evas, _("Move by")); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 1, 255, 1, 0, NULL, + ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 1, 255, 1, 0, NULL, &(cfdata->border_keyboard.move.dx), 100); e_widget_list_object_append(ol, ow, 1, 0, 0.5); ow = e_widget_label_add(evas, _("Resize by")); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 1, 255, 1, 0, NULL, + ow = e_widget_slider_add(evas, 1, 0, _("%2.0f pixels"), 1, 255, 1, 0, NULL, &(cfdata->border_keyboard.resize.dx), 100); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Keyboard"), ol, + e_widget_toolbook_page_append(otb, NULL, _("Keyboard"), ol, 1, 1, 1, 0, 0.0, 0.0); /* Automatic Move and resize */ ol = e_widget_list_add(evas, 0, 0); - ow = e_widget_check_add(evas, _("Limit resize to useful geometry"), + ow = e_widget_check_add(evas, _("Limit resize to useful geometry"), &(cfdata->geometry_auto_resize_limit)); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_check_add(evas, _("Ensure initial placement of windows inside useful geometry"), + ow = e_widget_check_add(evas, _("Ensure initial placement of windows inside useful geometry"), &(cfdata->geometry_auto_move)); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_check_add(evas, _("Adjust windows on shelf hide"), + ow = e_widget_check_add(evas, _("Adjust windows on shelf hide"), &(cfdata->border_fix_on_shelf_toggle)); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - e_widget_toolbook_page_append(otb, NULL, _("Automatic"), ol, + e_widget_toolbook_page_append(otb, NULL, _("Automatic"), ol, 1, 1, 1, 0, 0.0, 0.0); /* Transient */ @@ -275,25 +275,25 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data ow = e_widget_check_add(evas, _("Follow Move"), &(cfdata->transient.move)); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_check_add(evas, _("Follow Resize"), + ow = e_widget_check_add(evas, _("Follow Resize"), &(cfdata->transient.resize)); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_check_add(evas, _("Follow Raise"), + ow = e_widget_check_add(evas, _("Follow Raise"), &(cfdata->transient.raise)); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_check_add(evas, _("Follow Lower"), + ow = e_widget_check_add(evas, _("Follow Lower"), &(cfdata->transient.lower)); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_check_add(evas, _("Follow Layer"), + ow = e_widget_check_add(evas, _("Follow Layer"), &(cfdata->transient.layer)); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_check_add(evas, _("Follow Desktop"), + ow = e_widget_check_add(evas, _("Follow Desktop"), &(cfdata->transient.desktop)); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - ow = e_widget_check_add(evas, _("Follow Iconify"), + ow = e_widget_check_add(evas, _("Follow Iconify"), &(cfdata->transient.iconify)); e_widget_list_object_append(ol, ow, 1, 0, 0.5); - + e_widget_toolbook_page_append(otb, NULL, _("Transients"), ol, 1, 1, 1, 0, 0.0, 0.0); diff --git a/src/modules/conf_window_manipulation/e_int_config_window_process.c b/src/modules/conf_window_manipulation/e_int_config_window_process.c index 885f7e028..1d494417b 100644 --- a/src/modules/conf_window_manipulation/e_int_config_window_process.c +++ b/src/modules/conf_window_manipulation/e_int_config_window_process.c @@ -98,15 +98,15 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data e_widget_list_object_append(o, ob, 1, 0, 0.5); ob = e_widget_label_add(evas, _("Kill timeout:")); e_widget_list_object_append(o, ob, 1, 0, 0.5); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f s"), 1.0, 30.0, 1.0, 0, + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f s"), 1.0, 30.0, 1.0, 0, &(cfdata->kill_timer_wait), NULL, 100); e_widget_list_object_append(o, ob, 1, 0, 0.5); - + ob = e_widget_check_add(evas, _("Ping clients"), &(cfdata->ping_clients)); e_widget_list_object_append(o, ob, 1, 0, 0.5); ob = e_widget_label_add(evas, _("Ping interval:")); e_widget_list_object_append(o, ob, 1, 0, 0.5); - ob = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 1.0, 256.0, 1.0, 0, + ob = e_widget_slider_add(evas, 1, 0, _("%1.0f ticks"), 1.0, 256.0, 1.0, 0, NULL, &(cfdata->ping_clients_interval), 100); e_widget_list_object_append(o, ob, 1, 0, 0.5); diff --git a/src/modules/conf_window_remembers/e_mod_main.c b/src/modules/conf_window_remembers/e_mod_main.c index 547882ef9..c0d13a300 100644 --- a/src/modules/conf_window_remembers/e_mod_main.c +++ b/src/modules/conf_window_remembers/e_mod_main.c @@ -3,26 +3,26 @@ static E_Module *conf_module = NULL; -E_API E_Module_Api e_modapi = +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Settings - Window Remembers" }; E_API void * -e_modapi_init(E_Module *m) +e_modapi_init(E_Module *m) { - e_configure_registry_category_add("windows", 50, _("Windows"), NULL, + e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows"); - e_configure_registry_item_add("windows/window_remembers", 40, - _("Window Remembers"), NULL, - "preferences-desktop-window-remember", + e_configure_registry_item_add("windows/window_remembers", 40, + _("Window Remembers"), NULL, + "preferences-desktop-window-remember", e_int_config_remembers); conf_module = m; return m; } -E_API int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_Config_Dialog *cfd; diff --git a/src/modules/connman/e_connman.c b/src/modules/connman/e_connman.c index bb43739ff..bceb2d7a5 100644 --- a/src/modules/connman/e_connman.c +++ b/src/modules/connman/e_connman.c @@ -464,7 +464,7 @@ bool econnman_service_remove(struct Connman_Service *cs, cs->pending.disconnect, cs->pending.remov); return false; } - + cd = calloc(1, sizeof(*cd)); EINA_SAFETY_ON_NULL_GOTO(cd, fail); @@ -813,7 +813,7 @@ static void _manager_powered_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *p; struct Connman_Manager *cm = data; const char *error_name, *error_msg; - + cm->pending.set_powered = NULL; if (eldbus_message_error_get(msg, &error_name, &error_msg)) @@ -871,7 +871,7 @@ static struct Connman_Manager *_manager_new(void) _manager_services_changed, cm); eldbus_proxy_signal_handler_add(cm->technology_iface, "PropertyChanged", _manager_wifi_prop_changed, cm); - + /* * PropertyChanged signal in service's path is guaranteed to arrive only * after ServicesChanged above. So we only add the handler later, in a per diff --git a/src/modules/cpufreq/e_mod_config.c b/src/modules/cpufreq/e_mod_config.c index d9c3d09e9..6af5a7d4e 100644 --- a/src/modules/cpufreq/e_mod_config.c +++ b/src/modules/cpufreq/e_mod_config.c @@ -80,14 +80,14 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia { Evas_Object *o, *ob, *of; E_Radio_Group *rg; - + o = e_widget_list_add(evas, 0, 0); ob = e_widget_check_add(evas, _("Restore CPU Power Policy"), &cfdata->restore_governor); e_widget_list_object_append(o, ob, 1, 0, 0.5); - + ob = e_widget_check_add(evas, _("Automatic powersaving"), &cfdata->auto_powersave); e_widget_list_object_append(o, ob, 1, 0, 0.5); - + of = e_widget_framelist_add(evas, _("Update poll interval"), 0); rg = e_widget_radio_group_new(&cfdata->poll_interval); ob = e_widget_radio_add(evas, _("Fast (4 ticks)"), 4, rg); diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c index 8d14a465b..7cd79983f 100644 --- a/src/modules/cpufreq/e_mod_main.c +++ b/src/modules/cpufreq/e_mod_main.c @@ -448,12 +448,12 @@ _button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNU int cx, cy; m = e_menu_new(); - + mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("Settings")); e_util_menu_item_theme_icon_set(mi, "configure"); e_menu_item_callback_set(mi, _cpufreq_cb_menu_configure, NULL); - + m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0); e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, @@ -797,7 +797,7 @@ _cpufreq_status_check_available(Cpu_Status *s) { char *gov; int len; - + if (s->governors) { for (l = s->governors; l; l = l->next) @@ -1292,7 +1292,7 @@ _cpufreq_menu_pstate_max(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA cpufreq_config->pstate_max = max + 1; if (cpufreq_config->pstate_min > cpufreq_config->pstate_max) cpufreq_config->pstate_min = cpufreq_config->pstate_max; - _cpufreq_set_pstate(cpufreq_config->pstate_min - 1, + _cpufreq_set_pstate(cpufreq_config->pstate_min - 1, cpufreq_config->pstate_max - 1); e_config_save_queue(); } @@ -1499,7 +1499,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED) _cpufreq_response_shutdown(); e_configure_registry_item_del("advanced/cpufreq"); e_configure_registry_category_del("advanced"); - + e_gadcon_provider_unregister(&_gadcon_class); if (cpufreq_config->frequency_check_thread) diff --git a/src/modules/everything/e_mod_main.h b/src/modules/everything/e_mod_main.h index 6d3edd080..8d5ece3a6 100644 --- a/src/modules/everything/e_mod_main.h +++ b/src/modules/everything/e_mod_main.h @@ -41,7 +41,7 @@ struct _Evry_Window unsigned int mouse_button; Eina_Bool mouse_out; - + Eina_Bool grab; Evry_State *state_clearing; @@ -49,7 +49,7 @@ struct _Evry_Window struct { void (*hide) (Evry_Window *win, int finished); - } func; + } func; /* only to be used by creator of win */ void *data; @@ -188,7 +188,7 @@ struct _Config int cycle_mode; Eina_List *gadgets; - + unsigned char first_run; /* not saved data */ Eina_List *actions; @@ -204,7 +204,7 @@ struct _Gadget_Config int hide_after_action; int popup; }; - + struct _History { int version; diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c index f893afc4a..f29fa2a0a 100644 --- a/src/modules/everything/evry.c +++ b/src/modules/everything/evry.c @@ -212,7 +212,7 @@ evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params, Eina_Bool popup) if (win->grab) return NULL; } - + if (!(win = _evry_window_new(zone, edge))) return NULL; @@ -312,7 +312,7 @@ _evry_delay_hide_timer(void *data) Evry_Window *win = data; win->delay_hide_action = NULL; - return ECORE_CALLBACK_CANCEL; + return ECORE_CALLBACK_CANCEL; } static void diff --git a/src/modules/everything/evry_api.h b/src/modules/everything/evry_api.h index f31db8220..f6b15af6e 100644 --- a/src/modules/everything/evry_api.h +++ b/src/modules/everything/evry_api.h @@ -87,7 +87,7 @@ struct _Evry_API void (*plugin_unregister)(Evry_Plugin *p); void (*plugin_update)(Evry_Plugin *plugin, int state); Evry_Plugin *(*plugin_find)(const char *name); - + Evry_Action *(*action_new)(const char *name, const char *label, Evry_Type type1, Evry_Type type2, const char *icon, --
