evolution r35742 - in trunk: addressbook addressbook/conduit calendar calendar/conduits/calendar calendar/conduits/memo calendar/conduits/todo

[msuman svn gnome org]

Author: msuman
Date: Sun Jul 13 12:53:53 2008
New Revision: 35742
URL: http://svn.gnome.org/viewvc/evolution?rev=35742&view=rev

Log:
Patch from Keith Packard  <keithp keithp com>: Fix for bug #541355 (Remove freed objects from the 'locals' list in each conduit which otherwise frees them again when the conduit is closed.)

Modified:
   trunk/addressbook/ChangeLog
   trunk/addressbook/conduit/address-conduit.c
   trunk/calendar/ChangeLog
   trunk/calendar/conduits/calendar/calendar-conduit.c
   trunk/calendar/conduits/memo/memo-conduit.c
   trunk/calendar/conduits/todo/todo-conduit.c

Modified: trunk/addressbook/conduit/address-conduit.c
==============================================================================
--- trunk/addressbook/conduit/address-conduit.c	(original)
+++ trunk/addressbook/conduit/address-conduit.c	Sun Jul 13 12:53:53 2008
@@ -1774,6 +1774,8 @@
 
 	g_return_val_if_fail (local != NULL, -1);
 
+	ctxt->locals = g_list_remove (ctxt->locals, local);
+
 	addrconduit_destroy_record (local);
 
 	return 0;

Modified: trunk/calendar/conduits/calendar/calendar-conduit.c
==============================================================================
--- trunk/calendar/conduits/calendar/calendar-conduit.c	(original)
+++ trunk/calendar/conduits/calendar/calendar-conduit.c	Sun Jul 13 12:53:53 2008
@@ -2016,6 +2016,8 @@
 
 	g_return_val_if_fail (local != NULL, -1);
 
+	ctxt->locals = g_list_remove (ctxt->locals, local);
+
 	calconduit_destroy_record (local);
 
 	return 0;

Modified: trunk/calendar/conduits/memo/memo-conduit.c
==============================================================================
--- trunk/calendar/conduits/memo/memo-conduit.c	(original)
+++ trunk/calendar/conduits/memo/memo-conduit.c	Sun Jul 13 12:53:53 2008
@@ -1302,6 +1302,8 @@
 
 	g_return_val_if_fail (local != NULL, -1);
 
+	ctxt->locals = g_list_remove (ctxt->locals, local);
+
 	memoconduit_destroy_record (local);
 
 	return 0;

Modified: trunk/calendar/conduits/todo/todo-conduit.c
==============================================================================
--- trunk/calendar/conduits/todo/todo-conduit.c	(original)
+++ trunk/calendar/conduits/todo/todo-conduit.c	Sun Jul 13 12:53:53 2008
@@ -1487,6 +1487,8 @@
 
 	g_return_val_if_fail (local != NULL, -1);
 
+	ctxt->locals = g_list_remove (ctxt->locals, local);
+
 	todoconduit_destroy_record (local);
 
 	return 0;