}
account = osso_abook_account_get (EVC_EMAIL, NULL, address);
- dialog = osso_abook_add_to_contacts_dialog_new (contact_model, account);
- g_object_unref (account);
- gtk_dialog_run (GTK_DIALOG (dialog));
+ if (account)
+ {
+ dialog = osso_abook_add_to_contacts_dialog_new (contact_model, account);
+ g_object_unref (account);
+ gtk_dialog_run (GTK_DIALOG (dialog));
- if (contact_model) {
- g_object_unref (contact_model);
- contact_model = NULL;
- }
+ if (contact_model) {
+ g_object_unref (contact_model);
+ contact_model = NULL;
+ }
- gtk_widget_destroy (dialog);
+ gtk_widget_destroy (dialog);
+ }
}
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);
}
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);
g_list_free (contacts_list);
}
- if (contact_view) {
- g_object_unref (contact_view);
- contact_view = NULL;
- }
-
if (contact_model) {
g_object_unref (contact_model);
contact_model = NULL;
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);
result = gtk_dialog_run(GTK_DIALOG(add_email_addr_to_contact_dlg));
if (result == GTK_RESPONSE_ACCEPT) {
+ const gchar *invalid_char_offset = NULL;
new_email_addr = g_strdup(gtk_entry_get_text(GTK_ENTRY(email_entry)));
new_email_addr = g_strstrip(new_email_addr);
- if (!modest_text_utils_validate_email_address (new_email_addr)) {
+ if (!modest_text_utils_validate_email_address (new_email_addr, &invalid_char_offset)) {
gtk_widget_grab_focus(email_entry);
+ 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"),
+ char_in_string);
+ hildon_banner_show_information (
+ add_email_addr_to_contact_dlg, NULL, message );
+ g_free (message);
+ } else {
+ hildon_banner_show_information (add_email_addr_to_contact_dlg, NULL, _("mcen_ib_invalid_email"));
+ run_dialog = TRUE;
+ }
gtk_editable_select_region((GtkEditable *) email_entry, 0, -1);
- hildon_banner_show_information (add_email_addr_to_contact_dlg, NULL, _("mcen_ib_invalid_email"));
- run_dialog = TRUE;
g_free(new_email_addr);
new_email_addr = NULL;
}
_("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, 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
+ * for the window title text: */
+ gtk_window_set_default_size (GTK_WINDOW (select_email_addr_dlg), 400, -1);
+
scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(select_email_addr_dlg)->vbox), scrolledwindow, TRUE,
TRUE, 0);
recipients = modest_recpt_editor_get_recipients (recpt_editor);
last_length = g_utf8_strlen (recipients, -1);
- /* g_message ("LENGTH %d", last_length); */
modest_text_utils_get_addresses_indexes (recipients, &start_indexes, &end_indexes);
if (start_indexes == NULL) {
gchar *address;
gchar *start_ptr, *end_ptr;
gint start_pos, end_pos;
+ const gchar *invalid_char_position = NULL;
start_pos = (*((gint*) current_start->data)) + offset_delta;
end_pos = (*((gint*) current_end->data)) + offset_delta;
gtk_text_buffer_get_iter_at_offset (buffer, &end_iter, end_pos);
gtk_text_buffer_select_range (buffer, &start_iter, &end_iter);
-/*
- g_message ("RANGE %d - %d", start_pos, end_pos);
-
- g_message ("ADDRESS %s", address);
-*/
- if (!modest_text_utils_validate_recipient (address)) {
- if (strstr (address, "@") == NULL) {
+ 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);
+ g_free (char_in_string);
+ hildon_banner_show_information (NULL, NULL, message );
+ g_free (message);
+ result = FALSE;
+ } else 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);
new_length = g_utf8_strlen (recipients, -1);
offset_delta = offset_delta + new_length - last_length;
last_length = new_length;
- /* g_message ("LENGTH %d", last_length); */
}
} 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;
}
}
projects / modest / blobdiff