remove duplicate message

2001-01-22  JP Rosevear  <jpr@ximian.com>

	* conduits/todo/todo-conduit.c (for_each_modified): remove duplicate
	message

	* conduits/calendar/Makefile.am: Remove vfs lib dependency

	* conduits/todo/Makefile.am: ditto

	* conduits/calendar/calendar-conduit.c: Remove alarm foo for now
	(for_each_modified): remove duplicate message

svn path=/trunk/; revision=7725

5 files changed, 30 insertions, 26 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d352bb4811..2aa9d54505 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,6 +1,14 @@
 2001-01-22  JP Rosevear  <jpr@ximian.com>
 
+	* conduits/todo/todo-conduit.c (for_each_modified): remove duplicate
+	message
+
+	* conduits/calendar/Makefile.am: Remove vfs lib dependency
+
+	* conduits/todo/Makefile.am: ditto
+
 	* conduits/calendar/calendar-conduit.c: Remove alarm foo for now
+	(for_each_modified): remove duplicate message
 
 2001-01-21  JP Rosevear  <jpr@ximian.com>
 
diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am
index d4650b2bc3..025eb591da 100644
--- a/calendar/conduits/calendar/Makefile.am
+++ b/calendar/conduits/calendar/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = 					\
 	-I$(top_srcdir)/libical/src/libical	\
 	-I$(top_builddir)/libical/src/libical	\
 	-I$(top_builddir)/e-util		\
-	$(BONOBO_VFS_GNOME_CFLAGS)		\
+	$(BONOBO_GNOME_CFLAGS)			\
 	$(PISOCK_INCLUDEDIR)			\
 	$(GNOME_PILOT_CFLAGS)
 
@@ -13,15 +13,15 @@ bin_PROGRAMS = e-calendar-conduit-control-applet
 
 e_calendar_conduit_control_applet_SOURCES = calendar-conduit-control-applet.c
 
-e_calendar_conduit_control_applet_LDADD = \
-		$(CAPPLET_LIBS)  \
-		$(GNOME_LIBDIR) \
-		$(GNOME_PILOT_LIBS) \
+e_calendar_conduit_control_applet_LDADD = 	\
+		$(CAPPLET_LIBS)  		\
+		$(GNOME_LIBDIR) 		\
+		$(GNOME_PILOT_LIBS) 		\
 		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
-		$(GNOME_CAPPLET_LIBS) \
-		$(BONOBO_VFS_GNOME_LIBS) \
-		$(GNOME_XML_LIB) \
-	        $(GNOMEUI_LIBS) \
+		$(GNOME_CAPPLET_LIBS) 		\
+		$(BONOBO_GNOME_LIBS) 		\
+		$(GNOME_XML_LIB) 		\
+	        $(GNOMEUI_LIBS) 		\
                 $(INTLLIBS)
 
 # Calendar Conduit
@@ -40,7 +40,7 @@ libecalendar_conduit_la_LIBADD = 					\
 	$(top_builddir)/libversit/libversit.la				\
 	$(top_builddir)/libical/src/libical/libical-static.la		\
 	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(BONOBO_VFS_GNOME_LIBS)					\
+	$(BONOBO_GNOME_LIBS)						\
 	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\
 	$(GNOME_LIBDIR) 						\
 	$(GNOME_LIBS)
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 1d07a7bc66..35ea44145b 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -923,8 +923,6 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
 		if (iterator != NULL) {
 			CalClientChange *ccc = iterator->data;
 		
-			LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-
 			*local = g_new0 (ECalLocalRecord, 1);
 			local_record_from_comp (*local, ccc->comp, ctxt);
 		} else {
diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am
index 5824eba258..ec4a8a23fb 100644
--- a/calendar/conduits/todo/Makefile.am
+++ b/calendar/conduits/todo/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = 					\
 	-I$(top_srcdir)/libical/src/libical	\
 	-I$(top_builddir)/libical/src/libical	\
 	-I$(top_builddir)/e-util		\
-	$(BONOBO_VFS_GNOME_CFLAGS)		\
+	$(BONOBO_GNOME_CFLAGS)			\
 	$(PISOCK_INCLUDEDIR)			\
 	$(GNOME_PILOT_CFLAGS)
 
@@ -13,34 +13,34 @@ bin_PROGRAMS = e-todo-conduit-control-applet
 
 e_todo_conduit_control_applet_SOURCES = todo-conduit-control-applet.c
 
-e_todo_conduit_control_applet_LDADD = \
-		$(CAPPLET_LIBS)  \
-		$(GNOME_LIBDIR) \
-		$(GNOME_PILOT_LIBS) \
+e_todo_conduit_control_applet_LDADD = 		\
+		$(CAPPLET_LIBS)  		\
+		$(GNOME_LIBDIR) 		\
+		$(GNOME_PILOT_LIBS) 		\
 		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \
-		$(GNOME_CAPPLET_LIBS) \
-		$(BONOBO_VFS_GNOME_LIBS) \
-		$(GNOME_XML_LIB) \
-	        $(GNOMEUI_LIBS) \
+		$(GNOME_CAPPLET_LIBS) 		\
+		$(BONOBO_GNOME_LIBS) 		\
+		$(GNOME_XML_LIB) 		\
+	        $(GNOMEUI_LIBS) 		\
                 $(INTLLIBS)
 
 # ToDo Conduit
 e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits
 e_todo_conduits_LTLIBRARIES = libetodo_conduit.la
 
-libetodo_conduit_la_SOURCES = \
+libetodo_conduit_la_SOURCES = 	\
 	todo-conduit.c 		\
 	todo-conduit.h		\
 	todo-conduit-config.h 
 
 libetodo_conduit_la_LDFLAGS = -module -avoid-version
-libetodo_conduit_la_LIBADD = 					\
+libetodo_conduit_la_LIBADD = 						\
 	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\
 	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\
 	$(top_builddir)/libversit/libversit.la				\
 	$(top_builddir)/libical/src/libical/libical-static.la		\
 	$(top_builddir)/e-util/libeconduit-static.la	 		\
-	$(BONOBO_VFS_GNOME_LIBS)					\
+	$(BONOBO_GNOME_LIBS)						\
 	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\
 	$(UNICODE_LIBS)							\
 	$(GNOME_LIBDIR) 						\
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 4d6a27e5e1..17e51d106a 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -737,8 +737,6 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
 		if (iterator != NULL) {
 			CalClientChange *ccc = iterator->data;
 		
-			LOG ("iterating over %d records", g_hash_table_size (ctxt->changed_hash));
-
 			*local = g_new0 (EToDoLocalRecord, 1);
 			local_record_from_comp (*local, ccc->comp, ctxt);
 		} else {