aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index fef76df3c0..47191c10ef 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,13 @@
2004-06-17 Chris Toshok <toshok@ximian.com>
+ [ fixes bug #58696 ]
+
+ * gui/widgets/eab-gui-util.c (eab_transfer_contacts): use
+ addressbook_load instead of e_book_async_open, so we do auth stuff
+ for the destination book.
+
+2004-06-17 Chris Toshok <toshok@ximian.com>
+
* gui/contact-editor/e-contact-editor.c (e_contact_editor_new):
EBookFieldsCallback -> EBookEListCallback.
(e_contact_editor_set_property): same.
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 6dc7dfb5d1..d2303e0f97 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -41,6 +41,7 @@
#include "addressbook/gui/contact-editor/e-contact-editor.h"
#include "addressbook/gui/contact-list-editor/e-contact-list-editor.h"
#include "addressbook/gui/component/addressbook-component.h"
+#include "addressbook/gui/component/addressbook.h"
/* the NULL's in this table correspond to the status codes
that should *never* be generated by a backend */
@@ -665,7 +666,7 @@ eab_transfer_contacts (EBook *source, GList *contacts /* adopted */, gboolean de
process->done_cb = NULL;
dest = e_book_new (destination_source, NULL);
- e_book_async_open (dest, TRUE, got_book_cb, process);
+ addressbook_load (dest, got_book_cb, process);
}
#include <Evolution-Composer.h>