This is a manual merge of branch drop split view intro trunk.

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

diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c
index 9d1ab65..7377e4e 100644 (file)
--- a/src/hildon2/modest-address-book.c
+++ b/src/hildon2/modest-address-book.c
@@ -365,15 +365,15 @@ commit_contact(EContact * contact, gboolean is_new)
 {
        g_return_if_fail (contact);
        g_return_if_fail (book);
-       
+
        if (!contact || !book)
                return;
-       
+
 #if MODEST_ABOOK_API < 4
        osso_abook_contact_commit(contact, is_new, book);
 #else
        if (OSSO_ABOOK_IS_CONTACT (contact)) {
-               osso_abook_contact_commit(contact, is_new, book, NULL);
+               osso_abook_contact_commit(OSSO_ABOOK_CONTACT(contact), is_new, book, NULL);
        } else {
                e_book_commit_contact (book, contact, NULL);
        }
@@ -899,7 +899,6 @@ select_contacts_for_name_dialog (const gchar *name)
                                                                                   _AB("addr_ti_dia_select_contacts"),
                                                                                   OSSO_ABOOK_CAPS_EMAIL,
                                                                                   OSSO_ABOOK_CONTACT_ORDER_NAME);
-
                osso_abook_contact_chooser_set_model (OSSO_ABOOK_CONTACT_CHOOSER (contact_dialog),
                                                      contact_model);