aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@novell.com>2008-02-18 04:10:32 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2008-02-18 04:10:32 +0800
commit6bd268c9938d7680bf97e1adc6c3629a67a99439 (patch)
treea74ff9b555b739e70c411646ebb95fb62c60f759 /addressbook
parent5fc8edb5f0e1e474a94a9b56c8c0f59516029aa4 (diff)
downloadgsoc2013-evolution-6bd268c9938d7680bf97e1adc6c3629a67a99439.tar
gsoc2013-evolution-6bd268c9938d7680bf97e1adc6c3629a67a99439.tar.gz
gsoc2013-evolution-6bd268c9938d7680bf97e1adc6c3629a67a99439.tar.bz2
gsoc2013-evolution-6bd268c9938d7680bf97e1adc6c3629a67a99439.tar.lz
gsoc2013-evolution-6bd268c9938d7680bf97e1adc6c3629a67a99439.tar.xz
gsoc2013-evolution-6bd268c9938d7680bf97e1adc6c3629a67a99439.tar.zst
gsoc2013-evolution-6bd268c9938d7680bf97e1adc6c3629a67a99439.zip
Upstream patch from OpenSUSE.
2008-02-18 Srinivasa Ragavan <sragavan@novell.com> * gui/merging/eab-contact-merging.c: (mergeit): Upstream patch from OpenSUSE. svn path=/trunk/; revision=35030
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/merging/eab-contact-merging.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index fbbbdb8ea5..4bc276a345 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-18 Srinivasa Ragavan <sragavan@novell.com>
+
+ * gui/merging/eab-contact-merging.c: (mergeit): Upstream patch from
+ OpenSUSE.
+
2008-02-14 Matthew Barnes <mbarnes@redhat.com>
* gui/component/addressbook.c (addressbook_authenticate):
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 2f6955bb0f..de1d832b53 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -343,6 +343,7 @@ mergeit (EContactMergingLookup *lookup)
value = 1;
break;
case GTK_RESPONSE_CANCEL:
+ default:
value = 0;
break;
}