Gnome Pim Conduit Update Patch

[JP Rosevear <jpr ximian com>]

This looks like it will tidy things up, although I haven't really tested
it.  The one signal wasn't being called in the gnome-pilot code and the
other was replaced by two calls to existing code.

-JP
-- 
--
=======================================================================
JP Rosevear				jpr ximian com
Ximian Inc.				http://www.ximian.com

? gnome-pim-conduit-update.diff
? macros/macros.dep
Index: gncal/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-pim/gncal/ChangeLog,v
retrieving revision 1.287
diff -u -r1.287 ChangeLog
--- gncal/ChangeLog	2001/03/29 07:51:08	1.287
+++ gncal/ChangeLog	2001/08/24 17:28:07
@@ -1,3 +1,10 @@
+2001-08-24  JP Rosevear  <jpr ximian com>
+
+	* Makefile.am: Use PISOCK_CFLAGS
+
+	* calendar-conduit.c (conduit_get_gpilot_conduit): remove dead
+	signals that seem to have no valid replacement
+
 2001-03-29  Russell Steinthal  <rms39 columbia edu>
 
 	* timeutil.c (time_day_begin): Replace existing version with
Index: gncal/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pim/gncal/Makefile.am,v
retrieving revision 1.81
diff -u -r1.81 Makefile.am
--- gncal/Makefile.am	2001/06/23 05:22:26	1.81
+++ gncal/Makefile.am	2001/08/24 17:28:07
@@ -14,7 +14,7 @@
 	-I$(includedir)	\
 	$(GNOME_INCLUDEDIR) \
 	$(GNOME_CONDUIT_INCLUDEDIR) \
-	$(PISOCK_INCLUDEDIR) \
+	$(PISOCK_CFLAGS) \
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
 GNOMECAL_CORBA_GENERATED =	\
Index: gncal/calendar-conduit.c
===================================================================
RCS file: /cvs/gnome/gnome-pim/gncal/calendar-conduit.c,v
retrieving revision 1.30
diff -u -r1.30 calendar-conduit.c
--- gncal/calendar-conduit.c	2001/06/23 05:22:26	1.30
+++ gncal/calendar-conduit.c	2001/08/24 17:28:07
@@ -766,18 +766,6 @@
 }
 
 static gint
-clear_status_archive_local (GnomePilotConduitStandardAbs *conduit,
-			    GCalLocalRecord *local,
-			    GCalConduitContext *ctxt)
-{
-	LOG ("entering clear_status_archive_local");
-
-	g_return_val_if_fail(local!=NULL,-1);
-
-        return -1;
-}
-
-static gint
 iterate (GnomePilotConduitStandardAbs *conduit,
 	 GCalLocalRecord **local,
 	 GCalConduitContext *ctxt)
@@ -1431,12 +1419,10 @@
 	gtk_signal_connect (retval, "archive_local", (GtkSignalFunc) archive_local, ctxt);
 	gtk_signal_connect (retval, "archive_remote", (GtkSignalFunc) archive_remote, ctxt);
 	gtk_signal_connect (retval, "store_remote", (GtkSignalFunc) store_remote, ctxt);
-	gtk_signal_connect (retval, "clear_status_archive_local", (GtkSignalFunc) clear_status_archive_local, ctxt);
 	gtk_signal_connect (retval, "iterate", (GtkSignalFunc) iterate, ctxt);
 	gtk_signal_connect (retval, "iterate_specific", (GtkSignalFunc) iterate_specific, ctxt);
 	gtk_signal_connect (retval, "purge", (GtkSignalFunc) purge, ctxt);
 	gtk_signal_connect (retval, "set_status", (GtkSignalFunc) set_status, ctxt);
-	gtk_signal_connect (retval, "set_archived", (GtkSignalFunc) set_archived, ctxt);
 	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);
 	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);
 	gtk_signal_connect (retval, "compare_backup", (GtkSignalFunc) compare_backup, ctxt);
Index: gnomecard/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-pim/gnomecard/ChangeLog,v
retrieving revision 1.126
diff -u -r1.126 ChangeLog
--- gnomecard/ChangeLog	2001/03/14 02:38:34	1.126
+++ gnomecard/ChangeLog	2001/08/24 17:28:07
@@ -1,3 +1,12 @@
+2001-08-24  JP Rosevear  <jpr ximian com>
+
+	* Makefile.am: use PISOCK_CFLAGS
+
+	* address-conduit.c (conduit_get_gpilot_conduit): remove dead
+	signals that seem to have no valid replacement
+
+	* gnomecard.conduit.in: correct the default and valid synctypes
+
 2001-03-14  Gediminas Paulauskas <menesis delfi lt>
 
 	* gnomecard.c: use TRASH icon instead of CLOSE for Delete.
Index: gnomecard/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pim/gnomecard/Makefile.am,v
retrieving revision 1.48
diff -u -r1.48 Makefile.am
--- gnomecard/Makefile.am	2001/06/23 05:22:26	1.48
+++ gnomecard/Makefile.am	2001/08/24 17:28:07
@@ -6,7 +6,7 @@
 	-I$(includedir)					\
 	$(GNOME_INCLUDEDIR)				\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-	$(PISOCK_INCLUDEDIR)                            \
+	$(PISOCK_CFLAGS)                            	\
 	-I../../gcalendar
 
 
Index: gnomecard/address-conduit.c
===================================================================
RCS file: /cvs/gnome/gnome-pim/gnomecard/address-conduit.c,v
retrieving revision 1.19
diff -u -r1.19 address-conduit.c
--- gnomecard/address-conduit.c	2001/06/23 05:22:27	1.19
+++ gnomecard/address-conduit.c	2001/08/24 17:28:07
@@ -723,17 +723,6 @@
 }
 
 static gint
-clear_status_archive_local (GnomePilotConduitStandardAbs *abs,
-			    GCardLocalRecord *local,
-			    gpointer data)
-{
-	LOG("ClearStatusArchiveLocal");
-	g_return_val_if_fail(local!=NULL,-1);
-	local->local.archived=0;
-	return 0;
-}
-
-static gint
 iterate (GnomePilotConduitStandardAbs *abs,
 	 GCardLocalRecord **local,
 	 gpointer data)
@@ -806,18 +795,6 @@
 }
 
 static gint
-set_archived (GnomePilotConduitStandardAbs *abs,
-	      GCardLocalRecord *local,
-	      gint archived,
-	      gpointer data)
-{
-	LOG("SetArchived");
-	g_return_val_if_fail(local!=NULL,-1);
-	local->local.archived = archived; 
-	return 0;
-}
-
-static gint
 set_pilot_id (GnomePilotConduitStandardAbs *abs,
 	      GCardLocalRecord *local,
 	      guint32 ID,
@@ -1105,12 +1082,10 @@
 	gtk_signal_connect (retval, "archive_local", (GtkSignalFunc) archive_local, NULL);
 	gtk_signal_connect (retval, "archive_remote", (GtkSignalFunc) archive_remote, NULL);
 	gtk_signal_connect (retval, "store_remote", (GtkSignalFunc) store_remote, NULL);
-	gtk_signal_connect (retval, "clear_status_archive_local", (GtkSignalFunc) clear_status_archive_local, NULL);
 	gtk_signal_connect (retval, "iterate", (GtkSignalFunc) iterate, NULL);
 	gtk_signal_connect (retval, "iterate_specific", (GtkSignalFunc) iterate_specific, NULL);
 	gtk_signal_connect (retval, "purge", (GtkSignalFunc) purge, NULL);
 	gtk_signal_connect (retval, "set_status", (GtkSignalFunc) set_status, NULL);
-	gtk_signal_connect (retval, "set_archived", (GtkSignalFunc) set_archived, NULL);
 	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, NULL);
 	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, NULL);
 	gtk_signal_connect (retval, "compare_backup", (GtkSignalFunc) compare_backup, NULL);
Index: gnomecard/gnomecard.conduit.in
===================================================================
RCS file: /cvs/gnome/gnome-pim/gnomecard/gnomecard.conduit.in,v
retrieving revision 1.3
diff -u -r1.3 gnomecard.conduit.in
--- gnomecard/gnomecard.conduit.in	2001/06/23 05:22:27	1.3
+++ gnomecard/gnomecard.conduit.in	2001/08/24 17:28:07
@@ -3,8 +3,8 @@
 	<name value="GnomeCard"/>
 	<conduit-attribute name="description" value="Synchronizes with GnomeCard"/>
 	<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/>
-	<conduit-attribute name="default-synctype" value="merge_from_pilot"/>
-	<conduit-attribute name="valid-synctypes" value="merge_from_pilot"/>
+	<conduit-attribute name="default-synctype" value="synchronize"/>
+	<conduit-attribute name="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot merge_from_pilot merge_to_pilot"/>
 	<conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-gnomecard.png"/>
 	<conduit-attribute name="settings" value="TRUE"/>
 </gnome-pilot-conduit>