X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-address-book.c;h=c7087cae3f293198db38663e734f6801708ee0e8;hb=b83ebc30beffa2963f434dcb6640a44d0054727b;hp=9b3541ff8f9535f9365cb1a676a8ac30d11d8e92;hpb=e3480a667fa614794b145a9b3d5124e64e26198f;p=modest diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c index 9b3541f..c7087ca 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,21 @@ 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; +#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 +200,7 @@ 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")); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (contact_dialog)); gtk_widget_show (contact_dialog); @@ -195,6 +209,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 +242,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)); @@ -338,11 +366,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 */ } /** @@ -650,6 +678,18 @@ show_check_names_banner (gpointer userdata) 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) { @@ -661,8 +701,6 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat gint offset_delta = 0; gint last_length; GtkTextIter start_iter, end_iter; - guint banner_timeout; - GtkWidget *banner = NULL; g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE); @@ -679,8 +717,6 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat } } - banner_timeout = g_timeout_add (500, show_check_names_banner, &banner); - current_start = start_indexes; current_end = end_indexes; buffer = modest_recpt_editor_get_buffer (recpt_editor); @@ -690,6 +726,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; @@ -716,6 +753,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat /* here goes searching in addressbook */ gchar *contact_id = NULL; GSList *resolved_addresses = NULL; + result = resolve_address (address, &resolved_addresses, &contact_id); if (result) { @@ -762,13 +800,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); @@ -789,14 +828,6 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat g_slist_free (start_indexes); g_slist_free (end_indexes); - g_source_remove (banner_timeout); - if (banner != NULL) { - gtk_widget_destroy (banner); - banner = NULL; - } else { - g_source_remove (banner_timeout); - } - return result; } @@ -838,7 +869,11 @@ 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); @@ -859,6 +894,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 ()) { @@ -873,7 +912,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; } @@ -881,7 +922,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) */ @@ -890,6 +934,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; @@ -904,6 +949,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; }