diff --git a/src/modules/conf_menus/e_int_config_menus.c b/src/modules/conf_menus/e_int_config_menus.c index deebf6620..d5d3fa865 100644 --- a/src/modules/conf_menus/e_int_config_menus.c +++ b/src/modules/conf_menus/e_int_config_menus.c @@ -120,8 +120,11 @@ get_menus(Eina_List **menus) }; int i, newdir; - for (i = 0; dirs[i]; i++) - check_menu_dir(dirs[i], menus); + e_user_homedir_concat(buf, sizeof(buf), ".config"); + check_menu_dir(buf, menus); + + for (i = 0; dirs[i]; i++) check_menu_dir(dirs[i], menus); + newdir = 1; snprintf(buf, sizeof(buf), "%s/etc/xdg", e_prefix_get()); for (i = 0; dirs[i]; i++) @@ -157,11 +160,21 @@ _create_menus_list(Evas *evas, E_Config_Dialog_Data *cfdata) label = file; tlabel = NULL; tdesc = NULL; + e_user_homedir_concat(buf, sizeof(buf), + ".config/menus/applications.menu"); if (!strcmp("/etc/xdg/menus/applications.menu", file)) { label = _("System Default"); if (!cfdata->default_system_menu) sel = i; } + else if (!strcmp(buf, file)) + { + label = _("Personal Default"); + if (cfdata->default_system_menu) + { + if (!strcmp(cfdata->default_system_menu, file)) sel = i; + } + } else { p = strrchr(file, '/'); diff --git a/src/modules/wizard/page_030.c b/src/modules/wizard/page_030.c index 881e65eb4..f8d9420d2 100644 --- a/src/modules/wizard/page_030.c +++ b/src/modules/wizard/page_030.c @@ -44,8 +44,11 @@ wizard_page_init(E_Wizard_Page *pg __UNUSED__) }; int i, newdir; - for (i = 0; dirs[i]; i++) - check_menu_dir(dirs[i]); + e_user_homedir_concat(buf, sizeof(buf), ".config"); + check_menu_dir(buf); + + for (i = 0; dirs[i]; i++) check_menu_dir(dirs[i]); + newdir = 1; snprintf(buf, sizeof(buf), "%s/etc/xdg", e_prefix_get()); for (i = 0; dirs[i]; i++) @@ -116,12 +119,18 @@ wizard_page_show(E_Wizard_Page *pg) label = file; tlabel = NULL; tdesc = NULL; - if (!strcmp("/etc/xdg/menus/applications.menu", file)) + e_user_homedir_concat(buf, sizeof(buf), + ".config/menus/applications.menu"); + if (!strcmp("/etc/xdg/menus/applications.menu", file)) { label = _("System Default"); sel = i; } - else + else if (!strcmp(buf, file)) + { + label = _("Personal Default"); + } + else { p = strrchr(file, '/'); if (p)