rpms/gnome-panel/devel gnome-panel-2.13.5-switch-user.patch, NONE, 1.1 gnome-panel.spec, 1.104, 1.105

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20152

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.13.5-switch-user.patch 
Log Message:
Remove switch user


gnome-panel-2.13.5-switch-user.patch:
 panel-logout.c |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE gnome-panel-2.13.5-switch-user.patch ---
--- gnome-panel-2.13.5/gnome-panel/panel-logout.c.switch-user	2006-01-20 09:43:52.000000000 -0500
+++ gnome-panel-2.13.5/gnome-panel/panel-logout.c	2006-01-20 09:44:26.000000000 -0500
@@ -205,10 +205,12 @@
 		// FIXME set default button
 		logout_dialog->priv->default_response = PANEL_LOGOUT_DIALOG_LOGOUT;
 
+#if 0
 		//FIXME is gdm running?
 		gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
 				       _("_Switch User"),
 				       PANEL_LOGOUT_RESPONSE_SWITCH_USER);
+#endif
 		gtk_dialog_add_button (GTK_DIALOG (logout_dialog),
 				       GTK_STOCK_CANCEL,
 				       GTK_RESPONSE_CANCEL);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- gnome-panel.spec	17 Jan 2006 05:28:16 -0000	1.104
+++ gnome-panel.spec	20 Jan 2006 14:46:34 -0000	1.105
@@ -16,7 +16,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.13.5
-Release: 1
+Release: 2
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -59,6 +59,7 @@
 Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
 Patch4: gnome-panel-2.13.2-rename-system-menu.patch
 Patch5: gnome-panel-2.12.1-about-fedora.patch
+Patch6: gnome-panel-2.13.5-switch-user.patch
 
 %description
 The GNOME panel provides the window list, workspace switcher, menus, and other 
@@ -84,6 +85,8 @@
 %patch2 -p1 -b .speak-to-us-ye-old-wise-fish
 %patch4 -p1 -b .rename-system-menu
 %patch5 -p1 -b .about-fedora
+%patch6 -p1 -b .switch-user
+
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE3} gnome-panel/panel-compatibility.schemas
 
@@ -194,6 +197,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Jan 20 2006 Matthias Clasen <mclasen at redhat.com> 2.13.5-2
+- Remove "Switch user" button
+
 * Tue Jan 17 2006 Matthias Clasen <mclasen at redhat.com> 2.13.5-1
 - Update to 2.13.5