Re: evolution address book conduit issues

[JP Rosevear <jpr ximian com>]

On Tue, 2003-08-12 at 23:46, James Strandboge wrote:
> On Tue, 2003-08-12 at 13:11, JP Rosevear wrote:
> > On Tue, 2003-08-12 at 12:36, Charlie Wood wrote:
> > > On Tue, 2003-08-12 at 17:00, JP Rosevear wrote:
> > > > Yes.  I have tracked one problem with the addressbook conduit to memory
> > > > corruption in evolution itself.  I don't have a backtrace for the crash
> > > > during the partial sync that people have been describing so i'm not sure
> > > > if this is it or not.  If someone could provide that it would be great.
> > > 
> > > As it happens, I was tinkering with this afternoon. This is on an RH8
> > > system, the version details are a few messages back on the list if
> > > required:
> > 
> > Great.  Patch is attached for the evolution conduit.  Should ship with
> > evolution 1.4.5.
> 
> Cool, I have added it to the gnome 2.2 backport for Debian woody.  It
> should hit the mirrors soon, and therefore get more testers.

If you are doing that you may want to add the attached patch as well.

-JP 
-- 
JP Rosevear <jpr ximian com>
Ximian, Inc.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1442
diff -u -p -r1.1442 ChangeLog
--- ChangeLog	27 Jul 2003 22:45:11 -0000	1.1442
+++ ChangeLog	12 Aug 2003 15:27:48 -0000
@@ -1,3 +1,8 @@
+2003-08-12  Rodrigo Moya <rodrigo ximian com>
+
+	* backend/ebook/e-book.c (e_book_dispose): unref the
+	EComponentListener before unloading the CORBA object.
+
 2003-07-23  Chris Toshok  <toshok ximian com>
 
 	* printing/e-contact-print.c (e_contact_print_response): deal with
Index: backend/ebook/e-book.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-book.c,v
retrieving revision 1.75
diff -u -p -r1.75 e-book.c
--- backend/ebook/e-book.c	27 Jul 2003 22:32:38 -0000	1.75
+++ backend/ebook/e-book.c	12 Aug 2003 15:27:49 -0000
@@ -1592,6 +1592,12 @@ e_book_dispose (GObject *object)
 		CORBA_Environment  ev;
 		GList *l;
 
+		if (book->priv->comp_listener) {
+			g_signal_handler_disconnect (book->priv->comp_listener, book->priv->died_signal);
+			g_object_unref (book->priv->comp_listener);
+			book->priv->comp_listener = NULL;
+		}
+
 		if (book->priv->load_state == URILoaded)
 			e_book_unload_uri (book);
 
@@ -1615,12 +1621,6 @@ e_book_dispose (GObject *object)
 			book->priv->listener = NULL;
 		}
 		
-		if (book->priv->comp_listener) {
-			g_signal_handler_disconnect (book->priv->comp_listener, book->priv->died_signal);
-			g_object_unref (book->priv->comp_listener);
-			book->priv->comp_listener = NULL;
-		}
-
 		g_free (book->priv->cap);
 
 		g_free (book->priv->uri);