diff options
| author | Chris Toshok <toshok@ximian.com> | 2004-08-27 02:52:10 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2004-08-27 02:52:10 +0800 |
| commit | 2fe7d9c79a7a38df4cea878cf5a4d85c442f5af8 (patch) | |
| tree | cf4730b00fa66f16538cce00d9116fe614a3b66b /addressbook/ChangeLog | |
| parent | b472b77d6c5147bebd631df616d030ea79255759 (diff) | |
| download | gsoc2013-evolution-2fe7d9c79a7a38df4cea878cf5a4d85c442f5af8.tar.gz gsoc2013-evolution-2fe7d9c79a7a38df4cea878cf5a4d85c442f5af8.tar.zst gsoc2013-evolution-2fe7d9c79a7a38df4cea878cf5a4d85c442f5af8.zip | |
[ patch for the rest of 60889 ] new function, either start up the query or
2004-08-26 Chris Toshok <toshok@ximian.com>
[ patch for the rest of 60889 ]
* gui/merging/eab-contact-merging.c (add_lookup): new function,
either start up the query or add it to the queue if we're over the
number of simultaneous queries.
(finished_lookup): start up enough pending queries to get us to
our limit again.
(free_lookup): free lookup->avoid.
(final_id_cb): call finished_lookup.
(eab_merging_book_add_contact): set lookup->avoid to NULL and
replace call to eab_contact_locate_match_full with add_lookup.
(eab_merging_book_commit_contact): set lookup->avoid to the
contact, and make the same
s/eab_contact_locate_match_full/add_lookup/ replacement.
svn path=/trunk/; revision=27038
Diffstat (limited to 'addressbook/ChangeLog')
| -rw-r--r-- | addressbook/ChangeLog | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index bcdb60510c..880f902252 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,19 @@ +2004-08-26 Chris Toshok <toshok@ximian.com> + + [ patch for the rest of 60889 ] + * gui/merging/eab-contact-merging.c (add_lookup): new function, + either start up the query or add it to the queue if we're over the + number of simultaneous queries. + (finished_lookup): start up enough pending queries to get us to + our limit again. + (free_lookup): free lookup->avoid. + (final_id_cb): call finished_lookup. + (eab_merging_book_add_contact): set lookup->avoid to NULL and + replace call to eab_contact_locate_match_full with add_lookup. + (eab_merging_book_commit_contact): set lookup->avoid to the + contact, and make the same + s/eab_contact_locate_match_full/add_lookup/ replacement. + 2004-08-26 Christian Neumair <chris@gnome-de.org> * gui/component/GNOME_Evolution_Addressbook.server.in.in: |