aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/Makefile.am7
-rw-r--r--addressbook/gui/merging/e-card-merging.c4
-rw-r--r--addressbook/gui/merging/e-card-merging.h6
4 files changed, 17 insertions, 8 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 2078ac932b..20c3a58ef7 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2002-11-06 Chris Toshok <toshok@ximian.com>
+
+ * 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.
+
2002-11-05 Chris Toshok <toshok@ximian.com>
* gui/component/.cvsignore: ignore the new .server file.
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 9aad9c1b30..5a63f33ca3 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,7 +1,10 @@
if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR=conduit
+# PENDING_PORT_WORK
+# CONDUIT_SUBDIR=conduit
endif
SUBDIRS = \
- backend printing gui $(CONDUIT_SUBDIR)
+ backend gui $(CONDUIT_SUBDIR)
+# PENDING_PORT_WORK
+# SUBDIRS = ... printing
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);
diff --git a/addressbook/gui/merging/e-card-merging.h b/addressbook/gui/merging/e-card-merging.h
index c4d9483beb..8ea1f9f018 100644
--- a/addressbook/gui/merging/e-card-merging.h
+++ b/addressbook/gui/merging/e-card-merging.h
@@ -11,11 +11,9 @@
#ifndef __E_CARD_MERGING_H__
#define __E_CARD_MERGING_H__
-#include <libgnome/gnome-defs.h>
-
#include <addressbook/backend/ebook/e-book.h>
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
gboolean e_card_merging_book_add_card (EBook *book,
ECard *card,
@@ -26,6 +24,6 @@ gboolean e_card_merging_book_commit_card (EBook *book,
EBookCallback cb,
gpointer closure);
-END_GNOME_DECLS
+G_END_DECLS
#endif /* ! __E_CARD_MERGING_H__ */