r13099 - in /desktop/unstable/gnome-panel/debian: changelog patches/02_switch-user_lock.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Oct 13 16:22:55 2007
New Revision: 13099

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13099
Log:
* 02_switch-user_lock.patch: don't call gtk_window_get_screen on an 
  already destroyed object.

Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/patches/02_switch-user_lock.patch

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=13099&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog (original)
+++ desktop/unstable/gnome-panel/debian/changelog Sat Oct 13 16:22:55 2007
@@ -1,3 +1,10 @@
+gnome-panel (2.20.0.1-3) unstable; urgency=low
+
+  * 02_switch-user_lock.patch: don't call gtk_window_get_screen on an 
+    already destroyed object.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 13 Oct 2007 00:13:54 +0200
+
 gnome-panel (2.20.0.1-2) unstable; urgency=low
 
   * 02_switch-user_lock.patch: new patch; lock screen when switching

Modified: desktop/unstable/gnome-panel/debian/patches/02_switch-user_lock.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/02_switch-user_lock.patch?rev=13099&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/02_switch-user_lock.patch (original)
+++ desktop/unstable/gnome-panel/debian/patches/02_switch-user_lock.patch Sat Oct 13 16:22:55 2007
@@ -1,5 +1,5 @@
---- gnome-panel/panel-logout.c.orig	2007-10-07 03:53:54.866499947 +0200
-+++ gnome-panel/panel-logout.c	2007-10-07 04:12:44.186856247 +0200
+--- gnome-panel/panel-logout.c.orig	2007-10-13 00:01:41.928750440 +0200
++++ gnome-panel/panel-logout.c	2007-10-13 00:12:52.526965655 +0200
 @@ -35,6 +35,7 @@
  #include "panel-power-manager.h"
  #include "panel-session.h"
@@ -8,11 +8,30 @@
  
  #define PANEL_LOGOUT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PANEL_TYPE_LOGOUT_DIALOG, PanelLogoutDialogPrivate))
  
-@@ -181,6 +182,7 @@
+@@ -169,8 +170,10 @@
+ 		       gpointer   data)
+ {
+ 	PanelPowerManager *power_manager;
++	GdkScreen *screen;
+ 
+ 	power_manager = g_object_ref (logout_dialog->priv->power_manager);
++	screen = g_object_ref (gtk_window_get_screen (GTK_WINDOW (logout_dialog)));
+ 	gtk_widget_destroy (GTK_WIDGET (logout_dialog));
+ 
+ 	switch (response_id) {
+@@ -181,6 +184,7 @@
  		panel_session_request_logout ();
  		break;
  	case PANEL_LOGOUT_RESPONSE_SWITCH_USER:
-+		panel_lock_screen (gtk_window_get_screen (GTK_WINDOW (logout_dialog)));
++		panel_lock_screen (screen);
  		gdm_new_login ();
  		break;
  	case PANEL_LOGOUT_RESPONSE_SHUTDOWN:
+@@ -206,6 +210,7 @@
+ 		g_assert_not_reached ();
+ 	}
+ 	g_object_unref (power_manager);
++	g_object_unref (screen);
+ }
+ 
+ static gboolean