r15889 - in /desktop/unstable/gnome-panel/debian: changelog patches/04_logout-center.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sun May 11 00:32:15 2008
New Revision: 15889

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15889
Log:
04_logout-center.patch: stolen from upstream SVN. Center and focus 
the logout dialog.

Added:
    desktop/unstable/gnome-panel/debian/patches/04_logout-center.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/patches/series

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=15889&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog (original)
+++ desktop/unstable/gnome-panel/debian/changelog Sun May 11 00:32:15 2008
@@ -1,3 +1,10 @@
+gnome-panel (2.20.3-4) unstable; urgency=low
+
+  * 04_logout-center.patch: stolen from upstream SVN. Center and focus 
+    the logout dialog.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 11 May 2008 02:21:54 +0200
+
 gnome-panel (2.20.3-3) unstable; urgency=low
 
   * 03_gnome-panel-logout.patch: correctly call gtk_main_quit to avoid

Added: desktop/unstable/gnome-panel/debian/patches/04_logout-center.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/04_logout-center.patch?rev=15889&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/04_logout-center.patch (added)
+++ desktop/unstable/gnome-panel/debian/patches/04_logout-center.patch Sun May 11 00:32:15 2008
@@ -1,0 +1,32 @@
+Debian #478318
+GNOME #514026
+Upstream commit r10815
+
+Index: gnome-panel-2.20.3/gnome-panel/panel-logout.c
+===================================================================
+--- gnome-panel-2.20.3.orig/gnome-panel/panel-logout.c	2008-05-11 02:17:51.771422457 +0200
++++ gnome-panel-2.20.3/gnome-panel/panel-logout.c	2008-05-11 02:18:09.759921670 +0200
+@@ -25,6 +25,8 @@
+ 
+ #include <config.h>
+ 
++#include <string.h>
++
+ #include <glib/gi18n.h>
+ #include <gtk/gtkimage.h>
+ #include <gtk/gtklabel.h>
+@@ -141,6 +143,8 @@ panel_logout_init (PanelLogoutDialog *lo
+ 	gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE);
+ 	gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE);
+ 	gtk_window_stick (GTK_WINDOW (logout_dialog));
++	gtk_window_set_position (GTK_WINDOW (logout_dialog),
++				 GTK_WIN_POS_CENTER_ALWAYS);
+ 
+ 	logout_dialog->priv->power_manager = panel_get_power_manager ();
+ 
+@@ -399,4 +403,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);
+ }

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=15889&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series (original)
+++ desktop/unstable/gnome-panel/debian/patches/series Sun May 11 00:32:15 2008
@@ -1,6 +1,7 @@
 01_panel_submenus.patch
 02_switch-user_lock.patch
 03_gnome-panel-logout.patch
+04_logout-center.patch
 05_missing_includes.patch
 60_caldav-clock-appointments.patch
 70_relibtoolize.patch