static EBookView * book_view = NULL;
static GSList *get_recipients_for_given_contact (EContact * contact, gboolean *canceled);
-static void commit_contact(EContact * contact, gboolean is_new);
static gchar *get_email_addr_from_user(const gchar * given_name, gboolean *canceled);
static gchar *ui_get_formatted_email_id(gchar * current_given_name,
gchar * current_sur_name, gchar * current_email_id);
static gboolean resolve_address (const gchar *address, GSList **resolved_addresses, GSList **contact_id, gboolean *canceled);
static gchar *unquote_string (const gchar *str);
-
-static void
-unref_gobject (GObject *obj)
-{
- if (obj)
- g_object_unref (obj);
-}
-
-
-static void
-get_book_view_cb (EBook *book, EBookStatus status, EBookView *bookview, gpointer data)
-{
- if (status != E_BOOK_ERROR_OK) {
- g_object_unref (book);
- book = NULL;
- return;
- }
- book_view = bookview;
-
- if (contact_model)
-#if MODEST_ABOOK_API < 4
- osso_abook_tree_model_set_book_view (OSSO_ABOOK_TREE_MODEL (contact_model),
- book_view);
-#else /* MODEST_ABOOK_API < 4 */
- osso_abook_list_store_set_book_view (OSSO_ABOOK_LIST_STORE (contact_model),
- book_view);
-#endif /* MODEST_ABOOK_API < 4 */
-
- e_book_view_start (book_view);
-}
-
-static void
-book_open_cb (EBook *view, EBookStatus status, gpointer data)
-{
- EBookQuery *query = NULL;
-
- if (status != E_BOOK_ERROR_OK) {
- g_object_unref (book);
- book = NULL;
- return;
- }
- query = e_book_query_any_field_contains ("");
- e_book_async_get_book_view (book, query, NULL, -1, get_book_view_cb, NULL);
- e_book_query_unref (query);
-}
-
-static gboolean
-open_addressbook ()
-{
- book = e_book_new_system_addressbook (NULL);
- if (!book)
- return FALSE;
-
- if (e_book_async_open (book, FALSE, book_open_cb, NULL) != E_BOOK_ERROR_OK)
- return FALSE;
-
- return TRUE; /* FIXME */
-}
-
-typedef struct _OpenAddressbookSyncInfo {
- gboolean retval;
- GMainLoop *mainloop;
-} OpenAddressbookSyncInfo;
-
-static void
-get_book_view_sync_cb (EBook *book, EBookStatus status, EBookView *bookview, gpointer data)
-{
- OpenAddressbookSyncInfo *info = (OpenAddressbookSyncInfo *) data;
-
- if (status != E_BOOK_ERROR_OK) {
- g_object_unref (book);
- book = NULL;
- info->retval = FALSE;
- g_main_loop_quit (info->mainloop);
- return;
- }
- book_view = bookview;
-
- if (contact_model)
-#if MODEST_ABOOK_API < 4
- osso_abook_tree_model_set_book_view (OSSO_ABOOK_TREE_MODEL (contact_model),
- book_view);
-#else /* MODEST_ABOOK_API < 4 */
- osso_abook_list_store_set_book_view (OSSO_ABOOK_LIST_STORE (contact_model),
- book_view);
-#endif /* MODEST_ABOOK_API < 4 */
-
- e_book_view_start (book_view);
- info->retval = TRUE;
- g_main_loop_quit (info->mainloop);
-}
-
-static void
-book_open_sync_cb (EBook *view, EBookStatus status, gpointer data)
-{
- EBookQuery *query = NULL;
- OpenAddressbookSyncInfo *info = (OpenAddressbookSyncInfo *) data;
-
- if (status != E_BOOK_ERROR_OK) {
- g_object_unref (book);
- book = NULL;
- info->retval = FALSE;
- g_main_loop_quit (info->mainloop);
- return;
- }
- query = e_book_query_any_field_contains ("");
- e_book_async_get_book_view (book, query, NULL, -1, get_book_view_sync_cb, info);
- e_book_query_unref (query);
-}
-
static gboolean
-open_addressbook_sync ()
+open_addressbook ()
{
- OpenAddressbookSyncInfo *info;
- gboolean retval;
-
- book = e_book_new_system_addressbook (NULL);
- if (!book)
- return FALSE;
-
- info = g_slice_new (OpenAddressbookSyncInfo);
- info->mainloop = g_main_loop_new (NULL, FALSE);
- info->retval = FALSE;
- if (e_book_async_open (book, FALSE, book_open_sync_cb, info) == E_BOOK_ERROR_OK) {
- GDK_THREADS_LEAVE ();
- g_main_loop_run (info->mainloop);
- GDK_THREADS_ENTER ();
- }
- retval = info->retval;
- g_main_loop_unref (info->mainloop);
- g_slice_free (OpenAddressbookSyncInfo, info);
- /* Make it launch a main loop */
- return e_book_open (book, FALSE, NULL);
+ OssoABookRoster *roster;
+ GError *error = NULL;
+ time_t init,end;
+
+ if (book && book_view)
+ return TRUE;
+
+ roster = osso_abook_aggregator_get_default (&error);
+ if (error)
+ goto error;
+
+ /* Wait until it's ready */
+ init = time (NULL);
+ osso_abook_waitable_run ((OssoABookWaitable *) roster,
+ g_main_context_default (),
+ &error);
+ end = time (NULL);
+ g_debug ("Opening addressbook lasted %ld seconds", (gint) end-init);
+
+ if (error)
+ goto error;
+
+ if (!osso_abook_waitable_is_ready ((OssoABookWaitable *) roster,
+ &error))
+ goto error;
+
+ book = osso_abook_roster_get_book (roster);
+ book_view = osso_abook_roster_get_book_view (roster);
+
+ return TRUE;
+ error:
+ g_warning ("error opening addressbook %s", error->message);
+ g_error_free (error);
+ return FALSE;
}
void
modest_address_book_select_addresses (ModestRecptEditor *recpt_editor,
GtkWindow *parent_window)
{
-#if MODEST_ABOOK_API < 4
- GtkWidget *contact_view = NULL;
- GtkWidget *contact_dialog;
- GtkWidget *toplevel;
-#else /* MODEST_ABOOK_API < 4 */
GtkWidget *contact_chooser = NULL;
-#endif /* MODEST_ABOOK_API < 4 */
-
GList *contacts_list = NULL;
GSList *email_addrs_per_contact = NULL;
gchar *econtact_id;
g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
-#if MODEST_ABOOK_API < 4
- if (!open_addressbook ()) {
- if (contact_model) {
- g_object_unref (contact_model);
- contact_model = NULL;
- }
- 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));
- toplevel = gtk_widget_get_toplevel (GTK_WIDGET (recpt_editor));
- modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (contact_dialog), GTK_WINDOW (toplevel));
-
- gtk_widget_show (contact_dialog);
-
- if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK) {
- contacts_list =
- osso_abook_contact_selector_get_extended_selection (OSSO_ABOOK_CONTACT_SELECTOR
- (contact_view));
- }
-#else /* MODEST_ABOOK_API < 4 */
/* TODO: figure out how to make the contact chooser modal */
contact_chooser = osso_abook_contact_chooser_new_with_capabilities (parent_window,
_AB("addr_ti_dia_select_contacts"),
if (gtk_dialog_run (GTK_DIALOG (contact_chooser)) == GTK_RESPONSE_OK)
contacts_list = osso_abook_contact_chooser_get_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_chooser));
gtk_widget_destroy (contact_chooser);
-#endif
if (contacts_list) {
GList *node;
g_list_free (contacts_list);
}
-#if MODEST_ABOOK_API < 4
- if (contact_model) {
- g_object_unref (contact_model);
- contact_model = NULL;
- }
-
- gtk_widget_destroy (contact_dialog);
-#endif
-
if (focus_recpt_editor)
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (recpt_editor));
/*Launch the 'Add e-mail addr to contact' dialog if required */
if (email_not_present) {
-#if MODEST_ABOOK_API < 4
- display_name = osso_abook_contact_get_display_name(contact);
-#else
OssoABookContact *abook_contact;
abook_contact = osso_abook_contact_new_from_template (contact);
display_name = osso_abook_contact_get_display_name(abook_contact);
-#endif
emailid = get_email_addr_from_user(display_name, canceled);
if (emailid) {
- e_contact_set(contact, E_CONTACT_EMAIL_1, emailid);
- commit_contact(contact, FALSE);
+ e_contact_set(E_CONTACT (abook_contact), E_CONTACT_EMAIL_1, emailid);
+ osso_abook_contact_commit (abook_contact, FALSE, NULL, NULL);
}
-#if MODEST_ABOOK_API >= 4
g_object_unref (abook_contact);
-#endif
}
if (emailid) {
}
/**
- * This is a helper function to commit a EContact to Address_Book application.
- *
- * @param contact Contact of type #EContact
- * @return void
- */
-static void
-commit_contact(EContact * contact, gboolean is_new)
-{
- 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(OSSO_ABOOK_CONTACT(contact), is_new, book, NULL);
- } else {
- GError *err = NULL;
- if (is_new) {
- if (!e_book_add_contact (book, contact, &err)) {
- g_warning ("Failed to add contact: %s", err->message);
- g_error_free (err);
- }
- } else {
- if (!e_book_commit_contact (book, contact, &err)) {
- g_warning ("Failed to commit contact: %s", err->message);
- g_error_free (err);
- }
- }
- }
-#endif /* MODEST_ABOOK_API < 2 */
-}
-
-/**
* This is a helper function used to launch 'Add e-mail address to contact' dialog
* after showing appropriate notification, when there is no e-mail address defined
* for a selected contact.
return selected_email_addr_list;
}
+/* Assumes that the second argument (the user provided one) is a pure
+ email address without name */
+static gint
+compare_addresses (const gchar *address1,
+ const gchar *mail2)
+{
+ gint retval;
+ gchar *mail1;
+
+ mail1 = modest_text_utils_get_email_address (address1);
+ retval = g_strcmp0 (mail1, mail2);
+ g_free (mail1);
+
+ return retval;
+}
+
static EContact *
get_contact_for_address (GList *contacts,
const gchar *address)
{
EContact *retval = NULL, *contact;
GList *iter;
+ gchar *email;
+ email = modest_text_utils_get_email_address (address);
iter = contacts;
while (iter && !retval) {
GList *emails = NULL;
emails = e_contact_get (contact, E_CONTACT_EMAIL);
if (emails) {
/* Look for the email address */
- if (g_list_find_custom (emails, address, (GCompareFunc) g_strcmp0))
+ if (g_list_find_custom (emails, email, (GCompareFunc) compare_addresses))
retval = contact;
/* Free the list */
}
iter = g_list_next (iter);
}
+ g_free (email);
+
return retval;
}
g_slist_foreach (addresses, (GFunc) g_free, NULL);
g_slist_free (addresses);
}
- if (contacts) {
- g_list_foreach (contacts, (GFunc) g_object_unref, NULL);
+ if (contacts)
g_list_free (contacts);
- }
}
start_pos = (*((gint*) current_start->data)) + offset_delta;
end_pos = (*((gint*) current_end->data)) + offset_delta;
-
+
start_ptr = g_utf8_offset_to_pointer (recipients, start_pos);
end_ptr = g_utf8_offset_to_pointer (recipients, end_pos);
}
/* Add addresses to address-book */
- if (to_commit_addresses)
- add_to_address_book (to_commit_addresses);
+ if (to_commit_addresses) {
+ to_commit_addresses = modest_text_utils_remove_duplicate_addresses_list (to_commit_addresses);
+ if (to_commit_addresses)
+ add_to_address_book (to_commit_addresses);
+ }
if (current_start == NULL) {
gtk_text_buffer_get_end_iter (buffer, &end_iter);
return result;
}
+static gboolean
+filter_by_name (OssoABookContactChooser *chooser,
+ OssoABookContact *contact,
+ gpointer user_data)
+{
+ const gchar *contact_name;
+ const gchar *name = (const gchar *) user_data;
+
+ contact_name = osso_abook_contact_get_name (contact);
+ /* contact_name includes both name and surname */
+ if (contact_name && name && strstr (contact_name, name))
+ return TRUE;
+ else
+ return FALSE;
+}
+
static GList *
select_contacts_for_name_dialog (const gchar *name)
{
- EBookQuery *full_name_book_query = NULL;
- EBookView *book_view = NULL;
+ GtkWidget *contact_view;
+ OssoABookContactChooser *contact_dialog;
GList *result = NULL;
gchar *unquoted;
+ contact_dialog = (OssoABookContactChooser *)
+ osso_abook_contact_chooser_new_with_capabilities (NULL,
+ _AB("addr_ti_dia_select_contacts"),
+ OSSO_ABOOK_CAPS_EMAIL,
+ OSSO_ABOOK_CONTACT_ORDER_NAME);
+
+ /* Enable multiselection */
+ osso_abook_contact_chooser_set_maximum_selection (contact_dialog, G_MAXUINT);
+
+ /* Set up the filtering */
unquoted = unquote_string (name);
- full_name_book_query = e_book_query_field_test (E_CONTACT_FULL_NAME, E_BOOK_QUERY_CONTAINS, unquoted);
- g_free (unquoted);
- e_book_get_book_view (book, full_name_book_query, NULL, -1, &book_view, NULL);
- e_book_query_unref (full_name_book_query);
+ contact_view = osso_abook_contact_chooser_get_contact_view (contact_dialog);
+ osso_abook_contact_chooser_set_model (contact_dialog, contact_model);
+ osso_abook_contact_chooser_set_visible_func (contact_dialog, filter_by_name, unquoted, NULL);
- if (book_view) {
- GtkWidget *contact_dialog = NULL;
-#if MODEST_ABOOK_API < 4
- GtkWidget *contact_view = NULL;
- osso_abook_tree_model_set_book_view (OSSO_ABOOK_TREE_MODEL (contact_model), book_view);
- e_book_view_start (book_view);
+ if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK)
+ result = osso_abook_contact_chooser_get_selection (contact_dialog);
- contact_view = osso_abook_contact_selector_new_basic (contact_model);
- contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view));
+ gtk_widget_destroy ((GtkWidget *) contact_dialog);
- if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK) {
- result = osso_abook_contact_view_get_selection (OSSO_ABOOK_CONTACT_VIEW (contact_view));
- }
- e_book_view_stop (book_view);
- g_object_unref (book_view);
- gtk_widget_destroy (contact_dialog);
-#else /* MODEST_ABOOK_API < 4 */
- osso_abook_list_store_set_book_view (OSSO_ABOOK_LIST_STORE (contact_model), book_view);
- e_book_view_start (book_view);
-
- /* 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_CONTACT_ORDER_NAME);
- /* Enable multiselection */
- osso_abook_contact_chooser_set_maximum_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_dialog),
- G_MAXUINT);
- osso_abook_contact_chooser_set_model (OSSO_ABOOK_CONTACT_CHOOSER (contact_dialog),
- contact_model);
-
- if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK)
- result = osso_abook_contact_chooser_get_selection (OSSO_ABOOK_CONTACT_CHOOSER (contact_dialog));
- e_book_view_stop (book_view);
- g_object_unref (book_view);
- gtk_widget_destroy (contact_dialog);
-#endif /* MODEST_ABOOK_API < 4 */
- }
+ g_free (unquoted);
return result;
}
*canceled = FALSE;
info = g_slice_new0 (CheckNamesInfo);
show_check_names_banner (info);
-
- contact_model = osso_abook_contact_model_new ();
- if (!open_addressbook_sync ()) {
+
+ contact_model = osso_abook_contact_model_get_default ();
+ if (!open_addressbook ()) {
hide_check_names_banner (info);
if (contact_model) {
g_object_unref (contact_model);
}
}
- g_list_foreach (resolved_contacts, (GFunc)unref_gobject, NULL);
g_list_free (resolved_contacts);
clean_check_names_banner (info);
gboolean
modest_address_book_has_address (const gchar *address)
{
- EBookQuery *query;
GList *contacts = NULL;
GError *err = NULL;
gchar *email;
gboolean result;
+ OssoABookAggregator *roster;
g_return_val_if_fail (address, FALSE);
-
+
if (!book) {
if (!open_addressbook ()) {
g_return_val_if_reached (FALSE);
}
}
-
g_return_val_if_fail (book, FALSE);
email = modest_text_utils_get_email_address (address);
-
- query = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_IS, email);
- if (!e_book_get_contacts (book, query, &contacts, &err)) {
- g_printerr ("modest: failed to get contacts: %s",
- err ? err->message : "<unknown>");
+
+ roster = (OssoABookAggregator *) osso_abook_aggregator_get_default (NULL);
+ contacts = osso_abook_aggregator_find_contacts_for_email_address (roster, email);
+ if (!contacts) {
if (err)
g_error_free (err);
g_free (email);
- e_book_query_unref (query);
return FALSE;
}
- e_book_query_unref (query);
- result = (contacts != NULL);
if (contacts) {
- g_list_foreach (contacts, (GFunc)unref_gobject, NULL);
g_list_free (contacts);
+ result = TRUE;
}
-
+
g_free (email);
return result;
}
+
+const gchar *
+modest_address_book_get_my_name ()
+{
+ OssoABookSelfContact *self_contact = osso_abook_self_contact_get_default ();
+
+ /* We are not using osso_abook_contact_get_display_name
+ because that method fallbacks to another fields if the name
+ is not defined */
+ if (self_contact)
+ return e_contact_get ((EContact *) self_contact, E_CONTACT_FULL_NAME);
+ else
+ return NULL;
+}
+
+void
+modest_address_book_init (void)
+{
+ open_addressbook ();
+}
projects / modest / blobdiff