From 9b2120b8a8c6bddb38c2376d35d01e7bf16ff648 Mon Sep 17 00:00:00 2001 From: Henrique Dante de Almeida Date: Tue, 22 Jan 2013 18:51:24 +0000 Subject: [PATCH] elm: Enable external main menu by default This patch replaces the ELM_EXTERNAL_MENU environment variable for ELM_DISABLE_EXTERNAL_MENU, so that the main menu bar always attemps connecting via D-Bus, if possible. Patch by: Henrique Dante de Almeida SVN revision: 83099 --- legacy/elementary/src/bin/test_main_menu.c | 10 +++++----- legacy/elementary/src/lib/elm_config.c | 16 ++++++++-------- legacy/elementary/src/lib/elm_priv.h | 2 +- legacy/elementary/src/lib/elm_win.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/legacy/elementary/src/bin/test_main_menu.c b/legacy/elementary/src/bin/test_main_menu.c index 79bad66fd3..f031fd73de 100644 --- a/legacy/elementary/src/bin/test_main_menu.c +++ b/legacy/elementary/src/bin/test_main_menu.c @@ -19,7 +19,7 @@ test_main_menu(void *data __UNUSED__, Evas_Object *win, *bg, *menu, *label, *bx; Elm_Object_Item *menu_it, *menu_it1; char *s; - Eina_Bool enabled = EINA_FALSE; + Eina_Bool enabled = EINA_TRUE; win = elm_win_add(NULL, "menu", ELM_WIN_BASIC); elm_win_title_set(win, "Menu"); @@ -46,15 +46,15 @@ test_main_menu(void *data __UNUSED__, elm_box_pack_end(bx, label); evas_object_show(label); - s = getenv("ELM_EXTERNAL_MENU"); + s = getenv("ELM_DISABLE_EXTERNAL_MENU"); if (s) - enabled = !!atoi(s); + enabled = !atoi(s); if (!enabled) { label = elm_label_add(win); - elm_object_text_set(label, "(ELM_EXTERNAL_MENU environment variable not " - "set. Using local menu instead)"); + elm_object_text_set(label, "(ELM_DISABLE_EXTERNAL_MENU environment " + "variable is set. Using local menu instead)"); evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_pack_end(bx, label); diff --git a/legacy/elementary/src/lib/elm_config.c b/legacy/elementary/src/lib/elm_config.c index 157ca9ae3e..69866d2d5e 100644 --- a/legacy/elementary/src/lib/elm_config.c +++ b/legacy/elementary/src/lib/elm_config.c @@ -425,7 +425,7 @@ _desc_init(void) ELM_CONFIG_VAL(D, T, indicator_service_90, T_STRING); ELM_CONFIG_VAL(D, T, indicator_service_180, T_STRING); ELM_CONFIG_VAL(D, T, indicator_service_270, T_STRING); - ELM_CONFIG_VAL(D, T, external_menu, T_UCHAR); + ELM_CONFIG_VAL(D, T, disable_external_menu, T_UCHAR); #undef T #undef D #undef T_INT @@ -1128,7 +1128,7 @@ _config_load(void) _elm_config->indicator_service_90 = eina_stringshare_add("elm_indicator_landscape"); _elm_config->indicator_service_180 = eina_stringshare_add("elm_indicator_portrait"); _elm_config->indicator_service_270 = eina_stringshare_add("elm_indicator_landscape"); - _elm_config->external_menu = EINA_FALSE; + _elm_config->disable_external_menu = EINA_FALSE; } static const char * @@ -1659,8 +1659,8 @@ _env_get(void) if (s) eina_stringshare_replace(&_elm_config->indicator_service_180, s); s = getenv("ELM_INDICATOR_SERVICE_270"); if (s) eina_stringshare_replace(&_elm_config->indicator_service_270, s); - s = getenv("ELM_EXTERNAL_MENU"); - if (s) _elm_config->external_menu = !!atoi(s); + s = getenv("ELM_DISABLE_EXTERNAL_MENU"); + if (s) _elm_config->disable_external_menu = !!atoi(s); } EAPI Eina_Bool @@ -2175,15 +2175,15 @@ elm_config_softcursor_mode_get(void) } EAPI Eina_Bool -elm_config_external_menu_get(void) +elm_config_disable_external_menu_get(void) { - return _elm_config->external_menu; + return _elm_config->disable_external_menu; } EAPI void -elm_config_external_menu_set(Eina_Bool enable) +elm_config_disable_external_menu_set(Eina_Bool disable) { - _elm_config->external_menu = !!enable; + _elm_config->disable_external_menu = !!disable; } EAPI void diff --git a/legacy/elementary/src/lib/elm_priv.h b/legacy/elementary/src/lib/elm_priv.h index 62899bb1bd..3d12ebbdfb 100644 --- a/legacy/elementary/src/lib/elm_priv.h +++ b/legacy/elementary/src/lib/elm_priv.h @@ -234,7 +234,7 @@ struct _Elm_Config const char *indicator_service_180; const char *indicator_service_270; unsigned char selection_clear_enable; - unsigned char external_menu; + unsigned char disable_external_menu; /* Not part of the EET file */ Eina_Bool is_mirrored : 1; diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index 0c36d38d34..d7222ccdeb 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -3606,7 +3606,7 @@ _main_menu_get(Eo *obj, void *_pd, va_list *list) _elm_menu_menu_bar_set(sd->main_menu, EINA_TRUE); #ifdef HAVE_ELEMENTARY_X - if (_elm_config->external_menu && sd->x.xwin) use_dbus = EINA_TRUE; + if (!_elm_config->disable_external_menu && sd->x.xwin) use_dbus = EINA_TRUE; #endif if (use_dbus && _elm_dbus_menu_register(sd->main_menu))