[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

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



Author: mclasen

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

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


bug-buddy-2.10.0-gmenu.patch:
 Makefile.am |    2 +-
 Makefile.in |    2 +-
 bugzilla.c  |   52 ++++++++++++++++++++++++++--------------------------
 3 files changed, 28 insertions(+), 28 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bug-buddy-2.10.0-gmenu.patch	10 Jul 2005 03:32:44 -0000	1.1
+++ bug-buddy-2.10.0-gmenu.patch	10 Jul 2005 03:42:23 -0000	1.2
@@ -1,5 +1,5 @@
---- bug-buddy-2.10.0/src/bugzilla.c.gmenu	2005-07-09 23:26:38.000000000 -0400
-+++ bug-buddy-2.10.0/src/bugzilla.c	2005-07-09 23:26:52.000000000 -0400
+--- 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
 @@ -40,7 +40,7 @@
  #include <libgnomevfs/gnome-vfs.h>
  
@@ -9,8 +9,121 @@
  
  #include <bonobo/bonobo-exception.h>
  #include <bonobo-activation/bonobo-activation.h>
---- bug-buddy-2.10.0/src/Makefile.am.gmenu	2005-07-09 23:29:36.000000000 -0400
-+++ bug-buddy-2.10.0/src/Makefile.am	2005-07-09 23:29:49.000000000 -0400
+@@ -1123,30 +1123,30 @@
+ }
+ 
+ static int
+-compare_applications (MenuTreeEntry *a,
+-		      MenuTreeEntry *b)
++compare_applications (GMenuTreeEntry *a,
++		      GMenuTreeEntry *b)
+ {
+-	return g_utf8_collate (menu_tree_entry_get_name (a),
+-			       menu_tree_entry_get_name (b));
++	return g_utf8_collate (gmenu_tree_entry_get_name (a),
++			       gmenu_tree_entry_get_name (b));
+ }
+ 
+ static GSList *
+-get_all_applications_from_dir (MenuTreeDirectory *directory,
+-			       GSList            *list)
++get_all_applications_from_dir (GMenuTreeDirectory *directory,
++			       GSList             *list)
+ {
+ 	GSList *subdirs;
+ 	GSList *l;
+ 
+ 	list = g_slist_concat (list,
+-			       menu_tree_directory_get_entries (directory));
++			       gmenu_tree_directory_get_entries (directory));
+ 
+-	subdirs = menu_tree_directory_get_subdirs (directory);
++	subdirs = gmenu_tree_directory_get_subdirs (directory);
+ 	for (l = subdirs; l; l = l->next) {
+-		MenuTreeDirectory *subdir = l->data;
++		GMenuTreeDirectory *subdir = l->data;
+ 
+ 		list = get_all_applications_from_dir (subdir, list);
+ 
+-		menu_tree_directory_unref (subdir);
++		gmenu_tree_directory_unref (subdir);
+ 	}
+ 	g_slist_free (subdirs);
+ 
+@@ -1156,18 +1156,18 @@
+ static GSList *
+ get_all_applications (void)
+ {
+-	MenuTree          *tree;
+-	MenuTreeDirectory *root;
+-	GSList            *retval;
++	GMenuTree          *tree;
++	GMenuTreeDirectory *root;
++	GSList             *retval;
+ 
+-	tree = menu_tree_lookup ("applications.menu");
++	tree = gmenu_tree_lookup ("applications.menu");
+ 
+-	root = menu_tree_get_root_directory (tree);
++	root = gmenu_tree_get_root_directory (tree);
+ 
+ 	retval = get_all_applications_from_dir (root, NULL);
+ 
+-	menu_tree_directory_unref (root);
+-	menu_tree_unref (tree);
++	gmenu_tree_directory_unref (root);
++	gmenu_tree_unref (tree);
+ 
+ 	retval = g_slist_sort (retval, (GCompareFunc) compare_applications);
+ 
+@@ -1193,13 +1193,13 @@
+ 	for (l = all_applications; l; l = l->next) {
+ 		GnomeDesktopItem *ditem;
+ 		char *icon;
+-		MenuTreeEntry *entry = l->data;
++		GMenuTreeEntry *entry = l->data;
+ 
+-		if (prev_name && strcmp (menu_tree_entry_get_name (entry), prev_name) == 0) {
+-			menu_tree_entry_unref (entry);
++		if (prev_name && strcmp (gmenu_tree_entry_get_name (entry), prev_name) == 0) {
++			gmenu_tree_entry_unref (entry);
+ 			continue;
+ 		}
+-		ditem = gnome_desktop_item_new_from_uri (menu_tree_entry_get_desktop_file_path (entry), 
++		ditem = gnome_desktop_item_new_from_uri (gmenu_tree_entry_get_desktop_file_path (entry), 
+ 							 0, &error);
+ 		if (!ditem) {
+ 			if (error) {
+@@ -1208,13 +1208,13 @@
+ 				g_error_free (error);
+ 				error = NULL;
+ 			}
+-			menu_tree_entry_unref (entry);
++			gmenu_tree_entry_unref (entry);
+ 			continue;
+ 		}
+     
+ 		if ((gnome_desktop_item_get_entry_type (ditem) != GNOME_DESKTOP_ITEM_TYPE_APPLICATION) || !gnome_desktop_item_get_string (ditem, BUGZILLA_BUGZILLA)) {
+ 			gnome_desktop_item_unref (ditem);	
+-			menu_tree_entry_unref (entry);
++			gmenu_tree_entry_unref (entry);
+ 			continue;
+ 		}
+ 
+@@ -1231,9 +1231,9 @@
+ 			gnome_desktop_item_get_string (ditem, GNOME_DESKTOP_ITEM_EXEC),
+ 			gnome_desktop_item_get_string (ditem, BUGZILLA_OTHER_BINARIES));
+ 		g_free (icon);
+-		prev_name = menu_tree_entry_get_name (entry);
++		prev_name = gmenu_tree_entry_get_name (entry);
+ 		gnome_desktop_item_unref (ditem);	
+-		menu_tree_entry_unref (entry);
++		gmenu_tree_entry_unref (entry);
+ 	}
+ 	g_slist_free (all_applications);
+ 
+--- bug-buddy-2.10.0/src/Makefile.am.gmenu	2005-02-10 05:13:46.000000000 -0500
++++ bug-buddy-2.10.0/src/Makefile.am	2005-07-09 23:40:05.000000000 -0400
 @@ -21,7 +21,7 @@
          -DBUDDY_ICONDIR=\""$(datadir)/pixmaps"\"	\
  	-DREAL_DATADIR=\""$(datadir)"\"			\
@@ -20,8 +133,8 @@
  	-D_GNU_SOURCE
  
  bb_built_sources = \
---- bug-buddy-2.10.0/src/Makefile.in.gmenu	2005-07-09 23:30:38.000000000 -0400
-+++ bug-buddy-2.10.0/src/Makefile.in	2005-07-09 23:30:56.000000000 -0400
+--- bug-buddy-2.10.0/src/Makefile.in.gmenu	2005-03-07 03:35:35.000000000 -0500
++++ bug-buddy-2.10.0/src/Makefile.in	2005-07-09 23:40:05.000000000 -0400
 @@ -149,7 +149,7 @@
          -DBUDDY_ICONDIR=\""$(datadir)/pixmaps"\"	\
  	-DREAL_DATADIR=\""$(datadir)"\"			\


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]