diff options
Diffstat (limited to 'modules/addressbook')
| -rw-r--r-- | modules/addressbook/e-book-shell-backend.c | 12 | ||||
| -rw-r--r-- | modules/addressbook/e-book-shell-view-private.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index d0340f7974..652b7a5a73 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -230,7 +230,7 @@ book_shell_backend_init_importers (void) static void book_shell_backend_new_contact_cb (EBook *book, - EBookStatus status, + const GError *error, gpointer user_data) { EShell *shell; @@ -238,7 +238,7 @@ book_shell_backend_new_contact_cb (EBook *book, EABEditor *editor; /* XXX Handle errors better. */ - if (status != E_BOOK_ERROR_OK) + if (error) return; contact = e_contact_new (); @@ -255,7 +255,7 @@ book_shell_backend_new_contact_cb (EBook *book, static void book_shell_backend_new_contact_list_cb (EBook *book, - EBookStatus status, + const GError *error, gpointer user_data) { EShell *shell; @@ -263,7 +263,7 @@ book_shell_backend_new_contact_list_cb (EBook *book, EABEditor *editor; /* XXX Handle errors better. */ - if (status != E_BOOK_ERROR_OK) + if (error) return; contact = e_contact_new (); @@ -317,12 +317,12 @@ action_contact_new_cb (GtkAction *action, book = e_book_new_default_addressbook (NULL); if (strcmp (action_name, "contact-new") == 0) - e_book_async_open ( + e_book_async_open_ex ( book, FALSE, book_shell_backend_new_contact_cb, shell); if (strcmp (action_name, "contact-new-list") == 0) - e_book_async_open ( + e_book_async_open_ex ( book, FALSE, book_shell_backend_new_contact_list_cb, shell); } diff --git a/modules/addressbook/e-book-shell-view-private.c b/modules/addressbook/e-book-shell-view-private.c index 4008cfa1f7..4482383331 100644 --- a/modules/addressbook/e-book-shell-view-private.c +++ b/modules/addressbook/e-book-shell-view-private.c @@ -177,7 +177,7 @@ contacts_removed (EBookShellView *book_shell_view, static void book_open_cb (EBook *book, - EBookStatus status, + const GError *error, gpointer user_data) { EAddressbookView *view = user_data; @@ -187,11 +187,11 @@ book_open_cb (EBook *book, source = e_book_get_source (book); model = e_addressbook_view_get_model (view); - if (status == E_BOOK_ERROR_OK) { + if (!error) { e_addressbook_model_set_book (model, book); e_addressbook_model_force_folder_bar_message (model); - } else if (status != E_BOOK_ERROR_CANCELLED) - eab_load_error_dialog (NULL /* XXX */, source, status); + } else if (!g_error_matches (error, E_BOOK_ERROR, E_BOOK_ERROR_CANCELLED)) + eab_load_error_dialog (NULL /* XXX */, source, error); } static void |