fix warnings, get compiling again

2001-08-20  JP Rosevear  <jpr@ximian.com>

	* conduit/address-conduit.c: fix warnings, get compiling again

	* conduit/address-conduit-config.h: remove c/p typos

	* conduit/address-conduit.h: ditto

	* conduit/Makefile.am: link against the static camel

svn path=/trunk/; revision=12288

5 files changed, 38 insertions, 25 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index ef8a52018f..31568a82da 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,13 @@
+2001-08-20  JP Rosevear  <jpr@ximian.com>
+
+	* conduit/address-conduit.c: fix warnings, get compiling again
+
+	* conduit/address-conduit-config.h: remove c/p typos
+
+	* conduit/address-conduit.h: ditto
+
+	* conduit/Makefile.am: link against the static camel
+
 2001-08-20  Damon Chaplin  <damon@ximian.com>
 
 	* gui/contact-editor/e-contact-editor.c: use bigger Save icon for
diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am
index 4c564a069d..d382736b46 100644
--- a/addressbook/conduit/Makefile.am
+++ b/addressbook/conduit/Makefile.am
@@ -6,7 +6,8 @@ INCLUDES = 					\
 	-I$(top_builddir)/e-util		\
 	$(PISOCK_CFLAGS)			\
 	$(GNOME_PILOT_CFLAGS)			\
-	$(BONOBO_GNOME_CFLAGS)
+	$(BONOBO_GNOME_CFLAGS)			\
+	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
 
 # Address Conduit
 e_address_conduitsdir=$(libdir)/gnome-pilot/conduits
@@ -20,10 +21,11 @@ libeaddress_conduit_la_SOURCES = \
 libeaddress_conduit_la_LDFLAGS = -module -avoid-version
 libeaddress_conduit_la_LIBADD = 					\
 	$(top_builddir)/addressbook/backend/ebook/libebook-static.la	\
-	$(top_builddir)/e-util/libeutil-static.la			\
 	$(top_builddir)/e-util/ename/libename-static.la			\
 	$(top_builddir)/libversit/libversit.la				\
 	$(top_builddir)/e-util/libeconduit-static.la	 		\
+	$(top_builddir)/camel/libcamel-static.la	 		\
+	$(top_builddir)/libibex/libibex.la				\
 	$(PISOCK_LIBS) 							\
 	$(GNOME_PILOT_LIBS) 						\
 	$(BONOBO_CONF_LIBS)						\
diff --git a/addressbook/conduit/address-conduit-config.h b/addressbook/conduit/address-conduit-config.h
index d622aa11c6..d227bbc6d4 100644
--- a/addressbook/conduit/address-conduit-config.h
+++ b/addressbook/conduit/address-conduit-config.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Configuration
+/* Evolution calendar - Addressbook Conduit Configuration
  *
  * Copyright (C) 1998 Free Software Foundation
  * Copyright (C) 2000 Ximian, Inc.
@@ -44,7 +44,7 @@ static void
 addrconduit_load_configuration (EAddrConduitCfg **c, guint32 pilot_id) 
 {
 	gchar prefix[256];
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
+	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",
 		    pilot_id);
 	
 	*c = g_new0 (EAddrConduitCfg,1);
@@ -68,7 +68,7 @@ addrconduit_save_configuration (EAddrConduitCfg *c)
 {
 	gchar prefix[256];
 
-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",
+	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",
 		    c->pilot_id);
 
 	gnome_config_push_prefix (prefix);
@@ -111,11 +111,4 @@ addrconduit_destroy_configuration (EAddrConduitCfg **c)
 }
 #endif
 
-#endif __ADDR_CONDUIT_CONFIG_H__ 
-
-
-
-
-
-
-
+#endif /* __ADDR_CONDUIT_CONFIG_H__ */
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 61917cc00f..ca0530033d 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -407,14 +407,22 @@ local_record_from_ecard (EAddrLocalRecord *local, ECard *ecard, EAddrConduitCont
 
 static void 
 local_record_from_uid (EAddrLocalRecord *local,
-		       char *uid,
+		       const char *uid,
 		       EAddrConduitContext *ctxt)
 {
 	ECard *ecard = NULL;
-
+	GList *l;
+	
 	g_assert (local != NULL);
 
-	ecard = e_book_get_card (ctxt->ebook, uid);
+	for (l = ctxt->cards; l != NULL; l = l->next) {
+		ecard = l->data;
+		
+		if (ecard->id && !strcmp (ecard->id, uid))
+			break;
+
+		ecard = NULL;
+	}
 
 	if (ecard != NULL) {
 		local_record_from_ecard (local, ecard, ctxt);
@@ -565,7 +573,7 @@ card_added (EBookView *book_view, const GList *cards, EAddrConduitContext *ctxt)
 		gtk_object_ref (GTK_OBJECT (coc->card));
 		ctxt->changed = g_list_prepend (ctxt->changed, coc);
 		if (!e_pilot_map_uid_is_archived (ctxt->map, e_card_get_id (coc->card)))
-			g_hash_table_insert (ctxt->changed_hash, e_card_get_id (coc->card), coc);
+			g_hash_table_insert (ctxt->changed_hash, (gpointer)e_card_get_id (coc->card), coc);
 	}
 }
 
@@ -583,7 +591,7 @@ card_changed (EBookView *book_view, const GList *cards, EAddrConduitContext *ctx
 		gtk_object_ref (GTK_OBJECT (coc->card));
 		ctxt->changed = g_list_prepend (ctxt->changed, coc);
 		if (!e_pilot_map_uid_is_archived (ctxt->map, e_card_get_id (coc->card)))
-			g_hash_table_insert (ctxt->changed_hash, e_card_get_id (coc->card), coc);
+			g_hash_table_insert (ctxt->changed_hash, (gpointer)e_card_get_id (coc->card), coc);
 	}
 }
 
@@ -599,7 +607,7 @@ card_removed (EBookView *book_view, const char *id, EAddrConduitContext *ctxt)
 
 	ctxt->changed = g_list_prepend (ctxt->changed, coc);
 	if (!e_pilot_map_uid_is_archived (ctxt->map, id))
-		g_hash_table_insert (ctxt->changed_hash, e_card_get_id (coc->card), coc);
+		g_hash_table_insert (ctxt->changed_hash, (gpointer)e_card_get_id (coc->card), coc);
 }
 
 static void
@@ -951,7 +959,7 @@ replace_record (GnomePilotConduitSyncAbs *conduit,
 		if (coc) {
 			g_hash_table_remove (ctxt->changed_hash, e_card_get_id (coc->card));
 			coc->card = local->ecard;
-			g_hash_table_insert (ctxt->changed_hash, e_card_get_id (coc->card), coc);
+			g_hash_table_insert (ctxt->changed_hash, (gpointer)e_card_get_id (coc->card), coc);
 			
 		}
 		
@@ -1011,7 +1019,7 @@ match (GnomePilotConduitSyncAbs *conduit,
        EAddrLocalRecord **local,
        EAddrConduitContext *ctxt)
 {
-  	char *uid;
+  	const char *uid;
 	
 	LOG ("match: looking for local copy of %s\n",
 	     print_remote (remote));	
diff --git a/addressbook/conduit/address-conduit.h b/addressbook/conduit/address-conduit.h
index 9075957e90..ea5fc12378 100644
--- a/addressbook/conduit/address-conduit.h
+++ b/addressbook/conduit/address-conduit.h
@@ -1,5 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* Evolution calendar - ToDo Conduit Capplet
+/* Evolution calendar - Addressbook Conduit Capplet
  *
  * Copyright (C) 1998 Free Software Foundation
  * Copyright (C) 2000 Ximian, Inc.
@@ -34,7 +34,7 @@
 #include <gpilotd/gnome-pilot-conduit-sync-abs.h>
 #include <e-pilot-map.h>
 
-/* This is the local record structure for the Evolution ToDo conduit. */
+/* This is the local record structure for the Evolution Addressbook conduit. */
 typedef struct _EAddrLocalRecord EAddrLocalRecord;
 struct _EAddrLocalRecord {
 	/* The stuff from gnome-pilot-conduit-standard-abs.h
@@ -46,7 +46,7 @@ struct _EAddrLocalRecord {
 	/* The corresponding ECard object */
 	ECard *ecard;
 
-        /* pilot-link todo structure, used for implementing Transmit. */
+        /* pilot-link address structure, used for implementing Transmit. */
 	struct Address *addr;
 };
 
@@ -68,7 +68,7 @@ struct _EAddrConduitContext {
 	EPilotMap *map;
 };
 
-#endif __ADDR_CONDUIT_H__ 
+#endif /* __ADDR_CONDUIT_H__ */