r15322 - in /desktop/experimental/gnome-panel/debian: changelog patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch patches/series

[lool at users.alioth.debian.org]

Author: lool
Date: Wed Mar 19 13:13:59 2008
New Revision: 15322

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15322
Log:
New patch, 90_dont-cleanup-calendard-backend-when-not-loaded, avoids
  crashing when shutting down evolution forcefully as intlclock tries to
  cleanup data from the calendar backend it didn't load; GNOME #378854.

Added:
    desktop/experimental/gnome-panel/debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch
Modified:
    desktop/experimental/gnome-panel/debian/changelog
    desktop/experimental/gnome-panel/debian/patches/series

Modified: desktop/experimental/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/changelog?rev=15322&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/changelog (original)
+++ desktop/experimental/gnome-panel/debian/changelog Wed Mar 19 13:13:59 2008
@@ -2,6 +2,9 @@
 
   * Refresh patches 02_switch-user_lock, 03_gnome-panel-logout,
     60_caldav-clock-appointments and 99_ltmain_as-needed to apply cleanly.
+  * New patch, 90_dont-cleanup-calendard-backend-when-not-loaded, avoids
+    crashing when shutting down evolution forcefully as intlclock tries to
+    cleanup data from the calendar backend it didn't load; GNOME #378854.
 
  -- Loic Minier <lool at dooz.org>  Wed, 19 Mar 2008 14:09:13 +0100
 

Added: desktop/experimental/gnome-panel/debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch?rev=15322&op=file
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch (added)
+++ desktop/experimental/gnome-panel/debian/patches/90_dont-cleanup-calendard-backend-when-not-loaded.patch Wed Mar 19 13:13:59 2008
@@ -1,0 +1,15 @@
+GNOME #378854; don't clean calendar backend if it wasn't loaded
+
+--- a/applets/clock/calendar-sources.c	2008-03-19 14:11:38.000000000 +0100
++++ b/applets/clock/calendar-sources.c	2008-03-19 14:12:09.000000000 +0100
+@@ -429,6 +429,10 @@
+ {
+   const char *uristr;
+ 
++  /* As far as I know if the source data isn't loaded we don't
++     care if the backend dies */
++  if (!source_data->loaded)
++    return;
+   source_data->clients = g_slist_remove (source_data->clients, client);
+   if (g_slist_length (source_data->clients) < 1) 
+     {

Modified: desktop/experimental/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/series?rev=15322&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/series (original)
+++ desktop/experimental/gnome-panel/debian/patches/series Wed Mar 19 13:13:59 2008
@@ -3,4 +3,5 @@
 03_gnome-panel-logout.patch
 60_caldav-clock-appointments.patch
 70_relibtoolize.patch
+90_dont-cleanup-calendard-backend-when-not-loaded.patch
 99_ltmain_as-needed.patch