* Fixes NB#97180, fixes a logical string

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

diff --git a/src/hildon2/modest-address-book.c b/src/hildon2/modest-address-book.c
index 0b3ba27..94bb618 100644 (file)
--- a/src/hildon2/modest-address-book.c
+++ b/src/hildon2/modest-address-book.c
@@ -373,9 +373,12 @@ commit_contact(EContact * contact, gboolean is_new)
        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);
+               if (is_new)
+                       e_book_add_contact (book, contact, NULL);
+               else
+                       e_book_commit_contact (book, contact, NULL);
        }
 #endif /* MODEST_ABOOK_API < 2 */
 }
@@ -465,7 +468,7 @@ run_add_email_addr_to_contact_dlg(const gchar * contact_name)
        gboolean run_dialog = TRUE;
 
        add_email_addr_to_contact_dlg =
-           gtk_dialog_new_with_buttons(_("mcen_ti_add_email_title"), NULL,
+           gtk_dialog_new_with_buttons(_AB("addr_ti_sel_contact"), NULL,
                                        GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
                                        _HL("wdgt_bd_done"), GTK_RESPONSE_ACCEPT, NULL);
        gtk_dialog_set_has_separator(GTK_DIALOG(add_email_addr_to_contact_dlg), FALSE);
@@ -504,7 +507,7 @@ run_add_email_addr_to_contact_dlg(const gchar * contact_name)
                                if ((invalid_char_offset != NULL)&&(*invalid_char_offset != '\0')) {
                                        gchar *char_in_string = g_strdup_printf ("%c", *invalid_char_offset);
                                        gchar *message = g_strdup_printf(
-                                               dgettext("hildon-common-strings", "ckdg_ib_illegal_characters_entered"), 
+                                               _CS("ckdg_ib_illegal_characters_entered"), 
                                                char_in_string);
                                        hildon_banner_show_information (
                                                add_email_addr_to_contact_dlg, NULL, message );
@@ -680,7 +683,7 @@ show_check_names_banner (gpointer userdata)
        GtkWidget **banner = (GtkWidget **) userdata;
 
        gdk_threads_enter ();
-       *banner = modest_platform_animation_banner (NULL, NULL, _("mail_ib_checking_names"));
+       *banner = hildon_banner_show_animation (NULL, NULL, _("mail_ib_checking_names"));
        gdk_threads_leave ();
 
        return FALSE;
@@ -750,9 +753,9 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
                if (!modest_text_utils_validate_recipient (address, &invalid_char_position)) {
                        if ((invalid_char_position != NULL) && (*invalid_char_position != '\0')) {
                                gchar *char_in_string = g_strdup_printf("%c", *invalid_char_position);
-                               gchar *message = g_strdup_printf(
-                                       dgettext("hildon-common-strings", "ckdg_ib_illegal_characters_entered"), 
-                                       char_in_string);
+                               gchar *message = 
+                                       g_strdup_printf(_CS("ckdg_ib_illegal_characters_entered"), 
+                                                       char_in_string);
                                g_free (char_in_string);
                                hildon_banner_show_information (NULL, NULL, message );
                                g_free (message);                               
@@ -899,7 +902,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);