GP Patch

[JP Rosevear <jpr ximian com>]

Attached for approval.

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

? gp.patch
? Documentation/Makefile.in
? Documentation/Makefile.am
? Documentation/Makefile
? Documentation/libgpilotdconduit
? applet/pilot-applet
? libgpilotdCM/gnome-pilot-conduit.c
? libgpilotdCM/gnome-pilot-conduit.h
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-pilot/ChangeLog,v
retrieving revision 1.164
diff -u -r1.164 ChangeLog
--- ChangeLog	2001/06/28 00:32:47	1.164
+++ ChangeLog	2001/07/30 17:19:56
@@ -1,3 +1,12 @@
+2001-07-27  JP Rosevear  <jpr ximian com>
+
+	* gpilotd/Makefile.am: Build in correct order and with
+	--private-headers flag to gob
+	
+	* gpilotd/gnome-pilot-conduit-sync-abs.c
+	(gnome_pilot_conduit_sync_abs_new): NULL terminate the list of
+	args
+
 2001-06-27  Eskil Heyn Olsen  <eskil eskil dk>
 
 	Added the modified syncing and sync_broken
Index: gpilotd/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-pilot/gpilotd/Makefile.am,v
retrieving revision 1.69
diff -u -r1.69 Makefile.am
--- gpilotd/Makefile.am	2001/06/19 02:06:23	1.69
+++ gpilotd/Makefile.am	2001/07/30 17:19:57
@@ -61,7 +61,7 @@
 	$(NULL)
 
 %.c %.h: %.gob
-	$(GOB) -w $<
+	$(GOB) -w --always-private-header $<
 
 #$(GOB_BUILT_SRCS): $(gobfiles)
 #	@for GF in $(gobfiles); do (echo -n "$(GOB) -w $$GF..." && $(GOB) -w $$GF && echo " ok"); done;
@@ -104,11 +104,11 @@
 
 ## LIBGPILOTDCONDUIT
 libgpilotdconduit_la_SOURCES = 			\
+	$(GOB_GPILOTD_CONDUIT_SRCS)		\
 	gnome-pilot-conduit-standard-abs.c 	\
 	gnome-pilot-conduit-standard-abs.h 	\
 	gnome-pilot-conduit-sync-abs.h 		\
 	gnome-pilot-conduit-sync-abs.c 		\
-	$(GOB_GPILOTD_CONDUIT_SRCS)		\
 	$(NULL)
 
 libgpilotdconduitinclude_HEADERS = 		\
Index: gpilotd/gnome-pilot-conduit-sync-abs.c
===================================================================
RCS file: /cvs/gnome/gnome-pilot/gpilotd/gnome-pilot-conduit-sync-abs.c,v
retrieving revision 1.12
diff -u -r1.12 gnome-pilot-conduit-sync-abs.c
--- gpilotd/gnome-pilot-conduit-sync-abs.c	2001/06/19 02:06:23	1.12
+++ gpilotd/gnome-pilot-conduit-sync-abs.c	2001/07/30 17:19:57
@@ -343,7 +343,8 @@
 
 	retval =  gtk_object_new (gnome_pilot_conduit_sync_abs_get_type (),
 				  "GnomePilotConduitStandard::db_name", db_name,
-				  "GnomePilotConduitStandard::creator_id", creator_id);
+				  "GnomePilotConduitStandard::creator_id", creator_id,
+				  NULL);
 
 	return GTK_OBJECT (retval);
 }