--- a/ChangeLog	Wed Jul 26 11:45:05 2006 +0000
+++ b/ChangeLog	Wed Jul 26 11:57:17 2006 +0000
@@ -1,5 +1,7 @@
 2006-07-26  Damien Carbery <[email protected]>
 
+	* patches/gnome-menus-02-quickstart.diff: Rework hunk.
+	* patches/gnome-menus-04-preferences.diff: Remove duplicate hunk.
 	* metacity.spec: Add patch for empty stuct (forte doesn't like these).
 	* patches/metacity-11-empty-struct.diff: Add 'char x' to empty structs.
 

--- a/patches/gnome-menus-02-quickstart.diff	Wed Jul 26 11:45:05 2006 +0000
+++ b/patches/gnome-menus-02-quickstart.diff	Wed Jul 26 11:57:17 2006 +0000
@@ -61,15 +61,14 @@
 +    </Include>
 +
 +</Menu> <!-- End Quick Start -->
-diff -urN gnome-menus-2.14.0/simple-editor/GMenuSimpleEditor/menutreemodel.py gnome-menus-2.14.0-hacked/simple-editor/GMenuSimpleEditor/menutreemodel.py
---- gnome-menus-2.14.0/simple-editor/GMenuSimpleEditor/menutreemodel.py	2005-04-11 21:36:04.000000000 +1200
-+++ gnome-menus-2.14.0-hacked/simple-editor/GMenuSimpleEditor/menutreemodel.py	2006-04-28 10:57:40.871331000 +1200
-@@ -105,7 +105,7 @@
-         
+--- gnome-menus-2.15.90/simple-editor/GMenuSimpleEditor/menutreemodel.py.orig	2006-07-26 11:28:14.911774000 +0100
++++ gnome-menus-2.15.90/simple-editor/GMenuSimpleEditor/menutreemodel.py	2006-07-26 11:28:55.362985000 +0100
+@@ -106,7 +106,7 @@
          self.icon_theme = gtk.icon_theme_get_default ()
  
--        for menu_file in ("applications.menu", "settings.menu"):
-+        for menu_file in ("quickstart.menu", "applications.menu", "settings.menu"):
+         if (len (menu_files) < 1):
+-            menu_files = ["applications.menu", "settings.menu"]
++            menu_files = ["quickstart.menu", "applications.menu", "settings.menu"]
+ 
+         for menu_file in menu_files:
              tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED)
-             self.__append_directory (tree.root, None, False, menu_file)
- 

--- a/patches/gnome-menus-04-preferences.diff	Wed Jul 26 11:45:05 2006 +0000
+++ b/patches/gnome-menus-04-preferences.diff	Wed Jul 26 11:57:17 2006 +0000
@@ -70,15 +70,3 @@
  
 -</Menu> <!-- End Applications -->
 +</Menu> <!-- End Administration -->
-diff -urN gnome-menus-2.14.0/simple-editor/GMenuSimpleEditor/menutreemodel.py gnome-menus-2.14.0-hacked/simple-editor/GMenuSimpleEditor/menutreemodel.py
---- gnome-menus-2.14.0/simple-editor/GMenuSimpleEditor/menutreemodel.py	2006-05-04 23:15:32.030503000 +1200
-+++ gnome-menus-2.14.0-hacked/simple-editor/GMenuSimpleEditor/menutreemodel.py	2006-05-04 23:16:08.866611000 +1200
-@@ -105,7 +105,7 @@
-         
-         self.icon_theme = gtk.icon_theme_get_default ()
- 
--        for menu_file in ("quickstart.menu", "applications.menu", "settings.menu"):
-+        for menu_file in ("quickstart.menu", "applications.menu", "preferences.menu", "settings.menu"):
-             tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED)
-             self.__append_directory (tree.root, None, False, menu_file)
-