static GSList *select_email_addrs_for_contact(GList * email_addr_list);
static gboolean resolve_address (const gchar *address, GSList **resolved_addresses, GSList **contact_id, gboolean *canceled);
static gchar *unquote_string (const gchar *str);
+static void set_contact_from_display_name (EContact *contact, const gchar *display_name);
static gboolean
open_addressbook ()
if (display_address) {
modest_text_utils_get_display_address (display_address);
if ((display_address[0] != '\0') && (strlen (display_address) != strlen (address)))
- e_contact_set (contact, E_CONTACT_FULL_NAME, (const gpointer)display_address);
+ set_contact_from_display_name (contact, (const gchar *) display_address);
g_free (display_address);
}
end_ptr = g_utf8_offset_to_pointer (recipients, end_pos);
address = g_strstrip (g_strndup (start_ptr, end_ptr - start_ptr));
+
+ /* Ignore empty addresses */
+ if (!g_strcmp0 (address, "")) {
+ g_free (address);
+ goto next_address;
+ }
+
gtk_text_buffer_get_iter_at_offset (buffer, &start_iter, start_pos);
gtk_text_buffer_get_iter_at_offset (buffer, &end_iter, end_pos);
gtk_text_buffer_select_range (buffer, &start_iter, &end_iter);
if (result == FALSE)
break;
+ next_address:
current_start = g_slist_next (current_start);
current_end = g_slist_next (current_end);
}
}
-typedef struct _GetContactsInfo {
- GMainLoop *mainloop;
- GList *result;
-} GetContactsInfo;
-static void
-get_contacts_for_name_cb (EBook *book,
- EBookStatus status,
- GList *list,
- gpointer userdata)
-{
- GetContactsInfo *info = (GetContactsInfo *) userdata;
- if (status == E_BOOK_ERROR_OK)
- info->result = list;
-
- g_main_loop_quit (info->mainloop);
-}
-
-static GList *
-get_contacts_for_name (const gchar *name)
+static void
+set_contact_from_display_name (EContact *contact, const gchar *disp_name)
{
- EBookQuery *book_query = NULL;
- GList *result;
- gchar *unquoted;
- GetContactsInfo *info;
- EBookQuery *queries[10];
+ const gchar *parent_open;
+ const gchar *comma_separator;
+ GString *buffer;
+ gchar *display_name;
- if (name == NULL)
- return NULL;
+ display_name = unquote_string (disp_name);
+ buffer = g_string_new ("");
- unquoted = unquote_string (name);
+ /* First we remove part in () */
+ parent_open = g_strstr_len (display_name, -1, "(");
+ if (parent_open) {
+ const gchar *parent_close;
- queries[0] = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[1] = e_book_query_field_test (E_CONTACT_GIVEN_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[2] = e_book_query_field_test (E_CONTACT_FAMILY_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[3] = e_book_query_field_test (E_CONTACT_NICKNAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[4] = e_book_query_field_test (E_CONTACT_EMAIL_1, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[5] = e_book_query_field_test (E_CONTACT_EMAIL_2, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[6] = e_book_query_field_test (E_CONTACT_EMAIL_3, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[7] = e_book_query_field_test (E_CONTACT_EMAIL_4, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[8] = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- queries[9] = e_book_query_field_test (E_CONTACT_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
- book_query = e_book_query_or (10, queries, TRUE);
+ parent_close = g_strstr_len (parent_open, -1, ")");
- g_free (unquoted);
+ buffer = g_string_append_len (buffer, display_name, parent_open - display_name);
+ if (parent_close) {
+ buffer = g_string_append (buffer, parent_close + 1);
+ }
+ } else {
+ buffer = g_string_append (buffer, display_name);
+ }
- /* TODO: Make it launch a mainloop */
- info = g_slice_new (GetContactsInfo);
- info->mainloop = g_main_loop_new (NULL, FALSE);
- info->result = NULL;
- if (e_book_async_get_contacts (book, book_query, get_contacts_for_name_cb, info) == 0) {
- GDK_THREADS_LEAVE ();
- g_main_loop_run (info->mainloop);
- GDK_THREADS_ENTER ();
- }
- result = info->result;
- e_book_query_unref (book_query);
- g_main_loop_unref (info->mainloop);
- g_slice_free (GetContactsInfo, info);
+ comma_separator = g_strstr_len (buffer->str, -1, ", ");
+ if (comma_separator) {
+ gchar *surname, *name;
+ surname = g_strndup (buffer->str, comma_separator - buffer->str);
+ name = g_strdup (comma_separator + 2);
- return result;
-}
+ e_contact_set (contact, E_CONTACT_FAMILY_NAME, (const gpointer) surname);
+ e_contact_set (contact, E_CONTACT_GIVEN_NAME, (const gpointer) name);
+ g_free (name);
+ g_free (surname);
+ } else {
+ e_contact_set (contact, E_CONTACT_GIVEN_NAME, (const gpointer) buffer->str);
+ }
+ g_string_free (buffer, TRUE);
+ g_free (display_name);
+}
static GList *
select_contacts_for_name_dialog (const gchar *name)
}
static gboolean
+contact_name_or_email_starts_with (OssoABookContact *contact,
+ gpointer user_data)
+{
+ const char *prefix = user_data;
+ gboolean rv = FALSE;
+ GList *contacts, *l;
+
+
+ contacts = osso_abook_contact_get_roster_contacts (contact);
+ contacts = g_list_prepend (contacts, contact);
+
+ for (l = contacts; l; l = l->next) {
+ GList *attrs;
+ attrs = e_vcard_get_attributes (E_VCARD (l->data));
+ for (;attrs;attrs = attrs->next) {
+ EVCardAttribute *attr = attrs->data;
+ const char *name;
+
+ name = e_vcard_attribute_get_name (attr);
+ if (!g_strcmp0 (name, "N") ||
+ (strchr (prefix, '@') && !g_strcmp0 (name, "EMAIL"))) {
+ GList *values = e_vcard_attribute_get_values (attr);
+ gchar *prefix_down = g_utf8_strdown (prefix, -1);
+
+ for (;values; values = values->next) {
+ gchar *value_down = NULL;
+
+ if (g_strcmp0 (values->data, ""))
+ value_down = g_utf8_strdown (values->data, -1);
+
+ if (value_down && g_str_has_prefix (value_down, prefix_down)) {
+ rv = TRUE;
+ g_free (value_down);
+ g_free (prefix_down);
+ goto out;
+ }
+ g_free (value_down);
+ }
+ g_free (prefix_down);
+ }
+ }
+ }
+ out:
+ g_list_free (contacts);
+
+ return rv;
+}
+
+static gboolean
resolve_address (const gchar *address,
GSList **resolved_addresses,
GSList **contact_ids,
{
GList *resolved_contacts;
CheckNamesInfo *info;;
+ OssoABookRoster *roster;
g_return_val_if_fail (canceled, FALSE);
return FALSE;
}
- resolved_contacts = get_contacts_for_name (address);
+ roster = osso_abook_aggregator_get_default (NULL);
+ resolved_contacts =
+ osso_abook_aggregator_find_contacts_full ((OssoABookAggregator *) roster,
+ contact_name_or_email_starts_with,
+ (gpointer) address);
hide_check_names_banner (info);
if (resolved_contacts == NULL) {
e_book_query_unref (composite_query);
}
+static void
+selector_on_response (GtkDialog *dialog,
+ gint response_id,
+ gpointer user_data)
+{
+ if (response_id == GTK_RESPONSE_OK) {
+ gchar *current_selection = NULL;
+ GtkTreePath *selected_row = NULL;
+ HildonTouchSelector *selector;
+
+ selector = hildon_picker_dialog_get_selector (HILDON_PICKER_DIALOG (dialog));
+ selected_row = hildon_touch_selector_get_last_activated_row (selector, 0);
+ if (selected_row) {
+ GtkTreeIter iter;
+ GtkTreeModel *model = hildon_touch_selector_get_model (selector, 0);
+ if (gtk_tree_model_get_iter (model, &iter, selected_row)) {
+ gtk_tree_model_get (model, &iter, 0, ¤t_selection, -1);
+ modest_address_book_add_address (current_selection, user_data);
+ g_debug ("Current selection : %s", current_selection);
+ g_free (current_selection);
+ }
+ }
+ }
+
+ if (response_id != GTK_RESPONSE_DELETE_EVENT)
+ gtk_widget_destroy ((GtkWidget *) dialog);
+}
+
+static void
+selector_selection_changed (HildonTouchSelector * selector,
+ gint column,
+ gpointer *user_data)
+{
+ /* Close the dialog */
+ gtk_dialog_response (GTK_DIALOG (user_data), GTK_RESPONSE_OK);
+}
+
void
modest_address_book_add_address_list_with_selector (GSList *address_list, GtkWindow *parent)
{
GtkWidget *picker_dialog;
- GtkWidget *selector;
+ HildonTouchSelector *selector;
GSList *node;
- gchar *selected = NULL;
+ GtkTreeModel *model;
gboolean contacts_to_add = FALSE;
- selector = hildon_touch_selector_new_text ();
- g_object_ref (selector);
+ /* We cannot use hildon_touch_selector_new_text() because
+ there is a bug in hildon that does not retrieve the current
+ selected text when using MODES_NORMAL. So we need a
+ temporary workaround here */
+ selector = (HildonTouchSelector*) hildon_touch_selector_new ();
+
+ model = (GtkTreeModel *) gtk_list_store_new (1, G_TYPE_STRING);
+ hildon_touch_selector_append_text_column (selector, model, TRUE);
+ hildon_touch_selector_set_hildon_ui_mode (selector, HILDON_UI_MODE_NORMAL);
+ g_object_unref (model);
for (node = address_list; node != NULL; node = g_slist_next (node)) {
const gchar *recipient = (const gchar *) node->data;
if (modest_text_utils_validate_recipient (recipient, NULL)) {
if (!modest_address_book_has_address (recipient)) {
- hildon_touch_selector_append_text ((HildonTouchSelector *) selector,
- recipient);
+ GtkTreeIter iter;
+ gtk_list_store_append ((GtkListStore *) model, &iter);
+ gtk_list_store_set ((GtkListStore *) model, &iter, 0, recipient, -1);
contacts_to_add = TRUE;
}
}
}
if (contacts_to_add) {
- gint picker_result;
-
picker_dialog = hildon_picker_dialog_new (parent);
gtk_window_set_title (GTK_WINDOW (picker_dialog), _("mcen_me_viewer_addtocontacts"));
hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (picker_dialog),
- HILDON_TOUCH_SELECTOR (selector));
+ selector);
- picker_result = gtk_dialog_run (GTK_DIALOG (picker_dialog));
-
- if (picker_result == GTK_RESPONSE_OK) {
- selected = hildon_touch_selector_get_current_text (HILDON_TOUCH_SELECTOR (selector));
- }
- gtk_widget_destroy (picker_dialog);
+ g_signal_connect ((GObject*) selector, "changed",
+ G_CALLBACK (selector_selection_changed), picker_dialog);
- if (selected)
- modest_address_book_add_address (selected, parent);
- g_free (selected);
+ g_signal_connect ((GObject*) picker_dialog, "response",
+ G_CALLBACK (selector_on_response), parent);
+ gtk_widget_show (picker_dialog);
} else {
- g_object_unref (selector);
+ gtk_widget_destroy ((GtkWidget *) selector);
}
}
projects / modest / blobdiff