Merged trunk changes r9797:9829 into 217update branch.
diff -urN gnome-menus-2.14.0/desktop-directories/Makefile.am gnome-menus-2.14.0-hacked/desktop-directories/Makefile.am
--- gnome-menus-2.14.0/desktop-directories/Makefile.am 2005-07-12 01:12:19.000000000 +1200
+++ gnome-menus-2.14.0-hacked/desktop-directories/Makefile.am 2006-04-28 10:59:19.399227000 +1200
@@ -20,6 +20,7 @@
Settings.directory.in \
System-Settings.directory.in \
System-Tools.directory.in \
+ QuickStart.directory.in \
$(NULL)
directory_DATA = $(directory_in_files:.directory.in=.directory)
diff -urN gnome-menus-2.14.0/desktop-directories/QuickStart.directory.in gnome-menus-2.14.0-hacked/desktop-directories/QuickStart.directory.in
--- gnome-menus-2.14.0/desktop-directories/QuickStart.directory.in 1970-01-01 12:00:00.000000000 +1200
+++ gnome-menus-2.14.0-hacked/desktop-directories/QuickStart.directory.in 2006-04-28 10:59:08.228123000 +1200
@@ -0,0 +1,6 @@
+[Desktop Entry]
+_Name=Quick Start Applications
+_Comment=Quick Start Applications
+Icon=gnome-favorites
+Type=Directory
+Encoding=UTF-8
diff -urN gnome-menus-2.14.0/layout/Makefile.am gnome-menus-2.14.0-hacked/layout/Makefile.am
--- gnome-menus-2.14.0/layout/Makefile.am 2005-01-10 09:57:12.000000000 +1300
+++ gnome-menus-2.14.0-hacked/layout/Makefile.am 2006-04-28 10:59:39.281736000 +1200
@@ -6,6 +6,7 @@
applications.menu \
preferences.menu \
settings.menu \
+ quickstart.menu \
$(NULL)
EXTRA_DIST= $(menu_DATA)
diff -urN gnome-menus-2.14.0/layout/quickstart.menu gnome-menus-2.14.0-hacked/layout/quickstart.menu
--- gnome-menus-2.14.0/layout/quickstart.menu 1970-01-01 12:00:00.000000000 +1200
+++ gnome-menus-2.14.0-hacked/layout/quickstart.menu 2006-04-28 10:59:29.704514000 +1200
@@ -0,0 +1,27 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+
+<Menu>
+
+ <Name>Quick Start</Name>
+ <Directory>QuickStart.directory</Directory>
+
+ <!-- Scan legacy dirs first, as later items take priority -->
+ <KDELegacyDirs/>
+ <LegacyDir>/etc/X11/applnk</LegacyDir>
+ <LegacyDir>/usr/share/gnome/apps</LegacyDir>
+
+ <!-- Read standard .directory and .desktop file locations -->
+ <DefaultAppDirs/>
+ <DefaultDirectoryDirs/>
+
+ <!-- Read in overrides and child menus from applications-merged/ -->
+ <DefaultMergeDirs/>
+
+ <Include>
+ <And>
+ <Category>X-Sun-Quick-Start</Category>
+ </And>
+ </Include>
+
+</Menu> <!-- End Quick Start -->
--- 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 ()
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)