rpms/bug-buddy/devel bug-buddy-2.10.0-gmenu.patch,1.2,1.3

[fedora-cvs-commits redhat com]

Author: mclasen

Update of /cvs/dist/rpms/bug-buddy/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29476

Modified Files:
	bug-buddy-2.10.0-gmenu.patch 
Log Message:
Another attempt


bug-buddy-2.10.0-gmenu.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 bugzilla.c  |   54 +++++++++++++++++++++++++++---------------------------
 3 files changed, 29 insertions(+), 29 deletions(-)

Index: bug-buddy-2.10.0-gmenu.patch
===================================================================
RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy-2.10.0-gmenu.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bug-buddy-2.10.0-gmenu.patch	10 Jul 2005 03:42:23 -0000	1.2
+++ bug-buddy-2.10.0-gmenu.patch	10 Jul 2005 03:49:06 -0000	1.3
@@ -1,5 +1,5 @@
 --- bug-buddy-2.10.0/src/bugzilla.c.gmenu	2005-02-10 06:01:10.000000000 -0500
-+++ bug-buddy-2.10.0/src/bugzilla.c	2005-07-09 23:42:06.000000000 -0400
++++ bug-buddy-2.10.0/src/bugzilla.c	2005-07-09 23:48:50.000000000 -0400
 @@ -40,7 +40,7 @@
  #include <libgnomevfs/gnome-vfs.h>
  
@@ -62,7 +62,7 @@
 +	GSList             *retval;
  
 -	tree = menu_tree_lookup ("applications.menu");
-+	tree = gmenu_tree_lookup ("applications.menu");
++	tree = gmenu_tree_lookup ("applications.menu", MENU_TREE_FLAGS_NONE);
  
 -	root = menu_tree_get_root_directory (tree);
 +	root = gmenu_tree_get_root_directory (tree);
@@ -76,7 +76,7 @@
  
  	retval = g_slist_sort (retval, (GCompareFunc) compare_applications);
  
-@@ -1193,13 +1193,13 @@
+@@ -1193,28 +1193,28 @@
  	for (l = all_applications; l; l = l->next) {
  		GnomeDesktopItem *ditem;
  		char *icon;
@@ -94,7 +94,9 @@
  							 0, &error);
  		if (!ditem) {
  			if (error) {
-@@ -1208,13 +1208,13 @@
+-				g_warning ("Couldn't load %s: %s", desktop_entry_get_path (entry),
++				g_warning ("Couldn't load %s: %s", gmenu_tree_entry_get_desktop_file_path (entry),
+ 					   error->message);
  				g_error_free (error);
  				error = NULL;
  			}