rpms/gnome-panel/F-13 fix-workspace-properties-crash.patch, NONE, 1.1 gnome-panel.spec, 1.384, 1.385

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-panel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5501

Modified Files:
	gnome-panel.spec 
Added Files:
	fix-workspace-properties-crash.patch 
Log Message:
- Attempt to address crash when going to workspace properties


fix-workspace-properties-crash.patch:
 workspace-switcher.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE fix-workspace-properties-crash.patch ---
>From 6ab9cfbe7eaeb5dd89b10677bde2849d5b75211c Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 30 Jun 2010 11:28:07 -0400
Subject: [PATCH] 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.
---
 applets/wncklet/workspace-switcher.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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));
 	
-- 
1.6.5.2



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/F-13/gnome-panel.spec,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -p -r1.384 -r1.385
--- gnome-panel.spec	28 Jun 2010 18:33:49 -0000	1.384
+++ gnome-panel.spec	30 Jun 2010 20:16:51 -0000	1.385
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.30.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 #VCS: git:git://git.gnome.org/gnome-panel
 Source0: http://download.gnome.org/sources/gnome-panel/2.30/%{name}-%{version}.tar.bz2
@@ -104,6 +104,8 @@ Patch10: preferred-apps.patch
 # add a hard dependency on e.g. tomboy
 Patch11: applet-error.patch
 
+Patch12: fix-workspace-properties-crash.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=520111
 Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
 
@@ -166,6 +168,7 @@ Panel Applets using the libpanel-applet 
 %patch9 -p1 -b .desktop-file-monitoring
 %patch10 -p1 -b .preferred-apps
 %patch11 -p1 -b .applet-error
+%patch12 -p1 -b .fix-workspaces-properties-crash
 %patch24 -p1 -b .allow-spurious-view-done-signals
 %patch38 -p1 -b .clock-network
 %patch40 -p1 -b .clock-home
@@ -379,6 +382,9 @@ gtk-update-icon-cache -q %{_datadir}/ico
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Jun 30 2010 Ray Strode <rstrode at redhat.com> 2.30.0-4
+- Attempt to address crash when going to workspace properties
+
 * Mon Jun 28 2010 Matthew Barnes <mbarnes at redhat.com> 2.30.0-3
 - Rebuild against newer libedataserver (for real this time).