Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gnome-menus-01-quickstart.diff
author mattman
Thu, 29 May 2008 13:06:31 +0000
changeset 12527 ecafaa5ea72b
parent 9472 44e860c9f2c3
child 14401 b95c41e67d3f
permissions -rw-r--r--
* base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640 bugzilla:104753, ensuring that if the legal text being displayed is not displayed completely it is scrolled slowly out giving the user a chance to read all the text. This patch was remove incorrectly, gpatch for some reason thought it was fully applied to tarball when it was not. * patches/gnome-desktop-04-gnome-about-label-size.diff: Re-applied patch * base-specs/gnome-menus.spec : Bump to 2.23.1 Tarball * patches/gnome-menus-01-quickstart.diff : Re-Apply Patch * patches/gnome-menus-02-application-submenu-rename.diff : Re-Apply Patch * patches/gnome-menus-03-preferences.diff : Re-Apply Patch * patches/gnome-menus-04-menu-monitor.diff : Re-Apply Patch
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
7151
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    13
 
@@ -0,0 +1,6 @@
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    14
 
+[Desktop Entry]
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    15
 
+_Name=Quick Start Applications
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    16
 
+_Comment=Quick Start Applications
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    17
 
+Icon=gnome-favorites
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    18
 
+Type=Directory
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    19
 
+Encoding=UTF-8
12527
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640
mattman
parents: 9472
diff changeset 
    20
 
--- 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 
    21
 
+++ 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 
    22
 
@@ -5,6 +5,7 @@
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640
mattman
parents: 9472
diff changeset 
    23
 
 menu_DATA =               		\
7151
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    24
 
 	applications.menu		\
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    25
 
 	settings.menu			\
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    26
 
+	quickstart.menu			\
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    27
 
 	$(NULL)
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    28
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    29
 
 EXTRA_DIST= $(menu_DATA)
12527
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640
mattman
parents: 9472
diff changeset 
    30
 
--- 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 
    31
 
+++ 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 
    32
 
@@ -0,0 +1,27 @@
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    33
 
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    34
 
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    35
 
+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    36
 
+<Menu>
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
 
+  <Name>Quick Start</Name>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    39
 
+  <Directory>QuickStart.directory</Directory>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    40
 
+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    41
 
+  <!-- Scan legacy dirs first, as later items take priority -->
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    42
 
+  <KDELegacyDirs/>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    43
 
+  <LegacyDir>/etc/X11/applnk</LegacyDir>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    44
 
+  <LegacyDir>/usr/share/gnome/apps</LegacyDir>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    45
 
+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    46
 
+  <!-- Read standard .directory and .desktop file locations -->
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    47
 
+  <DefaultAppDirs/>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    48
 
+  <DefaultDirectoryDirs/>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    49
 
+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    50
 
+  <!-- Read in overrides and child menus from applications-merged/ -->
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    51
 
+  <DefaultMergeDirs/>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    52
 
+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    53
 
+    <Include>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    54
 
+      <And>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    55
 
+        <Category>X-Sun-Quick-Start</Category>
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
 
+    </Include>
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    58
 
+
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    59
 
+</Menu> <!-- End Quick Start -->
12527
ecafaa5ea72b * base-specs/gnome-desktop.spec : Re-Apply patch which fixes bugster:6695640
mattman
parents: 9472
diff changeset 
    60
 
--- 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 
    61
 
+++ 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 
    62
 
@@ -104,7 +104,7 @@
7151
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    63
 
         self.icon_theme = gtk.icon_theme_get_default ()
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    64
7765
0eb902f6f891 2006-07-26 Damien Carbery <[email protected]>
dc144907
parents: 7151
diff changeset 
    65
 
         if (len (menu_files) < 1):
0eb902f6f891 2006-07-26 Damien Carbery <[email protected]>
dc144907
parents: 7151
diff changeset 
    66
 
-            menu_files = ["applications.menu", "settings.menu"]
0eb902f6f891 2006-07-26 Damien Carbery <[email protected]>
dc144907
parents: 7151
diff changeset 
    67
 
+            menu_files = ["quickstart.menu", "applications.menu", "settings.menu"]
0eb902f6f891 2006-07-26 Damien Carbery <[email protected]>
dc144907
parents: 7151
diff changeset 
    68
0eb902f6f891 2006-07-26 Damien Carbery <[email protected]>
dc144907
parents: 7151
diff changeset 
    69
 
         for menu_file in menu_files:
7151
e12d13af1f84 2006-04-28 Glynn Foster <[email protected]>
gf115653
parents:
diff changeset 
    70
 
             tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED)
upstream/oracle/spec-files