diff --git a/configure.in b/configure.in index 87b80ef04..e64470057 100644 --- a/configure.in +++ b/configure.in @@ -154,16 +154,6 @@ fi AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) AC_SUBST(dlopen_libs) -AC_MSG_CHECKING([whether to enable Favorite Applications menu]) -AC_ARG_ENABLE([favorites], - AS_HELP_STRING([--enable-favorites],[enable Favorite Applications menu @<:@yes@:>@]), - [e_cv_enable_favorites=$enableval], - AC_CACHE_VAL([e_cv_enable_favorites], [e_cv_enable_favorites=yes])) -if test "[${e_cv_enable_favorites}]" = yes; then - AC_DEFINE_UNQUOTED([ENABLE_FAVORITES],[1],[enable Favorite Applications menu]) -fi -AC_MSG_RESULT([$e_cv_enable_favorites]) - AC_MSG_CHECKING([whether to enable Files menu item]) AC_ARG_ENABLE([files], AS_HELP_STRING([--enable-files],[enable Files menu item @<:@yes@:>@]), diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index 272ffcf26..aebecf232 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -1283,9 +1283,7 @@ static E_Menu * _e_actions_menu_find(const char *name) { if (!strcmp(name, "main")) return e_int_menus_main_new(); -#ifdef ENABLE_FAVORITES else if (!strcmp(name, "favorites")) return e_int_menus_favorite_apps_new(); -#endif else if (!strcmp(name, "all")) return e_int_menus_all_apps_new(); else if (!strcmp(name, "clients")) return e_int_menus_clients_new(); else if (!strcmp(name, "lost_clients")) return e_int_menus_lost_clients_new(); @@ -2169,10 +2167,8 @@ e_actions_init(void) ACT_GO(menu_show); e_action_predef_name_set(_("Menu"), _("Show Main Menu"), "menu_show", "main", NULL, 0); -#ifdef ENABLE_FAVORITES e_action_predef_name_set(_("Menu"), _("Show Favorites Menu"), "menu_show", "favorites", NULL, 0); -#endif e_action_predef_name_set(_("Menu"), _("Show All Applications Menu"), "menu_show", "all", NULL, 0); e_action_predef_name_set(_("Menu"), _("Show Clients Menu"), "menu_show", diff --git a/src/bin/e_config.c b/src/bin/e_config.c index b56e6d76b..4cd6a7843 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -795,9 +795,7 @@ e_config_init(void) E_BINDING_MODIFIER_ALT, 0, "window_menu", NULL); CFG_MOUSEBIND(E_BINDING_CONTEXT_ZONE, 1, 0, 0, "menu_show", "main"); CFG_MOUSEBIND(E_BINDING_CONTEXT_ZONE, 2, 0, 0, "menu_show", "clients"); -#ifdef ENABLE_FAVORITES CFG_MOUSEBIND(E_BINDING_CONTEXT_ZONE, 3, 0, 0, "menu_show", "favorites"); -#endif } { E_Config_Binding_Key *eb; @@ -906,22 +904,18 @@ e_config_init(void) CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "m", E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0, "menu_show", "main"); -#ifdef ENABLE_FAVORITES CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "a", E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0, "menu_show", "favorites"); -#endif CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Menu", 0, 0, "menu_show", "main"); CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Menu", E_BINDING_MODIFIER_CTRL, 0, "menu_show", "clients"); -#ifdef ENABLE_FAVORITES CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Menu", E_BINDING_MODIFIER_ALT, 0, "menu_show", "favorites"); -#endif CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Insert", E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0, "exec", "Eterm"); diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c index 46e40ca78..7241fd06d 100644 --- a/src/bin/e_configure.c +++ b/src/bin/e_configure.c @@ -426,11 +426,7 @@ _e_configure_fill_cat_list(void *data) _e_configure_item_add(cat, _("Window Manipulation"), "enlightenment/window_manipulation", e_int_config_window_manipulation); cat = _e_configure_category_add(eco, _("Menus"), "enlightenment/menus"); -#ifdef ENABLE_FAVORITES _e_configure_item_add(cat, _("Application Menus"), "enlightenment/applications", e_int_config_apps); -#else - _e_configure_item_add(cat, _("Applications Menu"), "enlightenment/applications", e_int_config_apps); -#endif _e_configure_item_add(cat, _("Menu Settings"), "enlightenment/menu_settings", e_int_config_menus); _e_configure_item_add(cat, _("Client List Menu"), "enlightenment/windows", e_int_config_clientlist); diff --git a/src/bin/e_int_config_apps.c b/src/bin/e_int_config_apps.c index 8c9d6a3be..bd3c905c2 100644 --- a/src/bin/e_int_config_apps.c +++ b/src/bin/e_int_config_apps.c @@ -157,11 +157,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) snprintf(cfdata->path_everything, sizeof(cfdata->path_everything), "%s/.e/e/applications/all", cfdata->homedir); snprintf(cfdata->path, sizeof(cfdata->path), "%s/.e/e/applications", cfdata->homedir); snprintf(cfdata->path_all, sizeof(cfdata->path_all), "%s/.e/e/applications/menu/all", cfdata->homedir); -#ifdef ENABLE_FAVORITES snprintf(cfdata->path_menu, sizeof(cfdata->path_all), "%s/.e/e/applications/menu", cfdata->homedir); -#else - snprintf(cfdata->path_menu, sizeof(cfdata->path_all), "%s/.e/e/applications/menu/all", cfdata->homedir); -#endif return; } @@ -683,11 +679,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf if ((once) && (once->title)) of = e_widget_framelist_add(evas, (char *)once->title, 0); else -#ifdef ENABLE_FAVORITES of = e_widget_framelist_add(evas, _("Menus"), 0); -#else - of = e_widget_framelist_add(evas, _("Menu"), 0); -#endif mt = e_widget_button_add(evas, _("Go up a Directory"), "widget/up_dir", _cb_button_up, cfdata, NULL); diff --git a/src/bin/e_int_config_keybindings.c b/src/bin/e_int_config_keybindings.c index 3d979bf5c..77eff1940 100644 --- a/src/bin/e_int_config_keybindings.c +++ b/src/bin/e_int_config_keybindings.c @@ -555,22 +555,18 @@ _restore_key_binding_defaults_cb(void *data, void *data2) CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "m", E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0, "menu_show", "main"); -#ifdef ENABLE_FAVORITES CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "a", E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0, "menu_show", "favorites"); -#endif CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "Menu", 0, 0, "menu_show", "main"); CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "Menu", E_BINDING_MODIFIER_CTRL, 0, "menu_show", "clients"); -#ifdef ENABLE_FAVORITES CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "Menu", E_BINDING_MODIFIER_ALT, 0, "menu_show", "favorites"); -#endif CFG_KEYBIND_DFLT(E_BINDING_CONTEXT_ANY, "Insert", E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0, "exec", "Eterm"); diff --git a/src/bin/e_int_config_mousebindings.c b/src/bin/e_int_config_mousebindings.c index 0650836fc..80f418a3f 100644 --- a/src/bin/e_int_config_mousebindings.c +++ b/src/bin/e_int_config_mousebindings.c @@ -621,9 +621,7 @@ _restore_mouse_binding_defaults_cb(void *data, void *data2) CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 3, E_BINDING_MODIFIER_ALT, 0, "window_menu", NULL); CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 1, 0, 0, "menu_show", "main"); CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 2, 0, 0, "menu_show", "clients"); -#ifdef ENABLE_FAVORITES CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 3, 0, 0, "menu_show", "favorites"); -#endif #define CFG_WHEELBIND_DFLT(_context, _direction, _z, _modifiers, _anymod, _action, _params) \ bw = E_NEW(E_Config_Binding_Wheel, 1); \ diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c index f3529a560..51572ea3c 100644 --- a/src/bin/e_int_menus.c +++ b/src/bin/e_int_menus.c @@ -8,9 +8,7 @@ typedef struct _Main_Data Main_Data; struct _Main_Data { E_Menu *menu; -#ifdef ENABLE_FAVORITES E_Menu *apps; -#endif E_Menu *all_apps; E_Menu *desktops; E_Menu *clients; @@ -95,7 +93,6 @@ e_int_menus_main_new(void) e_menu_category_set(m, "main"); -#ifdef ENABLE_FAVORITES subm = e_int_menus_favorite_apps_new(); dat->apps = subm; mi = e_menu_item_new(m); @@ -103,7 +100,6 @@ e_int_menus_main_new(void) e_menu_item_label_set(mi, _("Favorite Applications")); e_util_menu_item_edje_icon_set(mi, "enlightenment/favorites"); e_menu_item_submenu_set(mi, subm); -#endif subm = e_int_menus_all_apps_new(); dat->all_apps = subm; @@ -257,7 +253,6 @@ e_int_menus_desktops_new(void) return m; } -#ifdef ENABLE_FAVORITES EAPI E_Menu * e_int_menus_favorite_apps_new(void) { @@ -270,7 +265,6 @@ e_int_menus_favorite_apps_new(void) m = e_int_menus_apps_new(buf); return m; } -#endif EAPI E_Menu * e_int_menus_all_apps_new(void) @@ -386,9 +380,7 @@ _e_int_menus_main_del_hook(void *obj) dat = e_object_data_get(E_OBJECT(obj)); if (dat) { -#ifdef ENABLE_FAVORITES e_object_del(E_OBJECT(dat->apps)); -#endif e_object_del(E_OBJECT(dat->all_apps)); e_object_del(E_OBJECT(dat->desktops)); e_object_del(E_OBJECT(dat->clients)); @@ -782,11 +774,7 @@ _e_int_menus_config_pre_cb(void *data, E_Menu *m) e_menu_item_callback_set(mi, _e_int_menus_shelf_item_cb, NULL); mi = e_menu_item_new(m); -#ifdef ENABLE_FAVORITES e_menu_item_label_set(mi, _("Application Menus")); -#else - e_menu_item_label_set(mi, _("Applications Menu")); -#endif e_util_menu_item_edje_icon_set(mi, "enlightenment/applications"); e_menu_item_callback_set(mi, _e_int_menus_applications_item_cb, NULL); diff --git a/src/bin/e_int_menus.h b/src/bin/e_int_menus.h index f53bdbf17..440c3c6d3 100644 --- a/src/bin/e_int_menus.h +++ b/src/bin/e_int_menus.h @@ -21,9 +21,7 @@ EAPI E_Menu *e_int_menus_main_new(void); EAPI E_Menu *e_int_menus_desktops_new(void); EAPI E_Menu *e_int_menus_clients_new(void); EAPI E_Menu *e_int_menus_apps_new(const char *dir); -#ifdef ENABLE_FAVORITES EAPI E_Menu *e_int_menus_favorite_apps_new(void); -#endif EAPI E_Menu *e_int_menus_all_apps_new(void); EAPI E_Menu *e_int_menus_config_new(void); EAPI E_Menu *e_int_menus_lost_clients_new(void);