#else /* MODEST_ABOOK_API < 4 */
/* TODO: figure out how to make the contact chooser modal */
contact_chooser = osso_abook_contact_chooser_new_with_capabilities (NULL,
- _("mcen_me_editor_selectrecipients"),
+ _AB("addr_ti_dia_select_contacts"),
OSSO_ABOOK_CAPS_EMAIL,
OSSO_ABOOK_CONTACT_ORDER_NAME);
/* Enable multiselection */
{
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);
+ if (is_new)
+ e_book_add_contact (book, contact, NULL);
+ else
+ e_book_commit_contact (book, contact, NULL);
}
#endif /* MODEST_ABOOK_API < 2 */
}
add_email_addr_to_contact_dlg =
gtk_dialog_new_with_buttons(_("mcen_ti_add_email_title"), NULL,
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT,
- _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, NULL);
+ _HL("wdgt_bd_done"), GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_set_has_separator(GTK_DIALOG(add_email_addr_to_contact_dlg), FALSE);
/*Set app_name & state_save related tags to the window */
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 );
gtk_dialog_new_with_buttons(_("mcen_ti_select_email_title"),
NULL,
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- _("mcen_bd_dialog_ok"), GTK_RESPONSE_ACCEPT,
- _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, NULL);
+ _HL("wdgt_bd_done"), GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_set_has_separator(GTK_DIALOG(select_email_addr_dlg), FALSE);
/* Make the window approximately big enough, because it doesn't resize to be big enough
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;
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);
/* TODO: figure out how to make the contact chooser modal */
contact_dialog = osso_abook_contact_chooser_new_with_capabilities (NULL,
- _("mcen_me_editor_selectrecipients"),
- OSSO_ABOOK_CAPS_EMAIL,
+ _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);