From 35d40887f0fb15d335f6cf206fc2526ee72def1b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 23 Oct 2009 21:02:51 +0200 Subject: Bug #599131 - Crash on new contact adding with similar values as an old --- addressbook/gui/merging/eab-contact-merging.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index 6cb1ea99f9..5f599584c4 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -469,7 +469,10 @@ match_query_callback (EContact *contact, EContact *match, EABContactMatchType ty } /* if had same UID, then we are editing old contact, thus force commit change to it */ - same_uids = contact && match && g_str_equal (e_contact_get_const (contact, E_CONTACT_UID), e_contact_get_const (match, E_CONTACT_UID)); + same_uids = contact && match + && e_contact_get_const (contact, E_CONTACT_UID) + && e_contact_get_const (match, E_CONTACT_UID) + && g_str_equal (e_contact_get_const (contact, E_CONTACT_UID), e_contact_get_const (match, E_CONTACT_UID)); if ((gint) type <= (gint) EAB_CONTACT_MATCH_VAGUE || same_uids) { doit (lookup, same_uids); -- cgit v1.2.3