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

20 files changed, 150 insertions, 46 deletions

diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 545fcc97f5..d360f7b5d7 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS =	\
-	contact-editor printing demo
+	contact-editor printing demo backend
diff --git a/addressbook/backend/Makefile.am b/addressbook/backend/Makefile.am
index 06c294e988..b2807b2480 100644
--- a/addressbook/backend/Makefile.am
+++ b/addressbook/backend/Makefile.am
@@ -1 +1 @@
-SUBDIRS = libversit idl ebook pas
+SUBDIRS = idl ebook pas
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 35cf59d537..84b85a8099 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -61,7 +61,7 @@ test_client_LDADD =					\
 	$(INTLLIBS)					\
 	-lbonobo					\
 	$(ebook_libs)					\
-	../libversit/libversit.la
+	$(top_builddir)/libversit/libversit.la
 
 test_card_SOURCES =					\
 	test-card.c
@@ -73,7 +73,7 @@ test_card_LDADD =					\
 	$(INTLLIBS)					\
 	-lbonobo					\
 	$(ebook_libs)					\
-	../libversit/libversit.la
+	$(top_builddir)/libversit/libversit.la
 
 BUILT_SOURCES = $(CORBA_SOURCE)
 CLEANFILES   += $(BUILT_SOURCES)
diff --git a/addressbook/backend/ebook/e-book-listener.c b/addressbook/backend/ebook/e-book-listener.c
index 3b04a09131..107f71fedc 100644
--- a/addressbook/backend/ebook/e-book-listener.c
+++ b/addressbook/backend/ebook/e-book-listener.c
@@ -9,7 +9,7 @@
  */
 
 #include <gtk/gtksignal.h>
- #include <e-book-listener.h>
+#include <e-book-listener.h>
 
 static EBookStatus e_book_listener_convert_status (Evolution_BookListener_CallStatus status);
 
diff --git a/addressbook/backend/ebook/e-card-pairs.h b/addressbook/backend/ebook/e-card-pairs.h
index d79d1171c6..baabdc3dca 100644
--- a/addressbook/backend/ebook/e-card-pairs.h
+++ b/addressbook/backend/ebook/e-card-pairs.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* GnomeCard - a graphical contact manager.
  *
  * pairs.h: This file is part of GnomeCard.
@@ -22,13 +23,15 @@
 #ifndef __E_CARD_PAIRS_H__
 #define __E_CARD_PAIRS_H__
 
-#include "../libversit/vcc.h"
+#include "libversit/vcc.h"
 #include <e-card.h>
 
+#if 0
+
 struct pair
 {
 	char *str;
-	enum PropertyType id;
+	ECardPropertyType i ;
 };
 
 struct pair prop_lookup[] = {
@@ -108,7 +111,7 @@ struct pair phone_pairs[] = {
 		{ VCISDNProp, PHONE_ISDN },
 		{ VCVideoProp, PHONE_VIDEO },
 		{ NULL, 0 } };
-
+#if 0
 struct pair email_pairs[] = {
 		{ VCAOLProp, EMAIL_AOL },
 		{ VCAppleLinkProp, EMAIL_APPLE_LINK },
@@ -123,7 +126,7 @@ struct pair email_pairs[] = {
 		{ VCTLXProp, EMAIL_TLX },
 		{ VCX400Prop, EMAIL_X400 },
 		{ NULL, 0 } };
-
+#endif
 struct pair sound_pairs[] = {
 		{ VCAIFFProp, SOUND_AIFF },
 		{ VCPCMProp, SOUND_PCM },
@@ -136,4 +139,5 @@ struct pair key_pairs[] = {
 		{ NULL, 0 } };
 	  
 
+#endif
 #endif /* ! __E_CARD_PAIRS_H__ */
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__ */
diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c
index bc5b13deae..0029694d35 100644
--- a/addressbook/backend/ebook/e-card.c
+++ b/addressbook/backend/ebook/e-card.c
@@ -1,3 +1,4 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Authors: 
  *   Arturo Espinosa (arturo@nuclecu.unam.mx)
@@ -11,17 +12,73 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib.h>
+#include <gtk/gtk.h>
 
-#include "../libversit/vcc.h"
-#include <e-card-pairs.h>
+#include "libversit/vcc.h"
 #include <e-card.h>
+#include <e-card-pairs.h>
 
 #define is_a_prop_of(obj,prop) isAPropertyOf (obj,prop)
 #define str_val(obj) the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc (1, 1)
 #define has(obj,prop) (vo = isAPropertyOf (obj, prop))
 
-static VObject *card_convert_to_vobject (Card *crd);
+#if 0
+static VObject *card_convert_to_vobject (ECard *crd);
+#endif
+
+/**
+ * e_card_get_type:
+ * @void: 
+ * 
+ * Registers the &ECard class if necessary, and returns the type ID
+ * associated to it.
+ * 
+ * Return value: The type ID of the &ECard class.
+ **/
+GtkType
+e_card_get_type (void)
+{
+	static GtkType card_type = 0;
+
+	if (!card_type) {
+		GtkTypeInfo card_info = {
+			"ECard",
+			sizeof (ECard),
+			sizeof (ECardClass),
+			NULL,
+			NULL,
+#if 0
+			(GtkClassInitFunc) e_card_class_init,
+			(GtkObjectInitFunc) e_card_init,
+#endif
+			NULL, /* reserved_1 */
+			NULL, /* reserved_2 */
+			(GtkClassInitFunc) NULL
+		};
+
+		card_type = gtk_type_unique (gtk_object_get_type (), &card_info);
+	}
+
+	return card_type;
+}
+
+ECard         *e_card_new (char *vcard)
+{
+	return E_CARD(gtk_type_new(e_card_get_type()));
+}
+
+char          *e_card_get_id (ECard *card)
+{
+	return NULL;
+}
+
+char          *e_card_get_vcard (ECard *card)
+{
+	return NULL;
+}
+
+
+#if 0
 
 /*
  * ECard lifecycle management and vCard loading/saving.
@@ -198,7 +255,7 @@ e_card_prop_str_empty (void)
 }
 
 /* Intended to check asserts. */
-extern int card_check_prop (CardProperty prop)
+extern int card_check_prop (ECardProperty prop)
 {
 	if (((prop.used == FALSE) || (prop.used == TRUE)) &&
 	    ((prop.type >= PROP_NONE) && (prop.type <= PROP_LAST)) &&
@@ -1854,3 +1911,4 @@ card_save (Card *crd, FILE *fp)
 	writeVObject (fp, object);
 	cleanVObject (object);
 }
+#endif
diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h
index 516cb85017..4b04f34c4d 100644
--- a/addressbook/backend/ebook/e-card.h
+++ b/addressbook/backend/ebook/e-card.h
@@ -1,5 +1,7 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Authors:
+ *   Chris Lahey <clahey@helixcode.com>
  *   Arturo Espinosa
  *   Nat Friedman (nat@helixcode.com)
  *
@@ -11,14 +13,22 @@
 #define __E_CARD_H__
 
 #include <time.h>
-#include <glib.h>
+#include <gtk/gtk.h>
 #include <stdio.h>
 #include <e-card-types.h>
 
+#define E_TYPE_CARD            (e_card_get_type ())
+#define E_CARD(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD, ECard))
+#define E_CARD_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD, ECardClass))
+#define E_IS_CARD(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD))
+#define E_IS_CARD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD))
+
 typedef struct _ECard ECard;
+typedef struct _ECardClass ECardClass;
 
 struct _ECard {
-
+	GtkObject object;
+#if 0
 	char            *fname;         /* The full name.                   */
 	ECardName       *name;          /* The structured name.             */
 
@@ -59,21 +69,36 @@ struct _ECard {
 	ECardRev        *rev;	        /* The time this card was last
 					   modified.                        */
 
-	CardList        xtension;
+	ECardList        xtension;
+#endif
 };
 
-Card         *card_new (void);
-void          card_free (Card *crd);
-void          card_prop_free (CardProperty prop);
-CardProperty  card_prop_empty (void);
-int           card_check_prop (CardProperty prop);
-GList        *card_load (GList *crdlist, char *fname);
-void          card_save (Card *crd, FILE *fp);
-char         *card_to_vobj_string (Card *card);
-char         *card_to_string (Card *card);
-
-char *card_bday_str (CardBDay bday);
-char *card_timezn_str (CardTimeZone timezn);
-char *card_geopos_str (CardGeoPos geopos);
+struct _ECardClass {
+	GtkObjectClass parent_class;
+};
+
+
+ECard         *e_card_new (char *vcard);
+char          *e_card_get_id (ECard *card);
+char          *e_card_get_vcard (ECard *card);
+
+/* Standard Gtk function */
+GtkType        e_card_get_type (void);
+
+
+#if 0
+void          e_card_free (ECard *crd);
+void          e_card_prop_free (CardProperty prop);
+CardProperty  e_card_prop_empty (void);
+int           e_card_check_prop (CardProperty prop);
+GList        *e_card_load (GList *crdlist, char *fname);
+void          e_card_save (ECard *crd, FILE *fp);
+char         *e_card_to_vobj_string (ECard *card);
+char         *e_card_to_string (ECard *card);
+
+char *e_card_bday_str (ECardDate bday);
+char *e_card_timezn_str (ECardTimeZone timezn);
+char *e_card_geopos_str (ECardGeoPos geopos);
+#endif
 
 #endif /* ! __E_CARD_H__ */
diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c
index 366e8db5ce..074709aef7 100644
--- a/addressbook/backend/ebook/test-client.c
+++ b/addressbook/backend/ebook/test-client.c
@@ -1,5 +1,7 @@
 #include <config.h>
 #include <bonobo.h>
+#include <gnome.h>
+#include <libgnorba/gnorba.h>
 
 #include <e-book.h>
 
diff --git a/addressbook/backend/idl/addressbook.idl b/addressbook/backend/idl/addressbook.idl
index 2fc4925a21..076216c9cf 100644
--- a/addressbook/backend/idl/addressbook.idl
+++ b/addressbook/backend/idl/addressbook.idl
@@ -6,7 +6,7 @@
  * Copyright 2000, Helix Code, Inc.
  */
 
-#include <bonobo-unknown.idl>
+#include <Bonobo.idl>
 
 module Evolution {
 
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index f23b607efe..ad5679c7e1 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -122,7 +122,7 @@ pas_backend_file_load_uri (PASBackend             *backend,
 	PASBackendFile *bf = PAS_BACKEND_FILE (backend);
 	char           *filename;
 
-	g_assert (PAS_BACKEND_FILE (backend)->priv->loaded == FALSE);
+	g_assert (bf->priv->loaded == FALSE);
 
 	filename = pas_backend_file_extract_path_from_uri (uri);
 }
@@ -210,8 +210,6 @@ pas_backend_file_new (void)
 static void
 pas_backend_file_destroy (GtkObject *object)
 {
-	PASBackendFile *backend = PAS_BACKEND_FILE (object);
-
 	GTK_OBJECT_CLASS (pas_backend_file_parent_class)->destroy (object);	
 }
 
diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c
index 5428b4ae7c..907ff6482a 100644
--- a/addressbook/backend/pas/pas-book.c
+++ b/addressbook/backend/pas/pas-book.c
@@ -455,7 +455,6 @@ pas_book_new (PASBackend             *backend,
 	      PASBookGetVCardFn       get_vcard)
 {
 	PASBook *book;
-	PASBook *retval;
 
 	g_return_val_if_fail (listener  != CORBA_OBJECT_NIL, NULL);
 	g_return_val_if_fail (get_vcard != NULL,             NULL);
diff --git a/addressbook/backend/pas/pas.c b/addressbook/backend/pas/pas.c
index f625eb6c2e..a892d98a5b 100644
--- a/addressbook/backend/pas/pas.c
+++ b/addressbook/backend/pas/pas.c
@@ -6,6 +6,7 @@
  */
 #include <config.h>
 #include <bonobo.h>
+#include <libgnorba/gnorba.h>
 
 #include <pas-book-factory.h>
 #include <pas-backend-file.h>
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index 01091b4bc3..81a6980ef7 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -372,8 +372,10 @@ _dialog_clicked(GtkWidget *dialog, gint button, EContactEditor *editor)
 {
 	GtkWidget *label = gtk_object_get_data(GTK_OBJECT(dialog),
 					       "e_contact_editor_label");
+#if 0
 	GtkWidget *entry = gtk_object_get_data(GTK_OBJECT(dialog),
 					       "e_contact_editor_entry");
+#endif
 	GtkWidget *dialog_entry = gtk_object_get_data(GTK_OBJECT(dialog),
 						      "e_contact_editor_dialog_entry");
 	GList **list = gtk_object_get_data(GTK_OBJECT(dialog),
diff --git a/addressbook/contact-editor/test-editor.c b/addressbook/contact-editor/test-editor.c
index 49ed7e48bf..23eb6e60ea 100644
--- a/addressbook/contact-editor/test-editor.c
+++ b/addressbook/contact-editor/test-editor.c
@@ -37,6 +37,7 @@ static void destroy_callback(GtkWidget *app, gpointer data)
 		exit(0);
 }
 
+#if 0
 static void about_callback( GtkWidget *widget, gpointer data )
 {
   
@@ -54,6 +55,7 @@ static void about_callback( GtkWidget *widget, gpointer data )
 		      NULL);
   gtk_widget_show (about);                                            
 }
+#endif
 
 int main( int argc, char *argv[] )
 {
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 01091b4bc3..81a6980ef7 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -372,8 +372,10 @@ _dialog_clicked(GtkWidget *dialog, gint button, EContactEditor *editor)
 {
 	GtkWidget *label = gtk_object_get_data(GTK_OBJECT(dialog),
 					       "e_contact_editor_label");
+#if 0
 	GtkWidget *entry = gtk_object_get_data(GTK_OBJECT(dialog),
 					       "e_contact_editor_entry");
+#endif
 	GtkWidget *dialog_entry = gtk_object_get_data(GTK_OBJECT(dialog),
 						      "e_contact_editor_dialog_entry");
 	GList **list = gtk_object_get_data(GTK_OBJECT(dialog),
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index 49ed7e48bf..23eb6e60ea 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -37,6 +37,7 @@ static void destroy_callback(GtkWidget *app, gpointer data)
 		exit(0);
 }
 
+#if 0
 static void about_callback( GtkWidget *widget, gpointer data )
 {
   
@@ -54,6 +55,7 @@ static void about_callback( GtkWidget *widget, gpointer data )
 		      NULL);
   gtk_widget_show (about);                                            
 }
+#endif
 
 int main( int argc, char *argv[] )
 {
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 5dc0e9f4bc..f86d2613b1 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -263,6 +263,7 @@ e_contact_text_height(GnomePrintContext *pc, GnomeFont *font, double width, gcha
 		line_count * .2 * font->size;
 }
 
+#if 0
 static void
 e_contact_output_and_advance(EContactPrintContext *ctxt, GnomeFont *font, double x, double width, gchar *text)
 {
@@ -271,6 +272,7 @@ e_contact_output_and_advance(EContactPrintContext *ctxt, GnomeFont *font, double
 	ctxt->y -= e_contact_text_height(ctxt->pc, font, width, text);
 	ctxt->y -= .1 * font->size;
 }
+#endif
 
 static void
 e_contact_rectangle(GnomePrintContext *pc, 
@@ -672,6 +674,8 @@ e_contact_do_print (void *book, EContactPrintContext *ctxt, GList *shown_fields)
 	case E_CONTACT_PRINT_TYPE_PHONE_LIST:
 		e_contact_do_print_phone_list( book, ctxt, shown_fields );
 		break;
+	default:
+		break;
 	}
 }
 
diff --git a/addressbook/printing/test-contact-print-style-editor.c b/addressbook/printing/test-contact-print-style-editor.c
index f6a3b99596..d4dccc0b87 100644
--- a/addressbook/printing/test-contact-print-style-editor.c
+++ b/addressbook/printing/test-contact-print-style-editor.c
@@ -36,6 +36,7 @@ static void destroy_callback(GtkWidget *app, gpointer data)
 		exit(0);
 }
 
+#if 0
 static void about_callback( GtkWidget *widget, gpointer data )
 {
   
@@ -53,6 +54,7 @@ static void about_callback( GtkWidget *widget, gpointer data )
 		      NULL);
   gtk_widget_show (about);                                            
 }
+#endif
 
 int main( int argc, char *argv[] )
 {
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
index 2ee396d37d..7b438eed31 100644
--- a/addressbook/printing/test-print.c
+++ b/addressbook/printing/test-print.c
@@ -35,6 +35,7 @@ static gint test_close(GnomeDialog *dialog, gpointer data)
 	return 1;
 }
 
+#if 0
 static void about_callback( GtkWidget *widget, gpointer data )
 {
   
@@ -52,6 +53,7 @@ static void about_callback( GtkWidget *widget, gpointer data )
 		      NULL);
   gtk_widget_show (about);                                            
 }
+#endif
 
 int main( int argc, char *argv[] )
 {
@@ -71,7 +73,7 @@ int main( int argc, char *argv[] )
 
   print = e_contact_print_dialog_new(NULL, shown_fields);
   gtk_widget_show_all(print);
-  gtk_signal_connect(GTK_OBJECT(print), "close", test_close, NULL);
+  gtk_signal_connect(GTK_OBJECT(print), "close", GTK_SIGNAL_FUNC(test_close), NULL);
 
   gtk_main();