gnome-panel:source=/conary.specifix.com@spx:devel/2.10.0-3

[Apache]

2.10.0-3 Tim Gerla (http://bugs.specifix.com/) Mon Mar 14 12:29:12 2005
    patch gnome-panel to read gnome-applications.menu instead of applications.menu
    
gnome-only-menus.patch: new
diff -u gnome-panel-2.10.0-orig/gnome-panel/menu.c gnome-panel-2.10.0/gnome-panel/menu.c
--- gnome-panel-2.10.0-orig/gnome-panel/menu.c	2005-03-07 09:15:16.000000000 -0500
+++ gnome-panel-2.10.0/gnome-panel/menu.c	2005-03-14 12:11:12.300539496 -0500
@@ -1513,7 +1513,7 @@
 {
 	GtkWidget *main_menu;
 
-	main_menu = create_applications_menu ("applications.menu", NULL);
+	main_menu = create_applications_menu ("gnome-applications.menu", NULL);
 	g_object_set_data (G_OBJECT (main_menu), "menu_panel", panel);
 	/* FIXME need to update the panel on parent_set */
 
diff -u gnome-panel-2.10.0-orig/gnome-panel/panel-addto.c gnome-panel-2.10.0/gnome-panel/panel-addto.c
--- gnome-panel-2.10.0-orig/gnome-panel/panel-addto.c	2005-03-07 09:15:16.000000000 -0500
+++ gnome-panel-2.10.0/gnome-panel/panel-addto.c	2005-03-14 12:11:26.102441288 -0500
@@ -664,11 +664,11 @@
 				    G_TYPE_POINTER,
 				    G_TYPE_STRING);
 
-	tree = menu_tree_lookup ("applications.menu");
+	tree = menu_tree_lookup ("gnome-applications.menu");
 
 	if ((root = menu_tree_get_root_directory (tree))) {
 		panel_addto_make_application_list (&dialog->application_list,
-						   root, "applications.menu");
+						   root, "gnome-applications.menu");
 		panel_addto_populate_application_model (store, NULL, dialog->application_list);
 
 		menu_tree_directory_unref (root);
diff -u gnome-panel-2.10.0-orig/gnome-panel/panel-menu-bar.c gnome-panel-2.10.0/gnome-panel/panel-menu-bar.c
--- gnome-panel-2.10.0-orig/gnome-panel/panel-menu-bar.c	2005-03-07 09:15:16.000000000 -0500
+++ gnome-panel-2.10.0/gnome-panel/panel-menu-bar.c	2005-03-14 12:11:42.143002752 -0500
@@ -108,7 +108,7 @@
 {
 	GtkWidget *applications_menu;
 
-	applications_menu = create_applications_menu ("applications.menu", NULL);
+	applications_menu = create_applications_menu ("gnome-applications.menu", NULL);
 
 	g_signal_connect (applications_menu, "show",
 			  G_CALLBACK (panel_menu_bar_append_applications_menu),
diff -u gnome-panel-2.10.0-orig/gnome-panel/panel-menu-button.c gnome-panel-2.10.0/gnome-panel/panel-menu-button.c
--- gnome-panel-2.10.0-orig/gnome-panel/panel-menu-button.c	2005-03-07 09:15:16.000000000 -0500
+++ gnome-panel-2.10.0/gnome-panel/panel-menu-button.c	2005-03-14 12:11:51.695550544 -0500
@@ -65,7 +65,7 @@
 } MenuPathRootItem;
 
 static MenuPathRootItem root_items [] = {
-	{ APPLICATIONS_MENU, "applications", "applications.menu" },
+	{ APPLICATIONS_MENU, "applications", "gnome-applications.menu" },
 	{ SETTINGS_MENU,     "settings",     "settings.menu"     }
 };
 
diff -u gnome-panel-2.10.0-orig/gnome-panel/panel-run-dialog.c gnome-panel-2.10.0/gnome-panel/panel-run-dialog.c
--- gnome-panel-2.10.0-orig/gnome-panel/panel-run-dialog.c	2005-03-07 09:15:16.000000000 -0500
+++ gnome-panel-2.10.0/gnome-panel/panel-run-dialog.c	2005-03-14 12:11:59.798318736 -0500
@@ -708,7 +708,7 @@
 	MenuTreeDirectory *root;
 	GSList            *retval;
 
-	tree = menu_tree_lookup ("applications.menu");
+	tree = menu_tree_lookup ("gnome-applications.menu");
 
 	root = menu_tree_get_root_directory (tree);
 

gnome-panel-2.10.0.tar.bz2: changed
Index: gnome-panel-2.10.0.tar.bz2
====================================================================
inode(perms mtime)
gnome-panel.recipe: changed
Index: gnome-panel.recipe
====================================================================
contents(size sha1)
inode(mtime owner group)
--- gnome-panel.recipe /conary.specifix.com at spx:devel/2.10.0-2
+++ gnome-panel.recipe /conary.specifix.com at spx:devel/2.10.0-3
@@ -18,10 +18,16 @@
 
     name = 'gnome-panel'
     version = '2.10.0'
-        
-    def setup(r):
+
+    def unpack(r):
+        GnomePackageRecipe.unpack(r)        
+        r.addPatch('gnome-only-menus.patch')
+    
 	r.addSource('gnome-panel-settings.tagdescription', macros=True)
 	r.addSource('gnome-panel-settings.taghandler')
+
+    def setup(r):
+        GnomePackageRecipe.setup(r)
 	r.Install('gnome-panel-settings.tagdescription',
 		  '%(tagdescriptiondir)s/gnome-panel-settings')
 	r.Install('gnome-panel-settings.taghandler',
@@ -30,4 +36,3 @@
                   exceptions='%(sysconfdir)s/gconf/schemas/.*\.schemas')
         r.TagSpec('gnome-panel-settings',
                   '%(sysconfdir)s/gconf/schemas/.*')
-        GnomePackageRecipe.setup(r)