projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes NB#123812, duplicate contacts created when inserting the same email address...
[modest]
/
src
/
hildon2
/
modest-address-book.c
diff --git
a/src/hildon2/modest-address-book.c
b/src/hildon2/modest-address-book.c
index
c22165a
..
160bd89
100644
(file)
--- a/
src/hildon2/modest-address-book.c
+++ b/
src/hildon2/modest-address-book.c
@@
-784,7
+784,7
@@
modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
start_pos = (*((gint*) current_start->data)) + offset_delta;
end_pos = (*((gint*) current_end->data)) + offset_delta;
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);
start_ptr = g_utf8_offset_to_pointer (recipients, start_pos);
end_ptr = g_utf8_offset_to_pointer (recipients, end_pos);
@@
-890,8
+890,11
@@
modest_address_book_check_names (ModestRecptEditor *recpt_editor, gboolean updat
}
/* Add addresses to address-book */
}
/* 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);
if (current_start == NULL) {
gtk_text_buffer_get_end_iter (buffer, &end_iter);
@@
-1021,8
+1024,8
@@
resolve_address (const gchar *address,
*canceled = FALSE;
info = g_slice_new0 (CheckNamesInfo);
show_check_names_banner (info);
*canceled = FALSE;
info = g_slice_new0 (CheckNamesInfo);
show_check_names_banner (info);
-
- contact_model = osso_abook_contact_model_new ();
+
+ contact_model = osso_abook_contact_model_get_default ();
if (!open_addressbook ()) {
hide_check_names_banner (info);
if (contact_model) {
if (!open_addressbook ()) {
hide_check_names_banner (info);
if (contact_model) {
@@
-1165,3
+1168,9
@@
modest_address_book_get_my_name ()
else
return NULL;
}
else
return NULL;
}
+
+void
+modest_address_book_init (void)
+{
+ open_addressbook ();
+}