tree-wide: get rid of trailing whitespace (part 6)

Remove trailing whitespaces

Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org>
Differential Revision: https://phab.enlightenment.org/D11825
enlightenment-0.24
Elyes HAOUAS 3 years ago committed by Stefan Schmidt
parent 44b029378a
commit f47d1a789e
  1. 60
      src/modules/backlight/e_mod_main.c
  2. 4
      src/modules/backlight/gadget/backlight.c
  3. 4
      src/modules/battery/e_mod_main.h
  4. 4
      src/modules/battery/e_mod_sysctl.c
  5. 6
      src/modules/battery/e_mod_udev.c
  6. 8
      src/modules/battery/e_mod_upower.c
  7. 4
      src/modules/bluez5/bz_obj.c
  8. 2
      src/modules/bluez5/e_mod_main.c
  9. 6
      src/modules/clock/e_mod_config.c
  10. 4
      src/modules/clock/e_mod_main.c
  11. 2
      src/modules/conf/e_mod_main.h
  12. 2
      src/modules/conf_applications/e_int_config_apps.c
  13. 2
      src/modules/conf_applications/e_int_config_apps_personal.c
  14. 4
      src/modules/conf_applications/e_int_config_deskenv.c
  15. 8
      src/modules/conf_bindings/e_int_config_mousebindings.c
  16. 4
      src/modules/conf_bindings/e_int_config_signalbindings.c
  17. 30
      src/modules/conf_dialogs/e_int_config_dialogs.c

@ -56,7 +56,7 @@ static void
_backlight_gadget_update(Instance *inst)
{
Edje_Message_Float msg;
msg.val = inst->val;
if (msg.val < 0.0) msg.val = 0.0;
else if (msg.val > 1.0) msg.val = 1.0;
@ -82,7 +82,7 @@ _backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev)
{
Instance *inst = data;
const char *keysym;
keysym = ev->key;
if (!strcmp(keysym, "Escape"))
_backlight_popup_free(inst);
@ -133,9 +133,9 @@ _backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev)
EINA_LIST_FOREACH(e_bindings->key_bindings, l, binding)
{
if (binding->action && strcmp(binding->action, "backlight")) continue;
mod = 0;
if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
mod |= E_BINDING_MODIFIER_SHIFT;
if (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)
@ -144,7 +144,7 @@ _backlight_win_key_down_cb(void *data, Ecore_Event_Key *ev)
mod |= E_BINDING_MODIFIER_ALT;
if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
mod |= E_BINDING_MODIFIER_WIN;
if (binding->key && (!strcmp(binding->key, ev->key)) &&
((binding->modifiers == mod) || (binding->any_mod)))
{
@ -188,29 +188,29 @@ _backlight_popup_new(Instance *inst)
{
Evas *evas;
Evas_Object *o;
if (inst->popup) return;
e_backlight_mode_set(inst->gcc->gadcon->zone, E_BACKLIGHT_MODE_NORMAL);
inst->val = e_backlight_level_get(inst->gcc->gadcon->zone);
_backlight_gadget_update(inst);
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
evas = e_comp->evas;
inst->o_table = e_widget_table_add(e_win_evas_win_get(evas), 0);
o = e_widget_slider_add(evas, 0, 0, NULL, 0.05, 1.0, 0.05, 0, &(inst->val), NULL, 100);
evas_object_smart_callback_add(o, "changed", _slider_cb, inst);
inst->o_slider = o;
e_widget_table_object_align_append(inst->o_table, o,
e_widget_table_object_align_append(inst->o_table, o,
0, 0, 1, 1, 0, 0, 0, 0, 0.5, 0.5);
o = e_widget_button_add(evas, NULL, "preferences-system",
_backlight_settings_cb, inst, NULL);
e_widget_table_object_align_append(inst->o_table, o,
e_widget_table_object_align_append(inst->o_table, o,
0, 1, 1, 1, 0, 0, 0, 0, 0.5, 1.0);
e_gadcon_popup_content_set(inst->popup, inst->o_table);
e_gadcon_popup_show(inst->popup);
e_comp_object_util_autoclose(inst->popup->comp_object, _backlight_popup_comp_del_cb,
@ -239,7 +239,7 @@ _backlight_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EI
{
Instance *inst = data;
Evas_Event_Mouse_Down *ev = event;
if (ev->button == 1)
{
if (inst->popup) _backlight_popup_free(inst);
@ -251,18 +251,18 @@ _backlight_cb_mouse_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EI
E_Menu *m;
E_Menu_Item *mi;
int x, y;
zone = e_zone_current_get();
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, _backlight_menu_cb_cfg, inst);
m = e_gadcon_client_util_menu_items_append(inst->gcc, m, 0);
e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &x, &y, NULL, NULL);
e_menu_activate_mouse(m, zone, x + ev->output.x, y + ev->output.y,
1, 1, E_MENU_POP_DIRECTION_AUTO, ev->timestamp);
@ -290,32 +290,32 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
Evas_Object *o;
E_Gadcon_Client *gcc;
Instance *inst;
inst = E_NEW(Instance, 1);
o = edje_object_add(gc->evas);
e_theme_edje_object_set(o, "base/theme/modules/backlight",
"e/modules/backlight/main");
evas_object_show(o);
gcc = e_gadcon_client_new(gc, name, id, style, o);
gcc->data = inst;
inst->gcc = gcc;
inst->o_backlight = o;
inst->val = e_backlight_level_get(inst->gcc->gadcon->zone);
_backlight_gadget_update(inst);
evas_object_event_callback_add(inst->o_backlight,
evas_object_event_callback_add(inst->o_backlight,
EVAS_CALLBACK_MOUSE_DOWN,
_backlight_cb_mouse_down,
inst);
evas_object_event_callback_add(inst->o_backlight,
evas_object_event_callback_add(inst->o_backlight,
EVAS_CALLBACK_MOUSE_WHEEL,
_backlight_cb_mouse_wheel,
inst);
backlight_instances = eina_list_append(backlight_instances, inst);
return gcc;
}
@ -324,7 +324,7 @@ static void
_gc_shutdown(E_Gadcon_Client *gcc)
{
Instance *inst;
inst = gcc->data;
_backlight_popup_free(inst);
backlight_instances = eina_list_remove(backlight_instances, inst);
@ -337,7 +337,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient EINA_UNUSED)
{
Instance *inst;
Evas_Coord mw, mh;
inst = gcc->data;
mw = 0, mh = 0;
edje_object_size_min_get(inst->o_backlight, &mw, &mh);
@ -360,7 +360,7 @@ _gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas)
{
Evas_Object *o;
char buf[4096];
o = edje_object_add(evas);
snprintf(buf, sizeof(buf), "%s/e-module-backlight.edj",
e_module_dir_get(backlight_module));
@ -373,7 +373,7 @@ _gc_id_new(const E_Gadcon_Client_Class *client_class)
{
static char buf[4096];
snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
eina_list_count(backlight_instances) + 1);
return buf;
}
@ -416,7 +416,7 @@ _e_mod_action_cb(E_Object *obj EINA_UNUSED,
{
Eina_List *l;
Instance *inst;
EINA_LIST_FOREACH(backlight_instances, l, inst)
{
if (!params)

@ -36,10 +36,10 @@ _backlight_level_set(Instance *inst, double val, Eina_Bool set_slider)
if (val > 1.0) val = 1.0;
if (val < 0.0) val = 0.0;
inst->val = val;
if (set_slider)
elm_slider_value_set(inst->o_slider, inst->val * 100);
e_backlight_mode_set(e_comp_object_util_zone_get(inst->o_main), E_BACKLIGHT_MODE_NORMAL);
e_backlight_level_set(e_comp_object_util_zone_get(inst->o_main), inst->val, 0.0);
e_config->backlight.normal = inst->val;

@ -97,7 +97,7 @@ struct _Battery
Eldbus_Proxy *proxy;
int * mib;
#if defined(__FreeBSD__) || defined(__DragonFly__)
int * mib_state;
int * mib_state;
int * mib_units;
int * mib_time;
int batteries;
@ -141,7 +141,7 @@ E_API int e_modapi_shutdown (E_Module *m);
E_API int e_modapi_save (E_Module *m);
E_Config_Dialog *e_int_config_battery_module(Evas_Object *parent, const char *params EINA_UNUSED);
void _battery_config_updated(void);
extern Config *battery_config;

@ -83,7 +83,7 @@ _battery_sysctl_start(void)
bat->mib = malloc(sizeof(int) * 4);
if (!bat->mib) return 0;
sysctlnametomib("hw.acpi.battery.life", bat->mib, &len);
sysctlnametomib("hw.acpi.battery.life", bat->mib, &len);
bat->mib_state = malloc(sizeof(int) * 4);
if (!bat->mib_state) return 0;
@ -203,7 +203,7 @@ _battery_sysctl_battery_update()
charge = (double)s.value;
}
/* This is a workaround because there's an ACPI bug */
/* This is a workaround because there's an ACPI bug */
if ((EINA_FLT_EQ(charge, 0.0)) || (EINA_FLT_EQ(bat->last_full_charge, 0.0)))
{
/* last full capacity */

@ -111,8 +111,8 @@ _battery_udev_battery_add(const char *syspath)
}
bat->last_update = ecore_time_get();
bat->udi = eina_stringshare_add(syspath);
bat->poll = ecore_poller_add(ECORE_POLLER_CORE,
battery_config->poll_interval,
bat->poll = ecore_poller_add(ECORE_POLLER_CORE,
battery_config->poll_interval,
_battery_udev_battery_update_poll, bat);
device_batteries = eina_list_append(device_batteries, bat);
_battery_udev_battery_update(syspath, bat);
@ -178,7 +178,7 @@ _battery_udev_ac_del(const char *syspath)
free(ac);
}
static Eina_Bool
static Eina_Bool
_battery_udev_battery_update_poll(void *data)
{
_battery_udev_battery_update(NULL, data);

@ -237,14 +237,14 @@ _device_type_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending E
goto error;
eldbus_message_iter_arguments_get(variant, "u", &type);
if (type == 1)
if (type == 1)
{
obj = eldbus_object_get(conn, BUS, path);
EINA_SAFETY_ON_FALSE_RETURN(obj);
upower_proxy_ac = eldbus_proxy_get(obj, IFACE_PROPERTIES);
_process_ac(proxy);
}
else if (type == 2)
else if (type == 2)
{
obj = eldbus_object_get(conn, BUS, path);
EINA_SAFETY_ON_FALSE_RETURN(obj);
@ -366,14 +366,14 @@ _battery_upower_stop(void)
obj = eldbus_proxy_object_get(upower_proxy);
eldbus_proxy_unref(upower_proxy);
eldbus_object_unref(obj);
if (upower_proxy_ac)
if (upower_proxy_ac)
{
obj_ac = eldbus_proxy_object_get(upower_proxy_ac);
eldbus_proxy_unref(upower_proxy_ac);
eldbus_object_unref(obj_ac);
upower_proxy_ac = NULL;
}
if (upower_proxy_bat)
if (upower_proxy_bat)
{
obj_bat = eldbus_proxy_object_get(upower_proxy_bat);
eldbus_proxy_unref(upower_proxy_bat);

@ -195,10 +195,10 @@ cb_obj_prop_entry(void *data, const void *key, Eldbus_Message_Iter *var)
// dict ServiceData [readonly, optional]
// Service advertisement data. Keys are the UUIDs in
// string format followed by its byte array value.
//
//
// array{byte} AdvertisingFlags [readonly, experimental]
// The Advertising Data Flags of the remote device.
//
//
// dict AdvertisingData [readonly, experimental]
// The Advertising Data of the remote device. Keys are
// are 8 bits AD Type followed by data as byte array.

@ -112,7 +112,7 @@ _gad_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient)
inst->o_bluez5 = o = elm_layout_add(parent);
_mod_icon_set(o, EINA_TRUE);
evas_object_size_hint_aspect_set(o, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
// XXX: fill in later when we have gotten this far
// XXX: fill in later when we have gotten this far
// e_gadget_configure_cb_set(o, _gad_config);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _gad_mouse_up, inst);
if (*id != -1)

@ -94,11 +94,11 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED,
e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 1, 0, 0);
ob = e_widget_radio_add(evas, _("24 h"), 1, rg);
e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 0, 0);
e_widget_table_object_append(tab, of, 0, 0, 1, 1, 1, 1, 1, 1);
of = e_widget_frametable_add(evas, _("Date"), 0);
rg = e_widget_radio_group_new(&(cfdata->cfg.show_date));
ob = e_widget_radio_add(evas, _("None"), 0, rg);
e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 0, 0);
@ -112,7 +112,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED,
e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 1, 0, 0);
e_widget_table_object_append(tab, of, 0, 1, 1, 1, 1, 1, 1, 1);
of = e_widget_frametable_add(evas, _("Week"), 0);
ob = e_widget_label_add(evas, _("Start"));

@ -490,7 +490,7 @@ e_int_clock_instances_redo(Eina_Bool all)
edje_object_part_text_set(o, "e.text.today", todaystr);
edje_object_message_signal_process(o);
_eval_instance_size(inst);
if (inst->o_popclock)
{
o = inst->o_popclock;
@ -619,7 +619,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
inst->cfg = _conf_item_get(id);
_todaystr_eval(inst, todaystr, sizeof(todaystr) - 1);
o = edje_object_add(gc->evas);
edje_object_signal_callback_add(o, "e,state,sizing,changed", "*",
_clock_sizing_changed_cb, inst);

@ -8,7 +8,7 @@
#define MOD_CONFIG_FILE_VERSION ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION)
typedef struct _Config Config;
struct _Config
struct _Config
{
E_Module *module;
E_Config_Dialog *cfd;

@ -488,7 +488,7 @@ _list_items_icon_set_cb(E_Config_App_List *apps)
EINA_LIST_FREE(apps->icons, o)
{
if (count++ == 5) break;
_list_item_icon_set(o, evas_object_data_get(o, "deskicon"));
}
if (!apps->icons) apps->idler = NULL;

@ -187,7 +187,7 @@ _fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il)
static void
_btn_cb_add(void *data EINA_UNUSED, void *data2 EINA_UNUSED)
{
e_desktop_edit(NULL);
e_desktop_edit(NULL);
}
static void

@ -135,7 +135,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
int cde = 0;
o = e_widget_list_add(evas, 0, 0);
fr = e_widget_framelist_add(evas, _("Execution"), 0);
ob = e_widget_check_add(evas, _("Only launch single instances"),
&(cfdata->exe_always_single_instance));
@ -155,7 +155,7 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dialog_Data
e_widget_list_object_append(o, fr, 1, 0, 0.0);
}
#endif
fr = e_widget_framelist_add(evas, _("Major Desktops"), 0);
ob = e_widget_check_add(evas, _("Start GNOME services on login"),
&(cfdata->load_gnome));

@ -236,7 +236,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata
EINA_LIST_FOREACH_SAFE(cfdata->binding.wheel, l, l2, bw)
{
if ((!bw->modifiers) &&
if ((!bw->modifiers) &&
(bw->direction == 0) &&
((bw->context == E_BINDING_CONTEXT_WINDOW) || (bw->context == E_BINDING_CONTEXT_ANY)))
{
@ -1184,13 +1184,13 @@ _helper_wheel_name_get(E_Config_Binding_Wheel *bw)
switch (bw->direction)
{
case 0:
if (bw->z < 0)
if (bw->z < 0)
name = strdup(_("Mouse Wheel Up"));
else
name = strdup(_("Mouse Wheel Down"));
break;
default:
if (bw->z < 0)
if (bw->z < 0)
snprintf(buf, sizeof(buf), _("Extra Wheel (%d) Up"), bw->direction);
else
snprintf(buf, sizeof(buf), _("Extra Wheel (%d) Down"), bw->direction);
@ -1414,7 +1414,7 @@ _grab_mouse_wheel_cb(void *data, int type EINA_UNUSED, void *event)
if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)
mod |= E_BINDING_MODIFIER_ALT;
if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN)
mod |= E_BINDING_MODIFIER_WIN;
mod |= E_BINDING_MODIFIER_WIN;
if (cfdata->locals.add)
{

@ -633,7 +633,7 @@ _signal_add_show(E_Config_Dialog_Data *cfdata)
entry = o = e_widget_entry_add(cfdata->locals.dia->win, &cfdata->locals.dia_source, NULL, NULL, NULL);
e_widget_framelist_object_append(ol, o);
e_widget_list_object_append(obg, ol, 1, 0, 0.5);
ol = e_widget_framelist_add(evas, _("Signal:"), 0);
o = e_widget_entry_add(cfdata->locals.dia->win, &cfdata->locals.dia_signal, NULL, NULL, NULL);
e_widget_framelist_object_append(ol, o);
@ -650,7 +650,7 @@ static void
_add_signal_binding_cb(void *data, void *data2 EINA_UNUSED)
{
E_Config_Dialog_Data *cfdata = data;
_auto_apply_changes(cfdata);
_signal_add_show(cfdata);
}

@ -10,7 +10,7 @@ static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfda
static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
#endif
struct _E_Config_Dialog_Data
struct _E_Config_Dialog_Data
{
int cnfmdlg_disabled;
int cfgdlg_auto_apply;
@ -20,21 +20,21 @@ struct _E_Config_Dialog_Data
};
E_Config_Dialog *
e_int_config_dialogs(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
e_int_config_dialogs(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNUSED)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "settings/dialogs")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets;
v->basic.check_changed = _basic_check_changed;
v->override_auto_apply = 1;
cfd = e_config_dialog_new(NULL, _("Dialog Settings"),
"E", "settings/dialogs",
"preferences-system", 0, v, NULL);
@ -78,7 +78,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata
e_config->remember_internal_windows |= E_REMEMBER_INTERNAL_DIALOGS;
else
e_config->remember_internal_windows &= ~E_REMEMBER_INTERNAL_DIALOGS;
e_config_save_queue();
return 1;
}
@ -103,7 +103,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
{
Evas_Object *o, *of, *ob;
E_Radio_Group *rg;
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("General Settings"), 0);
@ -126,7 +126,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
e_widget_list_object_append(o, of, 1, 0, 0.5);
of = e_widget_framelist_add(evas, _("Remember"), 0);
ob = e_widget_check_add(evas, _("Remember size and position of dialogs"),
ob = e_widget_check_add(evas, _("Remember size and position of dialogs"),
&(cfdata->remember_windows));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 0, 0.5);
@ -136,7 +136,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
#if 0
static int
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
/* Auto Apply is disabled in E for now */
/* (e_config->cfgdlg_auto_apply = cfdata->auto_apply; */
@ -148,18 +148,18 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
}
static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ob, *of;
E_Radio_Group *rg;
o = e_widget_list_add(evas, 0, 0);
// of = e_widget_framelist_add(evas, _("General Settings"), 0);
// ob = e_widget_check_add(evas, _("Auto-Apply Settings Changes"), &(cfdata->auto_apply));
// e_widget_framelist_object_append(of, ob);
// e_widget_list_object_append(o, of, 1, 1, 0.5);
// e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Default Dialog Mode"), 0);
rg = e_widget_radio_group_new(&(cfdata->default_mode));
@ -167,8 +167,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Advanced Mode"), E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED, rg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
#endif

Loading…
Cancel
Save