enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

remove all unnecessary efl version checks 

the version of efl required by configure is already higher than these checks
This commit is contained in:
Mike Blumenkrantz 2017-02-24 14:15:42 -05:00
parent e39b6601b0
commit cfc538ca55
10 changed files with 20 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/e_config.c
View File

@ -2307,11 +2307,8 @@ _e_config_save_cb(void *data EINA_UNUSED)
elm_config_save();
e_config_domain_save("e", _e_config_edd, e_config);
e_config_domain_save("e_bindings", _e_config_binding_edd, e_bindings);
if (E_EFL_VERSION_MINIMUM(1, 17, 99))
{
e_gadget_save();
e_bryce_save();
}
e_gadget_save();
e_bryce_save();
_e_config_save_defer = NULL;
}

19
src/bin/e_int_menus.c
View File

@ -344,18 +344,15 @@ e_int_menus_desktops_new(void)
e_menu_pre_activate_callback_set(subm, _e_int_menus_shelves_pre_cb, NULL);
e_menu_item_submenu_set(mi, subm);
if (E_EFL_VERSION_MINIMUM(1, 17, 99))
{
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Add Bryce"));
e_util_menu_item_theme_icon_set(mi, "list-add");
e_menu_item_callback_set(mi, _e_int_menus_bryce_cb, NULL);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Add Bryce"));
e_util_menu_item_theme_icon_set(mi, "list-add");
e_menu_item_callback_set(mi, _e_int_menus_bryce_cb, NULL);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Add Gadgets To Desktop"));
e_util_menu_item_theme_icon_set(mi, "list-add");
e_menu_item_callback_set(mi, _e_int_menus_desktop_gadget_add_cb, NULL);
}
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Add Gadgets To Desktop"));
e_util_menu_item_theme_icon_set(mi, "list-add");
e_menu_item_callback_set(mi, _e_int_menus_desktop_gadget_add_cb, NULL);
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);

16
src/bin/e_main.c
View File

@ -909,16 +909,12 @@ main(int argc, char **argv)
TS("E_Remember Init Done");
_e_main_shutdown_push(e_remember_shutdown);
if (E_EFL_VERSION_MINIMUM(1, 17, 99))
{
if (e_config->show_splash)
e_init_status_set(_("Setup Gadgets"));
TS("E_Gadget Init");
e_gadget_init();
TS("E_Gadget Init Done");
_e_main_shutdown_push((void*)e_gadget_shutdown);
}
if (e_config->show_splash)
e_init_status_set(_("Setup Gadgets"));
TS("E_Gadget Init");
e_gadget_init();
TS("E_Gadget Init Done");
_e_main_shutdown_push((void*)e_gadget_shutdown);
if (e_config->show_splash)
e_init_status_set(_("Setup Gadcon"));

7
src/modules/conf_display/e_int_config_desklock.c
View File

@ -279,11 +279,8 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_widget_disabled_set(cfdata->lock_cmd_entry,
(cfdata->desklock_auth_method != E_DESKLOCK_AUTH_METHOD_EXTERNAL));
if (E_EFL_VERSION_MINIMUM(1, 17, 99))
{
e_widget_list_object_append(ol, of, 1, 1, 0.5);
ow = e_widget_button_add(evas, _("Configure Lockscreen Gadgets"), "configure", _cb_lockscreen_gadgets, NULL, NULL);
}
e_widget_list_object_append(ol, of, 1, 1, 0.5);
ow = e_widget_button_add(evas, _("Configure Lockscreen Gadgets"), "configure", _cb_lockscreen_gadgets, NULL, NULL);
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Locking"), ol,

2
src/modules/conf_theme/e_int_config_xsettings.c
View File

@ -159,7 +159,6 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
e_config->xsettings.match_e17_icon_theme = cfdata->match_e17_icon_theme;
e_config_save_queue();
#ifdef EFL_VERSION_1_18
if (cfdata->match_e17_icon_theme &&
strcmp(e_config->icon_theme, elm_config_icon_theme_get()))
{
@ -167,7 +166,6 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
elm_config_all_flush();
elm_config_save();
}
#endif
e_util_env_set("E_ICON_THEME", e_config->icon_theme);
ev = E_NEW(E_Event_Config_Icon_Theme, 1);

6
src/modules/start/e_mod_main.c
View File

@ -324,8 +324,7 @@ e_modapi_init(E_Module *m)
start_module = m;
e_gadcon_provider_register(&_gadcon_class);
if (E_EFL_VERSION_MINIMUM(1, 17, 99))
e_gadget_type_add("Start", start_create, NULL);
e_gadget_type_add("Start", start_create, NULL);
return m;
}
@ -334,8 +333,7 @@ e_modapi_shutdown(E_Module *m EINA_UNUSED)
{
start_module = NULL;
e_gadcon_provider_unregister(&_gadcon_class);
if (E_EFL_VERSION_MINIMUM(1, 17, 99))
e_gadget_type_del("Start");
e_gadget_type_del("Start");
return 1;
}

1
src/modules/time/mod.c
View File

@ -121,7 +121,6 @@ E_API E_Module_Api e_modapi =
E_API void *
e_modapi_init(E_Module *m)
{
if (!E_EFL_VERSION_MINIMUM(1, 17, 99)) return NULL;
clock_init();
time_config->module = m;

1
src/modules/wireless/mod.c
View File

@ -17,7 +17,6 @@ E_API E_Module_Api e_modapi =
E_API void *
e_modapi_init(E_Module *m)
{
if (!E_EFL_VERSION_MINIMUM(1, 17, 99)) return NULL;
dbus_conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
connman_init();
wireless_gadget_init();

4
src/modules/wl_drm/e_mod_main.c
View File

@ -451,7 +451,6 @@ _drm2_randr_create(void)
s->info.can_rot_180 = EINA_FALSE;
s->info.can_rot_270 = EINA_FALSE;
# if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 19)
int rotations;
rotations =
@ -465,7 +464,6 @@ _drm2_randr_create(void)
s->info.can_rot_180 = EINA_TRUE;
if (rotations & ECORE_DRM2_ROTATION_270)
s->info.can_rot_270 = EINA_TRUE;
# endif
if (cs)
{
@ -623,7 +621,6 @@ _drm2_randr_apply(void)
/* TODO: cannot support rotations until we support planes
* and we cannot support planes until Atomic support is in */
# if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 19)
int orient = 0;
if (s->config.rotation == 0)
@ -636,7 +633,6 @@ _drm2_randr_apply(void)
orient = ECORE_DRM2_ROTATION_270;
ecore_drm2_output_rotation_set(output, orient);
# endif
if (s->config.priority == top_priority)
_drm2_output_primary_set(outputs, output);

4
src/modules/xwayland/e_mod_main.c
View File

@ -371,11 +371,7 @@ xwl_init(E_Module *m)
return NULL;
#ifdef HAVE_PULSE
#ifdef EFL_VERSION_1_19
efl_del(efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL));
#else
eo_del(eo_add(ECORE_AUDIO_OUT_PULSE_CLASS, NULL));
#endif
#endif
/* record wayland display */