X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-address-book.c;h=cd0de4b40463c278d926f31ac42867f6876df012;hb=9f62ae5debde855663dca22567af8187b9f17b57;hp=bad6c9317a2b8ad67c43d41b4468b4c6598f2f92;hpb=53dc7de1843cd26cd027d1f8653165f769c7e2ed;p=modest diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c index bad6c93..cd0de4b 100644 --- a/src/maemo/modest-address-book.c +++ b/src/maemo/modest-address-book.c @@ -37,6 +37,7 @@ #include #include #include "modest-hildon-includes.h" +#include "modest-platform.h" #include #include #include @@ -50,7 +51,7 @@ static EBook *book = NULL; static EBookView * book_view = NULL; static GSList *get_recipients_for_given_contact(EContact * contact); -static void commit_contact(EContact * contact); +static void commit_contact(EContact * contact, gboolean is_new); static gchar *get_email_addr_from_user(const gchar * given_name); static gchar *ui_get_formatted_email_id(gchar * current_given_name, gchar * current_sur_name, gchar * current_email_id); @@ -61,6 +62,14 @@ 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) { @@ -274,7 +283,7 @@ static GSList *get_recipients_for_given_contact(EContact * contact) if (emailid) { e_contact_set(contact, E_CONTACT_EMAIL_1, emailid); - commit_contact(contact); + commit_contact(contact, FALSE); } } @@ -320,15 +329,18 @@ static GSList *get_recipients_for_given_contact(EContact * contact) * @return void */ static void -commit_contact(EContact * contact) +commit_contact(EContact * contact, gboolean is_new) { + g_return_if_fail (contact); + g_return_if_fail (book); + if (!contact || !book) return; - + #ifdef MODEST_HAVE_OLD_ABOOK - osso_abook_contact_commit(contact, FALSE, book); + osso_abook_contact_commit(contact, is_new, book); #else - osso_abook_contact_commit(contact, FALSE, book, NULL); + osso_abook_contact_commit(contact, is_new, book, NULL); #endif /* MODEST_HILDON_VERSION_0 */ } @@ -513,6 +525,10 @@ select_email_addrs_for_contact(GList * email_addr_list) _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, NULL); gtk_dialog_set_has_separator(GTK_DIALOG(select_email_addr_dlg), FALSE); + /* Make the window approximately big enough, because it doesn't resize to be big enough + * for the window title text: */ + gtk_window_set_default_size (GTK_WINDOW (select_email_addr_dlg), 400, -1); + scrolledwindow = gtk_scrolled_window_new(NULL, NULL); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(select_email_addr_dlg)->vbox), scrolledwindow, TRUE, TRUE, 0); @@ -562,8 +578,55 @@ select_email_addrs_for_contact(GList * email_addr_list) return selected_email_addr_list; } + +static gboolean /* make this public? */ +add_to_address_book (const gchar* address) +{ + EBookQuery *query; + GList *contacts = NULL; + GError *err = NULL; + + g_return_val_if_fail (address, FALSE); + + if (!book) + open_addressbook (); + + g_return_val_if_fail (book, FALSE); + + query = e_book_query_field_test (E_CONTACT_EMAIL, E_BOOK_QUERY_IS, address); + 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); + + /* we need to 'commit' it, even if we already found the email + * address in the addressbook; thus, it will show up in the 'recent list' */ + if (contacts) { + g_debug ("%s already in the address book", address); + commit_contact ((EContact*)contacts->data, FALSE); + + g_list_foreach (contacts, (GFunc)unref_gobject, NULL); + g_list_free (contacts); + + } 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); + commit_contact (new_contact, TRUE); + g_debug ("%s added to address book", address); + g_object_unref (new_contact); + } + + return TRUE; +} + + gboolean -modest_address_book_check_names (ModestRecptEditor *recpt_editor) +modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean update_addressbook) { const gchar *recipients = NULL; GSList *start_indexes = NULL, *end_indexes = NULL; @@ -599,7 +662,7 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor) gchar *start_ptr, *end_ptr; gint start_pos, end_pos; const gchar *invalid_char_position = NULL; - + start_pos = (*((gint*) current_start->data)) + offset_delta; end_pos = (*((gint*) current_end->data)) + offset_delta; @@ -642,15 +705,21 @@ modest_address_book_check_names (ModestRecptEditor *recpt_editor) recipients = modest_recpt_editor_get_recipients (recpt_editor); new_length = g_utf8_strlen (recipients, -1); offset_delta = offset_delta + new_length - last_length; - last_length = new_length; + last_length = new_length; } } else { /* this address is not valid, select it and return control to user showing banner */ - hildon_banner_show_information (NULL, NULL, _("mcen_ib_invalid_email")); result = FALSE; } - } + } + + /* 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) + add_to_address_book (address); + g_free (address); if (result == FALSE) break; @@ -749,7 +818,7 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont if (resolved_contacts == NULL) { /* no matching contacts for the search string */ - hildon_banner_show_information (NULL, NULL, _("mcen_nc_no_matching_contacts")); + modest_platform_run_information_dialog (NULL, _("mcen_nc_no_matching_contacts")); return FALSE; } @@ -768,7 +837,10 @@ resolve_address (const gchar *address, GSList **resolved_addresses, gchar **cont if (*resolved_addresses) { *contact_id = g_strdup (e_contact_get_const (contact, E_CONTACT_UID)); } - /* TODO: free the resolved_contacts list */ + + g_list_foreach (resolved_contacts, (GFunc)unref_gobject, NULL); + g_list_free (resolved_contacts); + return TRUE; } else { /* cancelled dialog to select more than one contact or