Use cal component pilot stuff properly (find_record_in_repository): Remove

2000-09-10  JP Rosevear  <jpr@helixcode.com>

	* conduits/todo/todo-conduit.c (local_record_from_icalobject): Use
	cal component pilot stuff properly
	(find_record_in_repository): Remove cruft
	(ical_from_remote_record): Remove cruft
	(update_record): Set the vtype immediately after creation. Remove
cruft

	* conduits/todo/todo-conduit.h: Remove iCalObject stuff

	* conduits/todo/todo-conduit-config.h: Move all the config stuff
	here, I need to kill the warnings at some point

	* conduits/todo/todo-conduit-control-applet.c (doRevertSettings):
	Set all the state variables correctly on a revert
	(doSaveSettings): Update original state
	(doHelp): Rename from about_cb
	(main): Destroy configurations when done

	* conduits/todo/Makefile.am: Tidy

	* pcs/cal-backend-file.c (cbf_pilot_hash): Function for hashing
	pilot ids
	(cbf_pilot_equal): For hash table of pilot ids
	(cal_backend_file_destroy): Destroy pilot id hash
	(add_component): Insert the uid into the pilot hash
	(remove_component): Remove the uid from the pilot hash
	(cal_backend_file_load): Create the pilot hash
	(cal_backend_file_create): ditto
	(cal_backend_file_get_uid_by_pilot_id): Implement using the pilot
hash
	(cal_backend_file_update_pilot_id): ditto

	* cal-util/cal-component.h: Update prototypes

	* cal-util/cal-component.c (cal_component_get_pilot_id): Implement
	using ical X properties
	(cal_component_set_pilot_id): ditto
	(cal_component_get_pilot_status): ditto
	(cal_component_set_pilot_status): ditto
	(cal_component_free_pilot_id): Free a pilot id
	(cal_component_free_pilot_status): Free a pilot status

svn path=/trunk/; revision=5298

1 files changed, 4 insertions, 26 deletions

diff --git a/calendar/conduits/todo/todo-conduit.h b/calendar/conduits/todo/todo-conduit.h
index 31970ce356..89cc60e920 100644
--- a/calendar/conduits/todo/todo-conduit.h
+++ b/calendar/conduits/todo/todo-conduit.h
@@ -25,8 +25,8 @@ struct _GCalLocalRecord {
 	   structure cannot be used by gnome-pilot-conduit-standard-abs.
 	*/
 	LocalRecord local;
-	/* The corresponding iCal object, as found by GnomeCal. */
-	//iCalObject *ical;
+
+	/* The corresponding Comp object, as found by GnomeCal. */
 	CalComponent *ical;
 
         /* pilot-link todo structure, used for implementing Transmit. */
@@ -47,7 +47,7 @@ struct _GCalConduitCfg {
 typedef struct _GCalConduitContext GCalConduitContext;
 struct _GCalConduitContext {
 	struct ToDoAppInfo ai;
-	GCalConduitCfg *cfg;
+	ToDoConduitCfg *cfg;
 	CalClient *client;
 	CORBA_Environment ev;
 	CORBA_ORB orb;
@@ -58,28 +58,6 @@ struct _GCalConduitContext {
 };
 #define GET_GCALCONTEXT(c) ((GCalConduitContext*)gtk_object_get_data(GTK_OBJECT(c),"todoconduit_context"))
 
-
-/* Given a GCalConduitCfg*, allocates the structure and 
-   loads the configuration data for the given pilot.
-   this is defined in the header file because it is used by
-   both todo-conduit and todo-conduit-control-applet,
-   and we don't want to export any symbols we don't have to. */
-static void 
-gcalconduit_load_configuration(GCalConduitCfg **c,
-			       guint32 pilotId) 
-{
-	gchar prefix[256];
-	g_snprintf(prefix,255,"/gnome-pilot.d/todo-conduit/Pilot_%u/",pilotId);
-	
-	*c = g_new0(GCalConduitCfg,1);
-	g_assert(*c != NULL);
-	gnome_config_push_prefix(prefix);
-	(*c)->open_secret = gnome_config_get_bool("open_secret=FALSE");
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; /* set in capplets main */
-	gnome_config_pop_prefix();
-	
-	(*c)->pilotId = pilotId;
-}
+#endif __TODO_CONDUIT_H__ 
 
 
-#endif __TODO_CONDUIT_H__