#include <gtk/gtktreeselection.h>
#include <gtk/gtkentry.h>
#include <modest-maemo-utils.h>
-#include <dbus_api/asdbus.h>
#include <modest-toolkit-utils.h>
+#ifdef MODEST_PLATFORM_MAEMO
+#include <asdbus.h>
+#endif
static OssoABookContactModel *contact_model = NULL;
static EBook *book = NULL;
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 void
+on_roster_notify (GObject *gobject,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ if ((g_strcmp0 (g_param_spec_get_name (pspec), "book") == 0) ||
+ (g_strcmp0 (g_param_spec_get_name (pspec), "book-view") == 0)) {
+ OssoABookRoster *roster = OSSO_ABOOK_ROSTER (gobject);
+ book = osso_abook_roster_get_book (roster);
+ book_view = osso_abook_roster_get_book_view (roster);
+ }
+}
static gboolean
open_addressbook ()
book = osso_abook_roster_get_book (roster);
book_view = osso_abook_roster_get_book_view (roster);
+ g_signal_connect (G_OBJECT (roster), "notify", G_CALLBACK (on_roster_notify), NULL);
+
return TRUE;
error:
g_warning ("error opening addressbook %s", error->message);
_AB("addr_ti_dia_select_contacts"),
OSSO_ABOOK_CAPS_EMAIL,
OSSO_ABOOK_CONTACT_ORDER_NAME);
+
/* Enable multiselection */
osso_abook_contact_chooser_set_maximum_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_chooser),
G_MAXUINT);
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(
- _CS("ckdg_ib_illegal_characters_entered"),
+ _CS_ILLEGAL_CHARACTERS_ENTERED,
char_in_string);
g_free (char_in_string);
hildon_banner_show_information (
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);
}
gint offset_delta = 0;
gint last_length;
GtkTextIter start_iter, end_iter;
+ gboolean empty_recipients = 0;
g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE);
gchar *start_ptr, *end_ptr;
gint start_pos, end_pos;
const gchar *invalid_char_position = NULL;
- gboolean store_address = FALSE;
start_pos = (*((gint*) current_start->data)) + offset_delta;
end_pos = (*((gint*) current_end->data)) + offset_delta;
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);
+ empty_recipients++;
+ 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 ((invalid_char_position != NULL) && (*invalid_char_position != '\0')) {
gchar *char_in_string = g_strdup_printf("%c", *invalid_char_position);
gchar *message =
- g_strdup_printf(_CS("ckdg_ib_illegal_characters_entered"),
+ g_strdup_printf(_CS_ILLEGAL_CHARACTERS_ENTERED,
char_in_string);
g_free (char_in_string);
hildon_banner_show_information (NULL, NULL, message );
addr_list,
"");
g_slist_free (addr_list);
- store_address = TRUE;
}
}
/* so, it seems a valid address */
/* note: adding it the to the addressbook if it did not exist yet,
* and adding it to the recent_list */
- if (result && address_list && store_address)
+ if (result && address_list)
*address_list = g_slist_prepend (*address_list, address);
else
g_free (address);
if (result == FALSE)
break;
+ next_address:
current_start = g_slist_next (current_start);
current_end = g_slist_next (current_end);
}
gtk_text_buffer_place_cursor (buffer, &end_iter);
}
+ /* Check that at least there is one non-empty recipient */
+ if ((g_slist_length (start_indexes) - empty_recipients) == 0)
+ result = FALSE;
+
g_slist_foreach (start_indexes, (GFunc) g_free, NULL);
g_slist_foreach (end_indexes, (GFunc) g_free, NULL);
g_slist_free (start_indexes);
}
-typedef struct _GetContactsInfo {
- GMainLoop *mainloop;
- GList *result;
-} GetContactsInfo;
-static void
-get_contacts_for_name_cb (EBook *book,
- EBookStatus status,
- GList *list,
- gpointer userdata)
+
+static void
+set_contact_from_display_name (EContact *contact, const gchar *disp_name)
{
- GetContactsInfo *info = (GetContactsInfo *) userdata;
+ const gchar *parent_open;
+ const gchar *comma_separator;
+ GString *buffer;
+ gchar *display_name;
+
+ display_name = unquote_string (disp_name);
+ buffer = g_string_new ("");
+
+ /* First we remove part in () */
+ parent_open = g_strstr_len (display_name, -1, "(");
+ if (parent_open) {
+ const gchar *parent_close;
+
+ parent_close = g_strstr_len (parent_open, -1, ")");
+
+ 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);
+ }
- if (status == E_BOOK_ERROR_OK)
- info->result = list;
+ 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);
+
+ 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_main_loop_quit (info->mainloop);
+ g_string_free (buffer, TRUE);
+ g_free (display_name);
}
static GList *
-get_contacts_for_name (const gchar *name)
+select_contacts_for_name_dialog (const gchar *name, GList *external_contacts)
{
EBookQuery *book_query = NULL;
- GList *result;
+ EBookView *book_view = NULL;
+ GList *result = NULL;
gchar *unquoted;
- GetContactsInfo *info;
EBookQuery *queries[10];
- gint i;
-
- if (name == NULL)
- return NULL;
+ gint i=0;
unquoted = unquote_string (name);
- i = 0;
queries[i++] = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
queries[i++] = e_book_query_field_test (E_CONTACT_GIVEN_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
queries[i++] = e_book_query_field_test (E_CONTACT_FAMILY_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
}
queries[i] = e_book_query_field_test (E_CONTACT_NAME, E_BOOK_QUERY_BEGINS_WITH, unquoted);
book_query = e_book_query_or (i, queries, TRUE);
-
- g_free (unquoted);
-
- /* 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);
-
- return result;
-}
-
-
-static GList *
-select_contacts_for_name_dialog (const gchar *name, GList *external_contacts)
-{
- EBookQuery *book_query = NULL;
- EBookView *book_view = NULL;
- GList *result = NULL;
- gchar *unquoted;
- EBookQuery *queries[10];
-
- unquoted = unquote_string (name);
-
- 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);
e_book_get_book_view (book, book_query, NULL, -1, &book_view, NULL);
e_book_query_unref (book_query);
/* TODO: figure out how to make the contact chooser modal */
contact_dialog = osso_abook_contact_chooser_new_with_capabilities (NULL,
_AB("addr_ti_dia_select_contacts"),
- OSSO_ABOOK_CAPS_EMAIL,
+ OSSO_ABOOK_CAPS_ALL,
OSSO_ABOOK_CONTACT_ORDER_NAME);
+#ifdef MODEST_PLATFORM_MAEMO
if (external_contacts) {
GList *row_list = NULL;
g_list_free (row_list);
}
}
+#endif
/* Enable multiselection */
osso_abook_contact_chooser_set_maximum_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_dialog),
}
static gboolean
+contact_name_or_email_starts_with (OssoABookContact *contact,
+ gpointer user_data)
+{
+ const char *prefix = user_data;
+ GList *contacts, *l;
+ gboolean contact_match;
+
+ contacts = osso_abook_contact_get_roster_contacts (contact);
+ contacts = g_list_prepend (contacts, contact);
+
+ for (l = contacts; l; l = l->next) {
+ GList *attrs;
+
+ contact_match = FALSE;
+
+ 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)) {
+ contact_match = 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 contact_match;
+}
+
+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);
+#ifdef MODEST_PLATFORM_MAEMO
GList *external_contacts = asdbus_resolve_recipients (address);
+#else
+ GList *external_contacts = NULL;
+#endif
hide_check_names_banner (info);
- if (NULL == resolved_contacts && NULL == external_contacts) {
+ if (resolved_contacts == NULL && NULL == external_contacts) {
/* no matching contacts for the search string */
modest_platform_run_information_dialog (NULL, _("mcen_nc_no_matching_contacts"), FALSE);
clean_check_names_banner (info);
return FALSE;
}
+#ifdef MODEST_PLATFORM_MAEMO
/* check for duplicate emails and remove from external_contacts if any */
if (resolved_contacts && external_contacts) {
g_list_foreach (emails, (GFunc) g_free, NULL);
g_list_free (emails);
+
+ if (!recipient)
+ break;
}
}
}
+#endif
if (g_list_length (resolved_contacts) + g_list_length (external_contacts) > 1) {
/* show a dialog to select the contact from the resolved ones */
resolved_contacts = select_contacts_for_name_dialog (address, external_contacts);
+#ifdef MODEST_PLATFORM_MAEMO
if (external_contacts) {
GList *node;
g_list_free (external_contacts);
external_contacts = NULL;
}
+#endif
}
+#ifdef MODEST_PLATFORM_MAEMO
if (external_contacts) {
gboolean found = FALSE;
g_list_free (external_contacts);
external_contacts = NULL;
return found;
- }
+ }
+#endif
/* get the resolved contacts (can be no contact) */
if (resolved_contacts) {
projects / modest / blobdiff