aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-10-24 03:02:51 +0800
committerMilan Crha <mcrha@redhat.com>2009-10-24 03:02:51 +0800
commit35d40887f0fb15d335f6cf206fc2526ee72def1b (patch)
tree3313d894b6d5e5f19128320d3d63c97106a040f4 /addressbook/gui
parent0c1fa4577108c2d15a4f3d96611a34e7d7d152ca (diff)
downloadgsoc2013-evolution-35d40887f0fb15d335f6cf206fc2526ee72def1b.tar
gsoc2013-evolution-35d40887f0fb15d335f6cf206fc2526ee72def1b.tar.gz
gsoc2013-evolution-35d40887f0fb15d335f6cf206fc2526ee72def1b.tar.bz2
gsoc2013-evolution-35d40887f0fb15d335f6cf206fc2526ee72def1b.tar.lz
gsoc2013-evolution-35d40887f0fb15d335f6cf206fc2526ee72def1b.tar.xz
gsoc2013-evolution-35d40887f0fb15d335f6cf206fc2526ee72def1b.tar.zst
gsoc2013-evolution-35d40887f0fb15d335f6cf206fc2526ee72def1b.zip
Bug #599131 - Crash on new contact adding with similar values as an old
Diffstat (limited to 'addressbook/gui')
-rw-r--r--addressbook/gui/merging/eab-contact-merging.c5
1 files changed, 4 insertions, 1 deletions
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);