diff options
| author | Ray Strode <rstrode@fedoraproject.org> | 2008-03-03 15:56:32 +0000 |
|---|---|---|
| committer | Ray Strode <rstrode@fedoraproject.org> | 2008-03-03 15:56:32 +0000 |
| commit | c492a07409b777ea4582680217885f6ba86b2bd0 (patch) | |
| tree | 5dad1f49ca7b7339f7122d20184077d503261938 | |
| parent | ae8b76dc7dd6b1b242432f24cfab3a2a5b41df55 (diff) | |
| download | gnome-panel-c492a07409b777ea4582680217885f6ba86b2bd0.tar.gz gnome-panel-c492a07409b777ea4582680217885f6ba86b2bd0.tar.xz gnome-panel-c492a07409b777ea4582680217885f6ba86b2bd0.zip | |
- Don't crash with Zimbra connector
| -rw-r--r-- | gnome-panel-2.16.1-allow-spurious-view-done-signals.patch | 16 | ||||
| -rw-r--r-- | gnome-panel.spec | 9 |
2 files changed, 24 insertions, 1 deletions
diff --git a/gnome-panel-2.16.1-allow-spurious-view-done-signals.patch b/gnome-panel-2.16.1-allow-spurious-view-done-signals.patch new file mode 100644 index 0000000..fcc0854 --- /dev/null +++ b/gnome-panel-2.16.1-allow-spurious-view-done-signals.patch @@ -0,0 +1,16 @@ +--- 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)); diff --git a/gnome-panel.spec b/gnome-panel.spec index 308b851..a7e286e 100644 --- a/gnome-panel.spec +++ b/gnome-panel.spec @@ -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 @@ Patch14: gnome-panel-2.21.5-ck-shutdown.patch 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 @@ Panel Applets using the libpanel-applet library. %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 @@ fi %{_datadir}/gtk-doc/html/* %changelog +* Mon Mar 3 2008 Ray Strode <rstrode@redhat.com> - 2.21.92-2 +- Don't crash with Zimbra connector + * Tue Feb 26 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.92-1 - Update to 2.21.92 |