summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@fedoraproject.org>2008-02-03 06:53:56 +0000
committerMatthias Clasen <mclasen@fedoraproject.org>2008-02-03 06:53:56 +0000
commit9b3366093b970f3561dbf147c8c090ce51b13bb6 (patch)
tree997cbafdd2c9f0e1d24eafeb5ce26104ca97ed38
parent4a0e59f596a3399af766324a203f957a2bcd78a3 (diff)
downloadgnome-panel-9b3366093b970f3561dbf147c8c090ce51b13bb6.tar.gz
gnome-panel-9b3366093b970f3561dbf147c8c090ce51b13bb6.tar.xz
gnome-panel-9b3366093b970f3561dbf147c8c090ce51b13bb6.zip
Ensure the logout dialog gets focus
-rw-r--r--gnome-panel.spec10
-rw-r--r--logout-focus.patch9
2 files changed, 17 insertions, 2 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec
index c294433..a80f3d0 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.21.90
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2
@@ -112,9 +112,11 @@ Patch11: applet-error.patch
# try to deal with the 22/24 madness in icon themes
Patch12: more-sharp-icons.patch
-# fix problems with the intlclock integration in 2.21.5
Patch14: gnome-panel-2.21.5-ck-shutdown.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=514026
+Patch15: logout-focus.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -162,6 +164,7 @@ Panel Applets using the libpanel-applet library.
%patch11 -p1 -b .applet-error
%patch12 -p1 -b .more-sharp-icons
%patch14 -p1 -b .ck-shutdown
+%patch15 -p1 -b .logout-focus
. %{SOURCE6}
@@ -346,6 +349,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Sun Feb 3 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.90-2
+- Ensure the logout dialog gets focus.
+
* Tue Jan 29 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.90-1
- Update to 2.21.90
- Drop upstreamed patch
diff --git a/logout-focus.patch b/logout-focus.patch
new file mode 100644
index 0000000..feb8eb6
--- /dev/null
+++ b/logout-focus.patch
@@ -0,0 +1,9 @@
+diff -up gnome-panel-2.21.90/gnome-panel/panel-logout.c.logout-focus gnome-panel-2.21.90/gnome-panel/panel-logout.c
+--- gnome-panel-2.21.90/gnome-panel/panel-logout.c.logout-focus 2008-02-03 01:48:13.000000000 -0500
++++ gnome-panel-2.21.90/gnome-panel/panel-logout.c 2008-02-03 01:48:19.000000000 -0500
+@@ -449,4 +449,5 @@ panel_logout_new (PanelLogoutDialogType
+
+ gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen);
+ gtk_widget_show (GTK_WIDGET (logout_dialog));
++ gdk_window_focus (GTK_WIDGET (current_dialog)->window, activate_time);
+ }