projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes NB#114929, add support to autocomplete usernames for Ovi and Yahoo Mail Plus
[modest]
/
src
/
hildon2
/
modest-address-book.c
diff --git
a/src/hildon2/modest-address-book.c
b/src/hildon2/modest-address-book.c
index
46f9245
..
05c2b86
100644
(file)
--- a/
src/hildon2/modest-address-book.c
+++ b/
src/hildon2/modest-address-book.c
@@
-104,7
+104,8
@@
open_addressbook ()
}
void
}
void
-modest_address_book_add_address (const gchar *address)
+modest_address_book_add_address (const gchar *address,
+ GtkWindow *parent)
{
GtkWidget *dialog = NULL;
gchar *email_address;
{
GtkWidget *dialog = NULL;
gchar *email_address;
@@
-115,10
+116,11
@@
modest_address_book_add_address (const gchar *address)
}
email_address = modest_text_utils_get_email_address (address);
}
email_address = modest_text_utils_get_email_address (address);
-
+
attribute = e_vcard_attribute_new (NULL, EVC_EMAIL);
e_vcard_attribute_add_value (attribute, email_address);
attribute = e_vcard_attribute_new (NULL, EVC_EMAIL);
e_vcard_attribute_add_value (attribute, email_address);
- dialog = osso_abook_temporary_contact_dialog_new (NULL, book, attribute, NULL);
+ dialog = osso_abook_temporary_contact_dialog_new (parent, book, attribute, NULL);
+
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@
-239,7
+241,8
@@
get_recipients_for_given_contact (EContact * contact,
emailid = get_email_addr_from_user(display_name, canceled);
if (emailid) {
emailid = get_email_addr_from_user(display_name, canceled);
if (emailid) {
- e_contact_set(E_CONTACT (abook_contact), E_CONTACT_EMAIL_1, emailid);
+ list = g_list_append (list, g_strdup (emailid));
+ e_contact_set(E_CONTACT (abook_contact), E_CONTACT_EMAIL, list);
osso_abook_contact_commit (abook_contact, FALSE, NULL, NULL);
}
g_object_unref (abook_contact);
osso_abook_contact_commit (abook_contact, FALSE, NULL, NULL);
}
g_object_unref (abook_contact);
@@
-576,12
+579,15
@@
async_get_contacts_cb (EBook *book,
g_debug ("----Preparing to commit contact %s", address);
} else {
gchar *email_address, *display_address;
g_debug ("----Preparing to commit contact %s", address);
} else {
gchar *email_address, *display_address;
+ GList *email_list = NULL;
/* Create new contact and add it to the list */
contact = e_contact_new ();
email_address = modest_text_utils_get_email_address (address);
/* Create new contact and add it to the list */
contact = e_contact_new ();
email_address = modest_text_utils_get_email_address (address);
- e_contact_set (contact, E_CONTACT_EMAIL_1, email_address);
+ email_list = g_list_append (email_list, email_address);
+ e_contact_set (contact, E_CONTACT_EMAIL, email_list);
g_free (email_address);
g_free (email_address);
+ g_list_free (email_list);
display_address = g_strdup (address);
if (display_address) {
display_address = g_strdup (address);
if (display_address) {