diff options
| -rw-r--r-- | addressbook/ChangeLog | 5 | ||||
| -rw-r--r-- | addressbook/gui/merging/eab-contact-merging.c | 1 |
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; } |