r25152 - in /desktop/unstable/gnome-panel/debian: changelog patches/30_crasher_realize.patch patches/31_crasher_pager.patch patches/series

Sat Sep 18 08:31:59 UTC 2010

Author: joss
Date: Sat Sep 18 08:31:59 2010
New Revision: 25152

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25152
Log:
30_crasher_realize.patch, 31_crasher_pager.patch: stolen upstream. 
Fix a pair of crashers that had been here for a long time.

Added:
    desktop/unstable/gnome-panel/debian/patches/30_crasher_realize.patch
    desktop/unstable/gnome-panel/debian/patches/31_crasher_pager.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=25152&op=diff
==============================================================================

--- desktop/unstable/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog [utf-8] Sat Sep 18 08:31:59 2010
@@ -1,12 +1,14 @@
-gnome-panel (2.30.2-2) UNRELEASED; urgency=low
+gnome-panel (2.30.2-2) unstable; urgency=low
 
   * 03_tasklist_orientation.patch: new patch. Pass the task list 
     orientation for the applet. It should fix #524117 for good.
     Closes: #592781
   * Require libwnck 2.30.0-3 for the new API.
   * Demote gnome-control-center to Recommends.
-
- -- Josselin Mouette <joss at debian.org>  Tue, 13 Jul 2010 19:34:03 +0200
+  * 30_crasher_realize.patch, 31_crasher_pager.patch: stolen upstream. 
+    Fix a pair of crashers that had been here for a long time.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 18 Sep 2010 10:31:50 +0200
 
 gnome-panel (2.30.2-1) unstable; urgency=low
 

Added: desktop/unstable/gnome-panel/debian/patches/30_crasher_realize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/30_crasher_realize.patch?rev=25152&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/30_crasher_realize.patch (added)
+++ desktop/unstable/gnome-panel/debian/patches/30_crasher_realize.patch [utf-8] Sat Sep 18 08:31:59 2010
@@ -1,0 +1,34 @@
+From a2498c7aa29a155fbf707bbcb07580353979329c Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Thu, 01 Jul 2010 18:08:50 +0000
+Subject: Don't show applet until after connecting to realize
+
+Otherwise, the realize signals may run before the handler
+is hooked up, causing crashes down the line.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=472773
+---
+diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
+index 8e2a08e..02d18a8 100644
+--- a/applets/wncklet/workspace-switcher.c
++++ b/applets/wncklet/workspace-switcher.c
+@@ -546,8 +546,6 @@ workspace_switcher_applet_fill (PanelApplet *applet)
+ 	 * environments. See wnck_pager_set_orientation() doc */
+ 	pager_update (pager);
+ 
+-	gtk_widget_show (pager->applet);
+-
+ 	g_signal_connect (G_OBJECT (pager->applet),
+ 			  "realize",
+ 			  G_CALLBACK (applet_realized),
+@@ -569,6 +567,8 @@ workspace_switcher_applet_fill (PanelApplet *applet)
+ 			  G_CALLBACK (applet_change_background),
+ 			  pager);
+ 
++	gtk_widget_show (pager->applet);
++
+ 	panel_applet_set_background_widget (PANEL_APPLET (pager->applet),
+ 					    GTK_WIDGET (pager->applet));
+ 	
+--
+cgit v0.8.3.1

Added: desktop/unstable/gnome-panel/debian/patches/31_crasher_pager.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/31_crasher_pager.patch?rev=25152&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/31_crasher_pager.patch (added)
+++ desktop/unstable/gnome-panel/debian/patches/31_crasher_pager.patch [utf-8] Sat Sep 18 08:31:59 2010
@@ -1,0 +1,31 @@
+From c34e25bc9519eee11334f30857f66a8483bd32f7 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Thu, 01 Jul 2010 18:11:40 +0000
+Subject: Drop up front call to pager_update
+
+It's going to get called at realize time anyway,
+and calling it early can actually be counter-productive,
+since it checks state that may not be properly
+initialized yet.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=472773
+(cherry picked from commit 819b938de2b1c1805e2dc6b69866418a361c5244)
+---
+diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
+index 02d18a8..584eec2 100644
+--- a/applets/wncklet/workspace-switcher.c
++++ b/applets/wncklet/workspace-switcher.c
+@@ -541,11 +541,6 @@ workspace_switcher_applet_fill (PanelApplet *applet)
+ 	gtk_container_add (GTK_CONTAINER (pager->applet), pager->pager);
+ 	gtk_widget_show (pager->pager);
+ 
+-	/* we need to call this after the pager has been added to the
+-	 * container, else it might not work in some cases in multiscreen
+-	 * environments. See wnck_pager_set_orientation() doc */
+-	pager_update (pager);
+-
+ 	g_signal_connect (G_OBJECT (pager->applet),
+ 			  "realize",
+ 			  G_CALLBACK (applet_realized),
+--
+cgit v0.8.3.1

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=25152&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series [utf-8] Sat Sep 18 08:31:59 2010
@@ -3,5 +3,7 @@
 03_tasklist_orientation.patch
 06_clock_permissions.patch
 09_default_icons.patch
+30_crasher_realize.patch
+31_crasher_pager.patch
 70_relibtoolize.patch
 99_ltmain_as-needed.patch


