Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        menus.c 


Log Message:
Move menus in menus.cfg to simple files (preserving backward compatibility).

===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -3 -r1.278 -r1.279
--- menus.c     3 Jun 2007 11:55:29 -0000       1.278
+++ menus.c     5 Jun 2007 11:41:23 -0000       1.279
@@ -1097,10 +1097,40 @@
    return m;
 }
 
+/*
+ * Aliases for "well-known" menus for backward compatibility.
+ */
+static const char  *const menu_aliases[] = {
+   "APPS_SUBMENU", "file.menu",
+   "CONFIG_SUBMENU", "settings.menu",
+   "DESKTOP_SUBMENU", "desktop.menu",
+   "MAINT_SUBMENU", "maintenance.menu",
+   "ROOT_2", "enlightenment.menu",
+   "WINOPS_MENU", "winops.menu",
+};
+#define N_MENU_ALIASES (sizeof(menu_aliases)/sizeof(char*)/2)
+
+static const char  *
+_MenuCheckAlias(const char *name)
+{
+   unsigned int        i;
+
+   for (i = 0; i < N_MENU_ALIASES; i++)
+      if (!strcmp(name, menu_aliases[2 * i]))
+        return menu_aliases[2 * i + 1];
+
+   return NULL;
+}
+
 static void
 MenusShowNamed(const char *name, const char *param)
 {
    Menu               *m;
+   const char         *name2;
+
+   name2 = _MenuCheckAlias(name);
+   if (name2)
+      name = name2;
 
    /* Hide any menus currently up */
    if (MenusActive())
@@ -1840,33 +1870,6 @@
    return err;
 }
 
-/*
- * Aliases for "well-known" menus for backward compatibility.
- */
-static const char  *const menu_aliases[] = {
-   "APPS_SUBMENU", "file.menu",
-   "CONFIG_SUBMENU", "settings.menu",
-   "DESKTOP_SUBMENU", "desktop.menu",
-   "MAINT_SUBMENU", "maintenance.menu",
-   "ROOT_2", "enlightenment.menu",
-   "WINOPS_MENU", "winops.menu",
-};
-#define N_MENU_ALIASES (sizeof(menu_aliases)/sizeof(char*)/2)
-
-static void
-_MenuCheckAlias(Menu * m)
-{
-   unsigned int        i;
-
-   for (i = 0; i < N_MENU_ALIASES; i++)
-     {
-       if (strcmp(m->name, menu_aliases[2 * i]))
-          continue;
-       MenuSetAlias(m, menu_aliases[2 * i + 1]);
-       break;
-     }
-}
-
 int
 MenuConfigLoad(FILE * fs)
 {
@@ -1933,7 +1936,9 @@
                m = MenuCreate(s2, NULL, NULL, NULL);
             else
                MenuSetName(m, s2);
-            _MenuCheckAlias(m);
+            params = _MenuCheckAlias(s2);
+            if (params)
+               MenuSetAlias(m, params);
             break;
          case MENU_USE_STYLE:
             MenuSetStyle(m, MenuStyleFind(s2));



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to