X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-address-book.c;h=faa1fb1586fdfa29f1a6162d356177ead7137767;hb=e468d62e86da9f16820ac0cc8d7d1f106bf080bf;hp=03e29d696a51bf7578666491b8f9f80c715cec33;hpb=488bb4f4022cd16175aaa02be02089371b17d95e;p=modest diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c index 03e29d6..faa1fb1 100644 --- a/src/maemo/modest-address-book.c +++ b/src/maemo/modest-address-book.c @@ -38,6 +38,8 @@ #include #include "modest-hildon-includes.h" #include "modest-platform.h" +#include "modest-runtime.h" +#include "widgets/modest-window-mgr.h" #include #include #include @@ -80,8 +82,13 @@ get_book_view_cb (EBook *book, EBookStatus status, EBookView *bookview, gpointer 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); } @@ -164,15 +171,22 @@ modest_address_book_add_address (const gchar *address) void modest_address_book_select_addresses (ModestRecptEditor *recpt_editor) { +#if MODEST_ABOOK_API < 4 GtkWidget *contact_view = NULL; - GList *contacts_list = NULL; GtkWidget *contact_dialog; + GtkWidget *toplevel; +#else /* MODEST_ABOOK_API < 4 */ + OssoABookContactChooser *contact_chooser = NULL; +#endif /* MODEST_ABOOK_API < 4 */ + + GList *contacts_list = NULL; GSList *email_addrs_per_contact = NULL; gchar *econtact_id; gboolean focus_recpt_editor = FALSE; 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); @@ -187,6 +201,8 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor) contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view)); gtk_window_set_title (GTK_WINDOW (contact_dialog), _("mcen_ti_select_recipients")); + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (recpt_editor)); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (contact_dialog), (GtkWindow *) toplevel); gtk_widget_show (contact_dialog); @@ -195,6 +211,18 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor) 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 + ("title", _("mcen_ti_select_recipients"), + "help-topic", "", + "minimum-selection", 1, NULL); + + if (osso_abook_contact_chooser_run (contact_chooser) == GTK_RESPONSE_OK) + contacts_list = osso_abook_contact_chooser_get_selection (contact_chooser); + + g_object_unref (contact_chooser); +#endif if (contacts_list) { GList *node; @@ -216,12 +244,14 @@ modest_address_book_select_addresses (ModestRecptEditor *recpt_editor) 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)); @@ -279,9 +309,17 @@ static GSList *get_recipients_for_given_contact(EContact * contact) /*Launch the 'Add e-mail addr to contact' dialog if required */ if (email_not_present) { - display_name = osso_abook_contact_get_display_name(contact); - emailid = get_email_addr_from_user(display_name); +#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); + g_object_unref (abook_contact); +#endif + emailid = get_email_addr_from_user(display_name); if (emailid) { e_contact_set(contact, E_CONTACT_EMAIL_1, emailid); commit_contact(contact, FALSE); @@ -338,11 +376,11 @@ commit_contact(EContact * contact, gboolean is_new) if (!contact || !book) return; -#ifdef MODEST_HAVE_OLD_ABOOK +#if MODEST_ABOOK_API < 2 osso_abook_contact_commit(contact, is_new, book); #else osso_abook_contact_commit(contact, is_new, book, NULL); -#endif /* MODEST_HILDON_VERSION_0 */ +#endif /* MODEST_ABOOK_API < 2 */ } /** @@ -470,7 +508,7 @@ run_add_email_addr_to_contact_dlg(const gchar * contact_name) 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 ); @@ -586,6 +624,7 @@ add_to_address_book (const gchar* address) EBookQuery *query; GList *contacts = NULL; GError *err = NULL; + gchar *email; g_return_val_if_fail (address, FALSE); @@ -593,8 +632,10 @@ add_to_address_book (const gchar* address) open_addressbook (); 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, 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 : ""); @@ -616,31 +657,49 @@ add_to_address_book (const gchar* address) } else { /* it's not yet in the addressbook, add it now! */ EContact *new_contact = e_contact_new (); - e_contact_set (new_contact, E_CONTACT_EMAIL_1, (const gpointer)address); + gchar *display_address; + display_address = g_strdup (address); + if (display_address) { + modest_text_utils_get_display_address (display_address); + if ((display_address[0] != '\0') && (strlen (display_address) != strlen (address))) + e_contact_set (new_contact, E_CONTACT_FULL_NAME, (const gpointer)display_address); + } + e_contact_set (new_contact, E_CONTACT_EMAIL_1, (const gpointer)email); + g_free (display_address); commit_contact (new_contact, TRUE); g_debug ("%s added to address book", address); g_object_unref (new_contact); } + g_free (email); + return TRUE; } static gboolean -show_check_names_banner (gpointer data) +show_check_names_banner (gpointer userdata) { - GtkWidget **banner = (GtkWidget **) data; + GtkWidget **banner = (GtkWidget **) userdata; - /* We're outside the main lock */ gdk_threads_enter (); - - *banner = hildon_banner_show_animation (NULL, NULL, _("mail_ib_checking_names")); - g_object_ref (G_OBJECT (*banner)); - + *banner = modest_platform_animation_banner (NULL, NULL, _("mail_ib_checking_names")); gdk_threads_leave (); return FALSE; } +static void +hide_check_names_banner (GtkWidget **banner, guint banner_timeout) +{ + if (*banner != NULL) { + gtk_widget_destroy (*banner); + *banner = NULL; + } else { + g_source_remove (banner_timeout); + } + +} + gboolean modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean update_addressbook) { @@ -652,22 +711,14 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat gint offset_delta = 0; gint last_length; GtkTextIter start_iter, end_iter; - GtkWidget *banner = NULL; - guint show_banner_timeout; g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE); - show_banner_timeout = g_timeout_add (2000, show_check_names_banner, &banner); recipients = modest_recpt_editor_get_recipients (recpt_editor); last_length = g_utf8_strlen (recipients, -1); modest_text_utils_get_addresses_indexes (recipients, &start_indexes, &end_indexes); if (start_indexes == NULL) { - g_source_remove (show_banner_timeout); - if (banner != NULL) { - gtk_widget_destroy (banner); - g_object_unref (G_OBJECT(banner)); - } if (last_length != 0) { hildon_banner_show_information (NULL, NULL, _("mcen_nc_no_matching_contacts")); return FALSE; @@ -685,6 +736,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat 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; @@ -692,7 +744,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat start_ptr = g_utf8_offset_to_pointer (recipients, start_pos); end_ptr = g_utf8_offset_to_pointer (recipients, end_pos); - address = g_strndup (start_ptr, end_ptr - start_ptr); + address = g_strstrip (g_strndup (start_ptr, end_ptr - start_ptr)); 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); @@ -701,16 +753,17 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat 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"), + _CS("ckdg_ib_illegal_characters_entered"), char_in_string); g_free (char_in_string); hildon_banner_show_information (NULL, NULL, message ); - g_free (message); + g_free (message); result = FALSE; } else if (strstr (address, "@") == NULL) { /* here goes searching in addressbook */ gchar *contact_id = NULL; GSList *resolved_addresses = NULL; + result = resolve_address (address, &resolved_addresses, &contact_id); if (result) { @@ -757,13 +810,14 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat address_list, ""); g_slist_free (address_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 && update_addressbook) + if (result && update_addressbook && store_address) add_to_address_book (address); g_free (address); @@ -779,12 +833,6 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat gtk_text_buffer_place_cursor (buffer, &end_iter); } - g_source_remove (show_banner_timeout); - if (banner != NULL) { - gtk_widget_destroy (banner); - g_object_unref (G_OBJECT (banner)); - } - g_slist_foreach (start_indexes, (GFunc) g_free, NULL); g_slist_foreach (end_indexes, (GFunc) g_free, NULL); g_slist_free (start_indexes); @@ -831,11 +879,16 @@ select_contacts_for_name_dialog (const gchar *name) if (book_view) { GtkWidget *contact_view = NULL; GtkWidget *contact_dialog = NULL; +#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); - contact_view = osso_abook_contact_view_new_basic (contact_model); + contact_view = osso_abook_contact_selector_new_basic (contact_model); contact_dialog = osso_abook_select_dialog_new (OSSO_ABOOK_TREE_VIEW (contact_view)); + gtk_window_set_title (GTK_WINDOW (contact_dialog), _("mcen_ti_select_recipients")); if (gtk_dialog_run (GTK_DIALOG (contact_dialog)) == GTK_RESPONSE_OK) { result = osso_abook_contact_view_get_selection (OSSO_ABOOK_CONTACT_VIEW (contact_view)); @@ -852,6 +905,10 @@ static gboolean resolve_address (const gchar *address, GSList **resolved_addresses, gchar **contact_id) { GList *resolved_contacts; + guint banner_timeout; + GtkWidget *banner = NULL; + + banner_timeout = g_timeout_add (500, show_check_names_banner, &banner); contact_model = osso_abook_contact_model_new (); if (!open_addressbook_sync ()) { @@ -866,7 +923,9 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont if (resolved_contacts == NULL) { /* no matching contacts for the search string */ - modest_platform_run_information_dialog (NULL, _("mcen_nc_no_matching_contacts")); + modest_platform_run_information_dialog (NULL, _("mcen_nc_no_matching_contacts"), FALSE); + hide_check_names_banner (&banner, banner_timeout); + return FALSE; } @@ -874,7 +933,10 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont /* show a dialog to select the contact from the resolved ones */ g_list_free (resolved_contacts); + hide_check_names_banner (&banner, banner_timeout); resolved_contacts = select_contacts_for_name_dialog (address); + banner_timeout = g_timeout_add (500, show_check_names_banner, &banner); + } /* get the resolved contacts (can be no contact) */ @@ -883,6 +945,7 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont EContact *contact = (EContact *) resolved_contacts->data; *resolved_addresses = get_recipients_for_given_contact (contact); + hide_check_names_banner (&banner, banner_timeout); if (*resolved_addresses) { *contact_id = g_strdup (e_contact_get_const (contact, E_CONTACT_UID)); found = TRUE; @@ -897,6 +960,7 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont } else { /* cancelled dialog to select more than one contact or * selected no contact */ + hide_check_names_banner (&banner, banner_timeout); return FALSE; } @@ -932,3 +996,45 @@ unquote_string (const gchar *str) return g_string_free (buffer, FALSE); } + +gboolean +modest_address_book_has_address (const gchar *address) +{ + EBookQuery *query; + GList *contacts = NULL; + GError *err = NULL; + gchar *email; + gboolean result; + + 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 : ""); + if (err) + g_error_free (err); + return FALSE; + } + e_book_query_unref (query); + + result = (contacts != NULL); + if (contacts) { + g_list_foreach (contacts, (GFunc)unref_gobject, NULL); + g_list_free (contacts); + } + + g_free (email); + + return result; +}