[evolution-patches] fix for addressbook bug #61299

[Chris Toshok <toshok ximian com>]

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1787
diff -u -r1.1787 ChangeLog
--- ChangeLog	2 Jul 2004 18:32:18 -0000	1.1787
+++ ChangeLog	9 Jul 2004 02:07:47 -0000
@@ -1,3 +1,12 @@
+2004-07-08  Chris Toshok  <toshok ximian com>
+
+	[ fixes #61299 ]
+	
+	* gui/component/addressbook.c (addressbook_load_default_book):
+	don't pass @closure to load_source_cb, since that expects to get a
+	LoadSourceData*.  also, don't always call e_book_async_open.  only
+	do that when the book is non-NULL.
+
 2004-07-02  Hans Petter Jansson  <hpj ximian com>
 
 	* gui/contact-list-editor/e-contact-list-editor.c
Index: gui/component/addressbook.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook.c,v
retrieving revision 1.237
diff -u -r1.237 addressbook.c
--- gui/component/addressbook.c	17 Jun 2004 21:59:36 -0000	1.237
+++ gui/component/addressbook.c	9 Jul 2004 02:07:47 -0000
@@ -280,7 +280,7 @@
 
 	book = e_book_new_default_addressbook (NULL);
 	if (!book)
-		load_source_cb (NULL, E_BOOK_ERROR_OTHER_ERROR, closure); /* XXX we should just use a GError and it's error code here */
-
-	e_book_async_open (book, FALSE, default_book_cb, load_source_data);
+		load_source_cb (NULL, E_BOOK_ERROR_OTHER_ERROR, load_source_data); /* XXX we should just use a GError and it's error code here */
+	else
+		e_book_async_open (book, FALSE, default_book_cb, load_source_data);
 }