diff options
| author | Chris Toshok <toshok@ximian.com> | 2004-05-20 09:17:29 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2004-05-20 09:17:29 +0800 |
| commit | 408266b22e32d386d8b2fd5b50117b1755d0e68b (patch) | |
| tree | 3665bc11156438513aba2156a83cf8dfeb1a14c0 /mail | |
| parent | afb051139213e937b7fe160acc185c194a3edf16 (diff) | |
| download | gsoc2013-evolution-408266b22e32d386d8b2fd5b50117b1755d0e68b.tar gsoc2013-evolution-408266b22e32d386d8b2fd5b50117b1755d0e68b.tar.gz gsoc2013-evolution-408266b22e32d386d8b2fd5b50117b1755d0e68b.tar.bz2 gsoc2013-evolution-408266b22e32d386d8b2fd5b50117b1755d0e68b.tar.lz gsoc2013-evolution-408266b22e32d386d8b2fd5b50117b1755d0e68b.tar.xz gsoc2013-evolution-408266b22e32d386d8b2fd5b50117b1755d0e68b.tar.zst gsoc2013-evolution-408266b22e32d386d8b2fd5b50117b1755d0e68b.zip | |
use the new e_book_new_* and e_book_open apis.
2004-05-19 Chris Toshok <toshok@ximian.com>
* importers/pine-importer.c (import_contacts): use the new
e_book_new_* and e_book_open apis.
* em-utils.c (em_utils_in_addressbook): use the new e_book_new_*
and e_book_open apis.
svn path=/trunk/; revision=26001
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/em-utils.c | 7 | ||||
| -rw-r--r-- | mail/importers/pine-importer.c | 6 |
3 files changed, 15 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 63f6dd8502..0716c34fcd 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2004-05-19 Chris Toshok <toshok@ximian.com> + + * importers/pine-importer.c (import_contacts): use the new + e_book_new_* and e_book_open apis. + + * em-utils.c (em_utils_in_addressbook): use the new e_book_new_* + and e_book_open apis. + 2004-05-19 Jeffrey Stedfast <fejj@novell.com> * message-tags.glade: Fixed the icon name to get the right one. diff --git a/mail/em-utils.c b/mail/em-utils.c index 9cf3ff66b4..c82d2c9636 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1732,11 +1732,12 @@ em_utils_in_addressbook(CamelInternetAddress *iaddr) GList *contacts; EBook *book; - book = e_book_new(); - printf(" checking '%s'\n", e_source_get_uri(source)); - if (!e_book_load_source(book, source, TRUE, &err)) { + book = e_book_new(source, &err); + + if (!book + || !e_book_open(book, TRUE, &err)) { printf("couldn't load source?\n"); g_clear_error(&err); g_object_unref(book); diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index 21b0eebf02..8ca7c31c60 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -264,15 +264,15 @@ import_contacts(PineImporter *importer) if (fp == NULL) return; + primary = e_source_list_peek_source_any(source_list); /* FIXME Better error handling */ - if ((book = e_book_new()) == NULL) { + if ((book = e_book_new(primary,NULL)) == NULL) { fclose(fp); g_warning ("Could not create EBook."); return; } - primary = e_source_list_peek_source_any(source_list); - e_book_load_source(book, primary, TRUE, NULL); + e_book_open(book, TRUE, NULL); g_object_unref(primary); g_object_unref(source_list); |