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.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'addressbook/gui/merging/e-card-merging.h') 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 - #include -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__ */ -- cgit v1.2.3