[evolution-patches] patch for EComponentListener usage in addressbook



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);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]