X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-address-book.c;h=ddb1a7e0b1f05ddc54f88bd9548f819a104d994d;hp=315b44287324ac9094f2c9cc04f62bbd65850bff;hb=c04e24ad16b9a570a1152ec2c05c953fe39a3c3c;hpb=730da4159fabadc042bdfd5525b26f9014f1764e

diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c
index 315b442..ddb1a7e 100644
--- a/src/maemo/modest-address-book.c
+++ b/src/maemo/modest-address-book.c
@@ -163,7 +163,6 @@ 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 ()) {
 		if (contact_model) {
 			g_object_unref (contact_model);
@@ -171,12 +170,12 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor)
 		}
 		return;
 	}
+	contact_model = osso_abook_contact_model_new ();
 
 	contact_view = osso_abook_contact_selector_new_basic (contact_model);
 	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);
@@ -603,7 +602,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor)
 		if (!modest_text_utils_validate_recipient (address)) {
 			if (strstr (address, "@") == NULL) {
 				/* here goes searching in addressbook */
-				gchar *contact_id = NULL;;
+				gchar *contact_id = NULL;
 				GSList *resolved_addresses = NULL;
 				result = resolve_address (address, &resolved_addresses, &contact_id);
 
@@ -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;
 			}
 		}