* fix the fallout of the configuration changes - builds again now

[modest] / src / maemo / modest-address-book.c

diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c
index eccf77f..fc4d186 100644 (file)
--- a/src/maemo/modest-address-book.c
+++ b/src/maemo/modest-address-book.c
@@ -164,7 +164,7 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
        toplevel = gtk_widget_get_toplevel (GTK_WIDGET (recpt_editor));
 
        contact_model = osso_abook_contact_model_new ();
-       if (!open_addressbook_sync ()) {
+       if (!open_addressbook ()) {
                if (contact_model) {
                        g_object_unref (contact_model);
                        contact_model = NULL;
@@ -176,7 +176,6 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
        osso_abook_contact_selector_set_minimum_selection (OSSO_ABOOK_CONTACT_SELECTOR (contact_view), 1);
 
        contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view));
-       osso_abook_select_dialog_set_new_contact (OSSO_ABOOK_SELECT_DIALOG (contact_dialog), TRUE);
        gtk_window_set_title (GTK_WINDOW (contact_dialog), _("mcen_ti_select_recipients"));
 
        gtk_widget_show (contact_dialog);
@@ -326,7 +325,7 @@ commit_contact(EContact * contact)
        if (!contact || !book)
                return;
 
-#ifdef MODEST_HILDON_VERSION_0 
+#ifdef MODEST_HAVE_OLD_ABOOK   
        osso_abook_contact_commit(contact, FALSE, book);
 #else
        osso_abook_contact_commit(contact, FALSE, book, NULL);
@@ -627,7 +626,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor)
                        } else {
                                /* this address is not valid, select it and return control to user showing banner */
 
-                               hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_mail"));
+                               hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_email"));
                                result = FALSE;
                        }
                }