summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-12-21 16:34:50 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-12-21 16:34:50 +0000
commit21bdf63d57c76a7bb7a0a50f7899938e25b3f37a (patch)
treef263f3aec161bba9091eb9fc572359717d08482b
parent1565e76e6f9b901c0ce992661dca9bfe60d17324 (diff)
don't generate menu on startup, just cache it after the first one
SVN revision: 81561
-rw-r--r--src/bin/e_int_menus.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 29471fd92..87f16d0a0 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -518,9 +518,7 @@ e_int_menus_menu_augmentation_point_disabled_set(const char *menu, Eina_Bool dis
518EINTERN void 518EINTERN void
519e_int_menus_init(void) 519e_int_menus_init(void)
520{ 520{
521 if (e_config->menu_apps_show) 521 if (!e_config->menu_apps_show)
522 _e_int_menus_app_menu_default = efreet_menu_get();
523 else
524 { 522 {
525 char buf[PATH_MAX]; 523 char buf[PATH_MAX];
526 524
@@ -788,7 +786,11 @@ _e_int_menus_apps_thread_new(E_Menu *m, const char *dir)
788 _e_int_menus_app_menus = eina_hash_string_superfast_new((void *)efreet_menu_free); 786 _e_int_menus_app_menus = eina_hash_string_superfast_new((void *)efreet_menu_free);
789 } 787 }
790 else 788 else
791 menu = _e_int_menus_app_menu_default; 789 {
790 menu = _e_int_menus_app_menu_default;
791 if (!menu)
792 menu = _e_int_menus_app_menu_default = efreet_menu_get();
793 }
792 794
793 if (menu) return menu; 795 if (menu) return menu;
794 if (dir) 796 if (dir)