rpms/gdm/devel gdm-user-switcher-no-help.patch, NONE, 1.1 gdm.spec, 1.428, 1.429 gdm-metacity.patch, 1.1, NONE

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26004

Modified Files:
	gdm.spec 
Added Files:
	gdm-user-switcher-no-help.patch 
Removed Files:
	gdm-metacity.patch 
Log Message:
hide nonfunctional help menuitems


gdm-user-switcher-no-help.patch:

--- NEW FILE gdm-user-switcher-no-help.patch ---
diff -up gdm-2.24.0/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.no-help gdm-2.24.0/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
--- gdm-2.24.0/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.no-help	2008-10-03 00:33:07.000000000 -0400
+++ gdm-2.24.0/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml	2008-10-03 00:33:37.000000000 -0400
@@ -12,12 +12,6 @@
       <separator
        name="GdmSeparator"/>
       <menuitem
-       name="Help Item"
-       verb="GdmHelp"
-       _label="_Help"
-       pixtype="stock"
-       pixname="gtk-help"/>
-      <menuitem
        name="About Item"
        verb="GdmAbout"
        _label="_About"


Index: gdm.spec
===================================================================
RCS file: /cvs/extras/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -r1.428 -r1.429
--- gdm.spec	1 Oct 2008 03:19:04 -0000	1.428
+++ gdm.spec	3 Oct 2008 04:36:40 -0000	1.429
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.24.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -97,6 +97,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=554523
 Patch11: gdm-2.24.0-add-panel-slide.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=465121
+Patch12: gdm-user-switcher-no-help.patch
+
 # Fedora-specific
 Patch99: gdm-2.23.1-fedora-logo.patch
 
@@ -128,6 +131,7 @@
 %patch9 -p1 -b .fix-crash
 %patch10 -p1 -b .fix-icon-scale
 %patch11 -p1 -b .add-panel-slide
+%patch12 -p1 -b .no-help
 
 %patch99 -p1 -b .fedora-logo
 
@@ -330,6 +334,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Fri Oct  3 2008 Matthias Clasen  <mclasen at redhat.com> - 1:2.24.0-8
+- Don't show a non-functional help menuitem
+
 * Tue Sep 30 2008 Ray Strode <rstrode at redhat.com> - 1:2.24.0-7
 - Make panel slide in initially like the gnome panel
 


--- gdm-metacity.patch DELETED ---