[Xfce4-commits] r23285 - in libfrap/trunk/libfrap/menu: . tests

[Jannis Pohlmann]

Author: jannis
Date: 2006-10-04 18:00:08 +0000 (Wed, 04 Oct 2006)
New Revision: 23285

Modified:
   libfrap/trunk/libfrap/menu/ChangeLog
   libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c
Log:
	* tests/test-display-root-menu.c: Add option to load a different menu 
	  than the default applications menu.

Modified: libfrap/trunk/libfrap/menu/ChangeLog
===================================================================
--- libfrap/trunk/libfrap/menu/ChangeLog	2006-10-04 17:46:07 UTC (rev 23284)
+++ libfrap/trunk/libfrap/menu/ChangeLog	2006-10-04 18:00:08 UTC (rev 23285)
@@ -1,5 +1,10 @@
 2006-10-04	Jannis Pohlmann <jannis at xfce.org>
 
+	* tests/test-display-root-menu.c: Add option to load a different menu 
+	  than the default applications menu.
+
+2006-10-04	Jannis Pohlmann <jannis at xfce.org>
+
 	* frap-menu-item.c: Revert parts of the previous commit because of 
 	  useless checks.
 	* frap-menu.c: Remove <Deleted /> menus and add notes for other 

Modified: libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c
===================================================================
--- libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c	2006-10-04 17:46:07 UTC (rev 23284)
+++ libfrap/trunk/libfrap/menu/tests/test-display-root-menu.c	2006-10-04 18:00:08 UTC (rev 23285)
@@ -326,8 +326,16 @@
   /* Initialize the menu library */
   frap_menu_init ();
 
-  /* Get a reference to the root menu */
-  root = frap_menu_get_root ();
+  if (g_strv_length (argv) > 1)
+    {
+      /* Load menu from special filename */
+      root = frap_menu_new (argv[1]);
+    }
+  else
+    {
+      /* Get a reference to the root menu */
+      root = frap_menu_get_root ();
+    }
 
   /* Create the main window */
   create_main_window ();