aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2004-04-06 08:31:08 +0800
committerChris Toshok <toshok@src.gnome.org>2004-04-06 08:31:08 +0800
commit2e0dac30be563758445a8c7207eb5f49b3f53649 (patch)
treed366b60bcfa08f84d7fafa92b233e769da9763fb
parentd12f139ad4981949db30dac4a4f7e60b77049f8a (diff)
downloadgsoc2013-evolution-2e0dac30be563758445a8c7207eb5f49b3f53649.tar.gz
gsoc2013-evolution-2e0dac30be563758445a8c7207eb5f49b3f53649.tar.zst
gsoc2013-evolution-2e0dac30be563758445a8c7207eb5f49b3f53649.zip
use the correct glade filename.
2004-04-05 Chris Toshok <toshok@ximian.com> * gui/merging/eab-contact-merging.c (match_query_callback): use the correct glade filename. svn path=/trunk/; revision=25327
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/merging/eab-contact-merging.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 49ecb6d969..efa128b6c5 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-05 Chris Toshok <toshok@ximian.com>
+
+ * gui/merging/eab-contact-merging.c (match_query_callback): use
+ the correct glade filename.
+
2004-04-01 Hari Prasad Nadig <hp@ndeepak.info>
Fixes #53433.
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 38a3c188b2..8cabe1cd4e 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -113,7 +113,7 @@ match_query_callback (EContact *contact, EContact *match, EABContactMatchType ty
if (lookup->op == E_CONTACT_MERGING_ADD)
ui = glade_xml_new (EVOLUTION_GLADEDIR "/eab-contact-duplicate-detected.glade", NULL, NULL);
else if (lookup->op == E_CONTACT_MERGING_COMMIT)
- ui = glade_xml_new (EVOLUTION_GLADEDIR "/eab-contact-merging-commit-duplicate-detected.glade", NULL, NULL);
+ ui = glade_xml_new (EVOLUTION_GLADEDIR "/eab-contact-commit-duplicate-detected.glade", NULL, NULL);
else {
doit (lookup);
return;