upstream/oracle/spec-files: patches/gnome-menus-01-quickstart.diff@c23e64da3e06 (annotated)

12527 ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	1	--- gnome-menus-2.23.1.old/desktop-directories/Makefile.am 2008-04-21 20:49:27.000000000 +0100
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	2	+++ gnome-menus-2.23.1/desktop-directories/Makefile.am 2008-05-29 13:13:10.808649000 +0100
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	3	@@ -27,6 +27,7 @@
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	4	X-GNOME-Menu-Applications.directory.in \
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	5	X-GNOME-Menu-System.directory.in \
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	6	$(directory_in_controlcenterfiles) \
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	7	+ QuickStart.directory.in \
7151 e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	8	$(NULL)
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	9
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	10	directory_DATA = $(directory_in_files:.directory.in=.directory)
12527 ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	11	--- gnome-menus-2.23.1.old/desktop-directories/QuickStart.directory.in 1970-01-01 01:00:00.000000000 +0100
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	12	+++ gnome-menus-2.23.1/desktop-directories/QuickStart.directory.in 2008-05-29 13:13:49.713966000 +0100
14401 b95c41e67d3f 2008-09-30 Takao Fujiwara <[email protected]> fujiwara parents: 12527 diff changeset	13	@@ -0,0 +1,8 @@
7151 e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	14	+[Desktop Entry]
14401 b95c41e67d3f 2008-09-30 Takao Fujiwara <[email protected]> fujiwara parents: 12527 diff changeset	15	+# SUN_BRANDING
7151 e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	16	+_Name=Quick Start Applications
14401 b95c41e67d3f 2008-09-30 Takao Fujiwara <[email protected]> fujiwara parents: 12527 diff changeset	17	+# SUN_BRANDING
7151 e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	18	+_Comment=Quick Start Applications
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	19	+Icon=gnome-favorites
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	20	+Type=Directory
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	21	+Encoding=UTF-8
12527 ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	22	--- gnome-menus-2.23.1.old/layout/Makefile.am 2008-04-21 20:49:29.000000000 +0100
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	23	+++ gnome-menus-2.23.1/layout/Makefile.am 2008-05-29 13:14:33.999238000 +0100
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	24	@@ -5,6 +5,7 @@
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	25	menu_DATA = \
7151 e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	26	applications.menu \
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	27	settings.menu \
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	28	+ quickstart.menu \
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	29	$(NULL)
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	30
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	31	EXTRA_DIST= $(menu_DATA)
12527 ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	32	--- gnome-menus-2.23.1.old/layout/quickstart.menu 1970-01-01 01:00:00.000000000 +0100
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	33	+++ gnome-menus-2.23.1/layout/quickstart.menu 2008-05-29 13:20:56.988665000 +0100
7151 e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	34	@@ -0,0 +1,27 @@
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	35	+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	36	+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	37	+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	38	+<Menu>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	39	+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	40	+ <Name>Quick Start</Name>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	41	+ <Directory>QuickStart.directory</Directory>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	42	+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	43	+ <!-- Scan legacy dirs first, as later items take priority -->
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	44	+ <KDELegacyDirs/>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	45	+ <LegacyDir>/etc/X11/applnk</LegacyDir>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	46	+ <LegacyDir>/usr/share/gnome/apps</LegacyDir>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	47	+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	48	+ <!-- Read standard .directory and .desktop file locations -->
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	49	+ <DefaultAppDirs/>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	50	+ <DefaultDirectoryDirs/>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	51	+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	52	+ <!-- Read in overrides and child menus from applications-merged/ -->
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	53	+ <DefaultMergeDirs/>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	54	+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	55	+ <Include>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	56	+ <And>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	57	+ <Category>X-Sun-Quick-Start</Category>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	58	+ </And>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	59	+ </Include>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	60	+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	61	+</Menu> <!-- End Quick Start -->
12527 ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	62	--- gnome-menus-2.23.1.old/simple-editor/GMenuSimpleEditor/menutreemodel.py 2008-04-21 20:49:30.000000000 +0100
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	63	+++ gnome-menus-2.23.1/simple-editor/GMenuSimpleEditor/menutreemodel.py 2008-05-29 13:16:04.502457000 +0100
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 mattman parents: 9472 diff changeset	64	@@ -104,7 +104,7 @@
7151 e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	65	self.icon_theme = gtk.icon_theme_get_default ()
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	66
7765 0eb902f6f891 2006-07-26 Damien Carbery <[email protected]> dc144907 parents: 7151 diff changeset	67	if (len (menu_files) < 1):
0eb902f6f891 2006-07-26 Damien Carbery <[email protected]> dc144907 parents: 7151 diff changeset	68	- menu_files = ["applications.menu", "settings.menu"]
0eb902f6f891 2006-07-26 Damien Carbery <[email protected]> dc144907 parents: 7151 diff changeset	69	+ menu_files = ["quickstart.menu", "applications.menu", "settings.menu"]
0eb902f6f891 2006-07-26 Damien Carbery <[email protected]> dc144907 parents: 7151 diff changeset	70
0eb902f6f891 2006-07-26 Damien Carbery <[email protected]> dc144907 parents: 7151 diff changeset	71	for menu_file in menu_files:
7151 e12d13af1f84 2006-04-28 Glynn Foster <[email protected]> gf115653 parents: diff changeset	72	tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED)

author	rohinis
	Tue, 29 Nov 2011 17:32:55 +0000
branch	s11express-2010-11
changeset 22234	c23e64da3e06
parent 14401	b95c41e67d3f
child 20373	140925d1f222
permissions	-rw-r--r--