Added the addressbook/backend directory.

2000-03-22  Christopher James Lahey  <clahey@helixcode.com>

        * addressbook/Makefile.am, configure.in: Added the
        addressbook/backend directory.

        * addressbook/backend/Makefile.am: Removed the libversit directory
        as it's now included in the base evolution directory.

        * addressbook/backend/ebook/e-card-pairs.h,
        addressbook/backend/ebook/Makefile.am: Changed the place where
        libversit is looked for.

        * addressbook/backend/ebook/e-book-listener.c: Fixed some
        indentation.

        * addressbook/backend/ebook/e-card-pairs.h,
        addressbook/backend/ebook/e-card-types.h: Commented out some code
        to get this to compile.

        * addressbook/backend/ebook/e-card.c,
        addressbook/backend/ebook/e-card.h: Turned this into a GTK+
        object.

        * addressbook/backend/pas/pas.c,
        addressbook/backend/ebook/test-client.c: Include gnome.h and
        gnorba.h.

        * addressbook/backend/idl/addressbook.idl: Include Bonobo.idl
        instead of bonobo-unknown.idl.

        * addressbook/backend/pas/pas-backend-file.c,
        addressbook/backend/pas/pas-book.c,
        addressbook/contact-editor/test-editor.c,
        addressbook/contact-editor/e-contact-editor.c,
        addressbook/printing/e-contact-print.c,
        addressbook/printing/test-contact-print-style-editor.c,
        addressbook/printing/test-print.c: Killed some warnings.

svn path=/trunk/; revision=2150

1 files changed, 11 insertions, 10 deletions

diff --git a/addressbook/backend/ebook/e-card-types.h b/addressbook/backend/ebook/e-card-types.h
index adf62ad68f..6e6a6a73be 100644
--- a/addressbook/backend/ebook/e-card-types.h
+++ b/addressbook/backend/ebook/e-card-types.h
@@ -9,7 +9,7 @@
 
 #ifndef __E_CARD_TYPES_H__
 #define __E_CARD_TYPES_H__
-
+#if 0
 typedef enum
 {
 	PROP_NONE = 0, /* Must always be the first, with value = 0. */
@@ -72,6 +72,12 @@ typedef enum
 	VAL_LAST = 4
 } ECardValueType;
 
+typedef enum {
+	PHOTO_GIF,  PHOTO_CGM,   PHOTO_WMF,  PHOTO_BMP, PHOTO_MET, PHOTO_PMB, 
+	PHOTO_DIB,  PHOTO_PICT,  PHOTO_TIFF, PHOTO_PS,  PHOTO_PDF, PHOTO_JPEG,
+	PHOTO_MPEG, PHOTO_MPEG2, PHOTO_AVI,  PHOTO_QTIME
+} ECardPhotoType;
+
 typedef struct {
 	gboolean           used;
 	ECardPropertyType  type;
@@ -116,7 +122,7 @@ typedef struct {
 typedef struct {
 	CardProperty prop;
 	
-	enum ECardPhotoType type;
+	ECardPhotoType type;
 	guint size;
 	char *data;
 
@@ -166,12 +172,6 @@ typedef struct {
 } ECardGeoPos;
 
 
-typedef enum {
-	PHOTO_GIF,  PHOTO_CGM,   PHOTO_WMF,  PHOTO_BMP, PHOTO_MET, PHOTO_PMB, 
-	PHOTO_DIB,  PHOTO_PICT,  PHOTO_TIFF, PHOTO_PS,  PHOTO_PDF, PHOTO_JPEG,
-	PHOTO_MPEG, PHOTO_MPEG2, PHOTO_AVI,  PHOTO_QTIME
-} ECardPhotoType;
-
 /* DELIVERY ADDRESSING PROPERTIES */
 
 typedef enum {
@@ -231,7 +231,7 @@ typedef struct {
 
 
 typedef struct {
-	enum SoundType  type;
+	ECardSoundType  type;
 	unsigned int    size;
 	char           *data;
 } ECardSound;
@@ -239,8 +239,9 @@ typedef struct {
 typedef struct {
 	CardProperty  prop;
 	
-	enum KeyType  type;
+	ECardKeyType  type;
 	char         *data;
 } ECardKey;
 
+#endif /* 0 */
 #endif /* __E_CARD_TYPES_H__ */