rpms/gnome-panel/devel gnome-panel-2.10.1-fix-recent-items-crash.patch, NONE, 1.1 gnome-panel.spec, 1.66, 1.67

[fedora-cvs-commits at redhat.com]

Author: markmc

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16855

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.10.1-fix-recent-items-crash.patch 
Log Message:
* Wed May  4 2005 Mark McLoughlin <markmc at redhat.com> 2.10.1-9
- Fix crash with "Recent Documents" menu (bug #156633)


gnome-panel-2.10.1-fix-recent-items-crash.patch:
 egg-recent-model.c |    6 ++++++
 panel-recent.c     |    1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE gnome-panel-2.10.1-fix-recent-items-crash.patch ---
--- gnome-panel-2.10.1/gnome-panel/panel-recent.c.fix-recent-items-crash	2005-05-04 15:44:22.000000000 +0100
+++ gnome-panel-2.10.1/gnome-panel/panel-recent.c	2005-05-04 15:44:34.000000000 +0100
@@ -234,7 +234,6 @@
 				 menu_item, 0);
 
 	view = egg_recent_view_gtk_new (menu, NULL);
-	g_object_unref (G_OBJECT (menu));
 
 	egg_recent_view_gtk_set_tooltip_func (view,
 					      recent_documents_tooltip_func,
--- gnome-panel-2.10.1/gnome-panel/egg-recent-model.c.fix-recent-items-crash	2005-05-04 15:42:57.000000000 +0100
+++ gnome-panel-2.10.1/gnome-panel/egg-recent-model.c	2005-05-04 15:43:48.000000000 +0100
@@ -643,6 +643,8 @@
 static gboolean
 egg_recent_model_changed_timeout (EggRecentModel *model)
 {
+	model->priv->changed_timeout = 0;
+
 	egg_recent_model_changed (model);
 
 	return FALSE;
@@ -929,6 +931,10 @@
 {
 	EggRecentModel *model = EGG_RECENT_MODEL (object);
 
+	if (model->priv->changed_timeout > 0) {
+		g_source_remove (model->priv->changed_timeout);
+	}
+
 	egg_recent_model_monitor (model, FALSE);
 
 


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gnome-panel.spec	2 May 2005 13:18:24 -0000	1.66
+++ gnome-panel.spec	4 May 2005 15:00:27 -0000	1.67
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.10.1
-Release: 8
+Release: 9
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -74,6 +74,7 @@
 Patch1: gnome-panel-2.10.0-remove-screenshot-menuitem.patch
 Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
 Patch3: gnome-panel-2.10.1-no-huge-icons.patch
+Patch4: gnome-panel-2.10.1-fix-recent-items-crash.patch
 
 %description
 
@@ -99,6 +100,7 @@
 %patch1 -p1 -b .remove-screenshot-menuitem
 %patch2 -p1 -b .speak-to-us-ye-old-wise-fish
 %patch3 -p1 -b .no-huge-icons
+%patch4 -p1 -b .fix-recent-items-crash
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE3} gnome-panel/panel-compatibility.schemas
@@ -237,6 +239,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed May  4 2005 Mark McLoughlin <markmc at redhat.com> 2.10.1-9
+- Fix crash with "Recent Documents" menu (bug #156633)
+
 * Mon May  2 2005 Mark McLoughlin <markmc at redhat.com> 2.10.1-8
 - Update to new OpenOffice.org .desktop file locations in
   openoffice.org-1.9.97-3 (bug #156064)