summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@fedoraproject.org>2007-02-08 20:30:42 +0000
committerMatthias Clasen <mclasen@fedoraproject.org>2007-02-08 20:30:42 +0000
commita5c4484ed23b4db33a14bda03f4f7efe8fb70f08 (patch)
treee52bc9713544909b783c8f914c47142626ede5f3
parentdec439ea9ee03123b444bce5ad0c8c1e37aa06c5 (diff)
downloadgnome-panel-a5c4484ed23b4db33a14bda03f4f7efe8fb70f08.tar.gz
gnome-panel-a5c4484ed23b4db33a14bda03f4f7efe8fb70f08.tar.xz
gnome-panel-a5c4484ed23b4db33a14bda03f4f7efe8fb70f08.zip
hide switch user button againgnome-panel-2_17_91-2_svn20070207_fc7
-rw-r--r--gnome-panel-2.13.5-switch-user.patch15
-rw-r--r--gnome-panel.spec7
2 files changed, 21 insertions, 1 deletions
diff --git a/gnome-panel-2.13.5-switch-user.patch b/gnome-panel-2.13.5-switch-user.patch
new file mode 100644
index 0000000..9deb8e4
--- /dev/null
+++ b/gnome-panel-2.13.5-switch-user.patch
@@ -0,0 +1,15 @@
+--- 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);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index e57f6dc..1a0b8b9 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -24,7 +24,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.17.91
-Release: 1.%{alphatag}%{?dist}
+Release: 2.%{alphatag}%{?dist}
URL: http://www.gnome.org
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.17/%{name}-%{version}.%{alphatag}.tar.gz
Source1: redhat-panel-default-setup.entries
@@ -85,6 +85,7 @@ BuildRequires: dbus-devel >= %{dbus_version}
Patch0: gnome-panel-2.17.91-vendor.patch
Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
Patch5: gnome-panel-2.17.91-about-fedora.patch
+Patch6: gnome-panel-2.13.5-switch-user.patch
Patch8: gnome-panel-2.16.1-search.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=399270
Patch9: gnome-panel-2.13.91-ignore-unknown-options.patch
@@ -122,6 +123,7 @@ Panel Applets using the libpanel-applet library.
%patch0 -p1 -b .vendor
%patch2 -p1 -b .speak-to-us-ye-old-wise-fish
%patch5 -p1 -b .about-fedora
+%patch6 -p1 -b .switch-user
%patch8 -p1 -b .search
%patch9 -p1 -b .ignore-unknown-options
%patch12 -p1 -b .xio-error
@@ -301,6 +303,9 @@ fi
%{_datadir}/gtk-doc
%changelog
+* Thu Feb 8 2007 Matthias Clasen <mclasen@redhat.com> - 2.17.91-2.svn20070207
+- Hide the "Switch User" button on the logout dialog again
+
* Mon Jan 22 2007 Matthias Clasen <mclasen@redhat.com> - 2.17.90-1
- Update to 2.17.90
- Clean up BuildRequires