Changes for hildon2 port.

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

diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c
index c7087ca..b636c6e 100644 (file)
--- a/src/maemo/modest-address-book.c
+++ b/src/maemo/modest-address-book.c
@@ -307,9 +307,17 @@ static GSList *get_recipients_for_given_contact(EContact * contact)
 
        /*Launch the 'Add e-mail addr to contact' dialog if required */
        if (email_not_present) {
-               display_name = osso_abook_contact_get_display_name(contact);
-               emailid = get_email_addr_from_user(display_name);
+#if MODEST_ABOOK_API < 4
+               display_name = osso_abook_contact_get_display_name(contact);            
+#else
+               OssoABookContact *abook_contact;
+              
+               abook_contact = osso_abook_contact_new_from_template (contact);
+               display_name = osso_abook_contact_get_display_name(abook_contact);
+               g_object_unref (abook_contact);
+#endif
 
+               emailid = get_email_addr_from_user(display_name);
                if (emailid) {
                        e_contact_set(contact, E_CONTACT_EMAIL_1, emailid);
                        commit_contact(contact, FALSE);
@@ -876,8 +884,9 @@ select_contacts_for_name_dialog (const gchar *name)
 #endif /* MODEST_ABOOK_API < 4 */
                e_book_view_start (book_view);
                
-               contact_view = osso_abook_contact_view_new_basic (contact_model);
+               contact_view = osso_abook_contact_selector_new_basic (contact_model);
                contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view));
+               gtk_window_set_title (GTK_WINDOW (contact_dialog), _("mcen_ti_select_recipients"));
 
                if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK) {
                        result = osso_abook_contact_view_get_selection (OSSO_ABOOK_CONTACT_VIEW (contact_view));