diff options
Diffstat (limited to 'addressbook/gui/component')
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 25 | ||||
| -rw-r--r-- | addressbook/gui/component/e-address-widget.c | 2 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names-popup.c | 2 |
3 files changed, 6 insertions, 23 deletions
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 1ef6b1675c..e60c383cb9 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -395,7 +395,7 @@ owner_unset_cb (EvolutionShellComponent *shell_component, /* FIXME We should perhaps take the time to figure out if the book is editable. */ static void -local_addressbook_cb (EBook *book, gpointer closure) +new_item_cb (EBook *book, gpointer closure) { gboolean is_list = GPOINTER_TO_INT (closure); if (book == NULL) @@ -407,15 +407,6 @@ local_addressbook_cb (EBook *book, gpointer closure) } static void -nonlocal_addressbook_cb (EBook *book, EBookStatus status, gpointer closure) -{ - if (status == E_BOOK_STATUS_SUCCESS) - local_addressbook_cb (book, closure); - else - local_addressbook_cb (NULL, closure); -} - -static void user_create_new_item_cb (EvolutionShellComponent *shell_component, const char *id, const char *parent_folder_physical_uri, @@ -432,18 +423,10 @@ user_create_new_item_cb (EvolutionShellComponent *shell_component, return; } if (IS_CONTACT_TYPE (parent_folder_type)) { - EBook *book; - gchar *uri; - - book = e_book_new (); - uri = g_strdup_printf ("%s/addressbook.db", parent_folder_physical_uri); - - if (addressbook_load_uri (book, uri, nonlocal_addressbook_cb, GINT_TO_POINTER (is_contact_list)) == 0) - g_warning ("Couldn't load addressbook %s", uri); - - g_free (uri); + e_book_use_address_book_by_uri (parent_folder_physical_uri, + new_item_cb, GINT_TO_POINTER (is_contact_list)); } else { - e_book_use_local_address_book (local_addressbook_cb, GINT_TO_POINTER (is_contact_list)); + e_book_use_default_book (new_item_cb, GINT_TO_POINTER (is_contact_list)); } } diff --git a/addressbook/gui/component/e-address-widget.c b/addressbook/gui/component/e-address-widget.c index d044ddf7b9..d01999d34f 100644 --- a/addressbook/gui/component/e-address-widget.c +++ b/addressbook/gui/component/e-address-widget.c @@ -298,7 +298,7 @@ query_idle_fn (gpointer ptr) if (common_book) { e_address_widget_do_query (addr); } else { - e_book_load_local_address_book (e_book_new (), book_ready_cb, addr); + e_book_load_default_book (e_book_new (), book_ready_cb, addr); } addr->query_idle_tag = 0; diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c index 442a00b6c1..927bdff769 100644 --- a/addressbook/gui/component/select-names/e-select-names-popup.c +++ b/addressbook/gui/component/select-names/e-select-names-popup.c @@ -123,7 +123,7 @@ edit_contact_info_cb (GtkWidget *w, gpointer user_data) return; gtk_object_ref (GTK_OBJECT (info->dest)); - e_book_use_local_address_book (make_contact_editor_cb, (gpointer) info->dest); + e_book_use_default_book (make_contact_editor_cb, (gpointer) info->dest); } static void |