aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevashish Sharma <dsharma@src.gnome.org>2006-04-21 16:02:15 +0800
committerDevashish Sharma <dsharma@src.gnome.org>2006-04-21 16:02:15 +0800
commit224dce68f966e21cb18aea388c3f40fc46956fa9 (patch)
treee633428d0f27f3361cc7d5ec6d7f218cb495165c
parent606a0c407c5aed99978796d3585ea1fe52fd785c (diff)
downloadgsoc2013-evolution-224dce68f966e21cb18aea388c3f40fc46956fa9.tar
gsoc2013-evolution-224dce68f966e21cb18aea388c3f40fc46956fa9.tar.gz
gsoc2013-evolution-224dce68f966e21cb18aea388c3f40fc46956fa9.tar.bz2
gsoc2013-evolution-224dce68f966e21cb18aea388c3f40fc46956fa9.tar.lz
gsoc2013-evolution-224dce68f966e21cb18aea388c3f40fc46956fa9.tar.xz
gsoc2013-evolution-224dce68f966e21cb18aea388c3f40fc46956fa9.tar.zst
gsoc2013-evolution-224dce68f966e21cb18aea388c3f40fc46956fa9.zip
Fix for Bug 336713
svn path=/trunk/; revision=31847
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/merging/eab-contact-merging.c6
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 <sdevashish@novell.com>
+
+ 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 <simon.zheng@sun.com>.
+
2006-03-29 Li Yuan <li.yuan@sun.com>
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);
}
}