From 9226ae567f36f0975211a86dce0b053c6ff3403a Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 21 Jun 2004 15:01:38 +0000 Subject: Make sure the UIDs match. Should fix bug #59725. 2004-06-21 Jeffrey Stedfast * conduit/address-conduit.c (local_record_from_uid): Make sure the UIDs match. Should fix bug #59725. svn path=/trunk/; revision=26438 --- addressbook/ChangeLog | 5 +++++ addressbook/conduit/address-conduit.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 0ca01c6225..350ff062d2 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,8 @@ +2004-06-21 Jeffrey Stedfast + + * conduit/address-conduit.c (local_record_from_uid): Make sure the + UIDs match. Should fix bug #59725. + 2004-06-19 Sivaiah Nallagatla * gui/component/addressbook-config.c (dialog_to_source) : diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index 478173e751..02ab7102c6 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -21,7 +21,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ + +#ifdef HAVE_CONFIG_H #include +#endif #define G_LOG_DOMAIN "eaddrconduit" @@ -947,6 +950,7 @@ local_record_from_uid (EAddrLocalRecord *local, EAddrConduitContext *ctxt) { EContact *contact = NULL; + const char *cuid; GList *l; g_assert (local != NULL); @@ -955,7 +959,7 @@ local_record_from_uid (EAddrLocalRecord *local, contact = l->data; /* FIXME Do we need to check for the empty string? */ - if (e_contact_get_const (contact, E_CONTACT_UID)); + if ((cuid = e_contact_get_const (contact, E_CONTACT_UID)) && !strcmp (cuid, uid)); break; contact = NULL; @@ -1563,7 +1567,7 @@ match (GnomePilotConduitSyncAbs *conduit, const char *uid; LOG (g_message ("match: looking for local copy of %s\n", - print_remote (remote))); + print_remote (remote))); g_return_val_if_fail (local != NULL, -1); g_return_val_if_fail (remote != NULL, -1); -- cgit v1.2.3