diff options
Diffstat (limited to 'addressbook/gui/widgets')
-rw-r--r-- | addressbook/gui/widgets/e-minicard-control.c | 10 | ||||
-rw-r--r-- | addressbook/gui/widgets/test-minicard-view.c | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c index 36f40d86d5..7cbcfb028a 100644 --- a/addressbook/gui/widgets/e-minicard-control.c +++ b/addressbook/gui/widgets/e-minicard-control.c @@ -249,13 +249,14 @@ static void book_open_cb (EBook *book, EBookStatus status, gpointer closure) { GList *list = closure; - if (book) { + if (status == E_BOOK_STATUS_SUCCESS) { GList *p; for (p = list; p; p = p->next) { e_card_merging_book_add_card(book, p->data, NULL, NULL); } - g_object_unref (book); } + if (book) + g_object_unref (book); e_free_object_list (list); } @@ -273,10 +274,7 @@ save_in_addressbook(GtkWidget *button, gpointer data) for (p = list; p; p = p->next) g_object_ref (p->data); - if (!addressbook_load_default_book (book, book_open_cb, list)) { - g_object_unref (book); - book_open_cb (NULL, E_BOOK_STATUS_OTHER_ERROR, list); - } + addressbook_load_default_book (book, book_open_cb, list); } static void diff --git a/addressbook/gui/widgets/test-minicard-view.c b/addressbook/gui/widgets/test-minicard-view.c index 7abe611711..1a4ff8e07f 100644 --- a/addressbook/gui/widgets/test-minicard-view.c +++ b/addressbook/gui/widgets/test-minicard-view.c @@ -132,10 +132,7 @@ ebook_create (gpointer data) } - if (! e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL)) { - printf ("error calling load_uri!\n"); - } - + e_book_load_uri (book, "file:/tmp/test.db", book_open_cb, NULL); return FALSE; } |