From 080eaec6cb57cf5f83cd271dcb12db528ddf9579 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Wed, 6 Nov 2002 08:41:35 +0000 Subject: only build the backend and gui dirs for now. printing and conduits are 2002-11-06 Chris Toshok * Makefile.am (SUBDIRS): only build the backend and gui dirs for now. printing and conduits are no-man's land at present. * addressbook/gui/merging/e-card-merging.[ch]: Port to GObject/gnome2. svn path=/trunk/; revision=18595 --- addressbook/gui/merging/e-card-merging.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/merging/e-card-merging.c') diff --git a/addressbook/gui/merging/e-card-merging.c b/addressbook/gui/merging/e-card-merging.c index 14ed261405..e46164e92a 100644 --- a/addressbook/gui/merging/e-card-merging.c +++ b/addressbook/gui/merging/e-card-merging.c @@ -81,9 +81,9 @@ match_query_callback (ECard *card, ECard *match, ECardMatchType type, gpointer c GtkWidget *widget; if (lookup->op == E_CARD_MERGING_ADD) - ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-duplicate-detected.glade", NULL); + ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-duplicate-detected.glade", NULL, NULL); else if (lookup->op == E_CARD_MERGING_COMMIT) - ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-merging-book-commit-duplicate-detected.glade", NULL); + ui = glade_xml_new (EVOLUTION_GLADEDIR "/e-card-merging-book-commit-duplicate-detected.glade", NULL, NULL); else { doit (lookup); g_free (lookup); -- cgit