rpms/gnome-panel/devel gnome-panel-2.16.1-allow-spurious-view-done-signals.patch, NONE, 1.1 gnome-panel.spec, 1.268, 1.269

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15431

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.16.1-allow-spurious-view-done-signals.patch 
Log Message:
- Don't crash with Zimbra connector


gnome-panel-2.16.1-allow-spurious-view-done-signals.patch:

--- NEW FILE gnome-panel-2.16.1-allow-spurious-view-done-signals.patch ---
--- gnome-panel-2.16.1/applets/clock/calendar-client.c.allow-spurious-view-done-signals	2008-01-07 11:50:59.000000000 -0500
+++ gnome-panel-2.16.1/applets/clock/calendar-client.c	2008-01-07 11:54:08.000000000 -0500
@@ -1199,6 +1199,13 @@
 {
   CalendarClientQuery *query;
 
+  if (!source->query_in_progress)
+    {
+      g_warning ("Got spurious 'view-done' signal from calendar backend for query %p\n",
+                 &source->completed_query);
+      return;
+    }
+
   query = goddamn_this_is_crack (source, view, NULL);
   
   dprintf ("Query %p completed: %s\n", query, e_cal_get_error_message (status));


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- gnome-panel.spec	26 Feb 2008 17:36:45 -0000	1.268
+++ gnome-panel.spec	3 Mar 2008 15:56:32 -0000	1.269
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.21.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2
 
@@ -110,6 +110,9 @@
 
 Patch23: sunrise.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=520111
+Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
+
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -156,6 +159,7 @@
 %patch11 -p1 -b .applet-error
 %patch14 -p1 -b .ck-shutdown
 %patch23 -p1 -b .sunrise
+%patch24 -p1 -b .allow-spurious-view-done-signals
 
 . %{SOURCE6}
 
@@ -340,6 +344,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Mar  3 2008 Ray Strode <rstrode at redhat.com> - 2.21.92-2
+- Don't crash with Zimbra connector
+
 * Tue Feb 26 2008 Matthias Clasen <mclasen at redhat.com> - 2.21.92-1
 - Update to 2.21.92