From 224dce68f966e21cb18aea388c3f40fc46956fa9 Mon Sep 17 00:00:00 2001 From: Devashish Sharma Date: Fri, 21 Apr 2006 08:02:15 +0000 Subject: Fix for Bug 336713 svn path=/trunk/; revision=31847 --- addressbook/ChangeLog | 8 ++++++++ addressbook/gui/merging/eab-contact-merging.c | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 534b792f98..286a822be9 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2006-04-21 Devashish Sharma + + Fix for Bug 336713 + * gui/merging/eab-contact-merging.c: (cancelit): After selecting + "cancel duplicate" when pasting contacts, can't remove those + EContactMergingLookup. Make finished_lookup() available. + Patch by Simon Zheng . + 2006-03-29 Li Yuan Fix for bug #336454 diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c index ecb70b84d9..a8a2917ade 100644 --- a/addressbook/gui/merging/eab-contact-merging.c +++ b/addressbook/gui/merging/eab-contact-merging.c @@ -124,11 +124,9 @@ static void cancelit (EContactMergingLookup *lookup) { if (lookup->op == E_CONTACT_MERGING_ADD) { - if (lookup->id_cb) - final_id_cb (lookup->book, E_BOOK_ERROR_CANCELLED, NULL, lookup); + final_id_cb (lookup->book, E_BOOK_ERROR_CANCELLED, NULL, lookup); } else if (lookup->op == E_CONTACT_MERGING_COMMIT) { - if (lookup->cb) - final_cb (lookup->book, E_BOOK_ERROR_CANCELLED, lookup); + final_cb (lookup->book, E_BOOK_ERROR_CANCELLED, lookup); } } -- cgit