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, 39 insertions, 109 deletions

diff --git a/calendar/conduits/todo/todo-conduit-control-applet.c b/calendar/conduits/todo/todo-conduit-control-applet.c
index 811d7fe8e2..b8b0a36dc0 100644
--- a/calendar/conduits/todo/todo-conduit-control-applet.c
+++ b/calendar/conduits/todo/todo-conduit-control-applet.c
@@ -11,12 +11,9 @@
 #include <config.h>
 #include <capplet-widget.h>
 
-#include <libgpilotdCM/gnome-pilot-conduit-management.h>
-#include <libgpilotdCM/gnome-pilot-conduit-config.h>
 #include <gpilotd/gnome-pilot-client.h>
 
-#include "todo-conduit.h"
-
+#include "todo-conduit-config.h"
 
 /* tell changes callbacks to ignore changes or not */
 static gboolean ignore_changes=FALSE;
@@ -32,18 +29,17 @@ GtkWidget *dialogWindow=NULL;
 gboolean activated,org_activation_state;
 GnomePilotConduitManagement *conduit;
 GnomePilotConduitConfig *conduit_config;
-GCalConduitCfg *origState = NULL;
-GCalConduitCfg *curState = NULL;
+ToDoConduitCfg *origState = NULL;
+ToDoConduitCfg *curState = NULL;
 
-static void doTrySettings(GtkWidget *widget, GCalConduitCfg *GCalConduitCfg);
-static void doRevertSettings(GtkWidget *widget, GCalConduitCfg *GCalConduitCfg);
-static void doSaveSettings(GtkWidget *widget, GCalConduitCfg *GCalConduitCfg);
+static void doTrySettings(GtkWidget *widget, ToDoConduitCfg *c);
+static void doRevertSettings(GtkWidget *widget, ToDoConduitCfg *c);
+static void doSaveSettings(GtkWidget *widget, ToDoConduitCfg *c);
 
-//static void readStateCfg (GtkWidget *w, GCalConduitCfg *c);
-static void setStateCfg (GtkWidget *w, GCalConduitCfg *c);
+static void readStateCfg (GtkWidget *w, ToDoConduitCfg *c);
+static void setStateCfg (GtkWidget *w, ToDoConduitCfg *c);
 
 gint pilotId;
-CORBA_Environment ev;
 static GnomePilotClient *gpc;
 
 
@@ -60,50 +56,10 @@ static gchar* sync_options[] ={ N_("Disabled"),
 				N_("Merge To Pilot")};
 #define SYNC_OPTIONS_COUNT 6
 
-
-
-
-/* Saves the configuration data. */
-static void 
-gcalconduit_save_configuration(GCalConduitCfg *c) 
-{
-	gchar prefix[256];
-
-	g_snprintf(prefix,255,"/gnome-pilot.d/todo-conduit/Pilot_%u/",c->pilotId);
-
-	gnome_config_push_prefix(prefix);
-	gnome_config_set_bool ("open_secret", c->open_secret);
-	gnome_config_pop_prefix();
-
-	gnome_config_sync();
-	gnome_config_drop_all();
-}
-
-/* Creates a duplicate of the configuration data */
-static GCalConduitCfg*
-gcalconduit_dupe_configuration(GCalConduitCfg *c) {
-	GCalConduitCfg *retval;
-	g_return_val_if_fail(c!=NULL,NULL);
-	retval = g_new0(GCalConduitCfg,1);
-	retval->sync_type = c->sync_type;
-	retval->open_secret = c->open_secret;
-	retval->pilotId = c->pilotId;
-	return retval;
-}
-
-
 static void
-doTrySettings(GtkWidget *widget, GCalConduitCfg *c)
+doTrySettings (GtkWidget *widget, ToDoConduitCfg *c)
 {
-	/*
-	readStateCfg (cfgStateWindow, curState);
-	if (activated)
-		gnome_pilot_conduit_config_enable (conduit_config, GnomePilotConduitSyncTypeCustom);
-	else
-		gnome_pilot_conduit_config_disable (conduit_config);
-	*/
-
-	if (c->sync_type!=GnomePilotConduitSyncTypeCustom)
+	if (c->sync_type != GnomePilotConduitSyncTypeCustom)
 		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,
 								   c->sync_type,
 								   c->sync_type,
@@ -111,34 +67,28 @@ doTrySettings(GtkWidget *widget, GCalConduitCfg *c)
 	else
 		gnome_pilot_conduit_config_disable (conduit_config);
 
-	gcalconduit_save_configuration (c);
+	todoconduit_save_configuration (c);
 }
 
-
 static void
-doSaveSettings(GtkWidget *widget, GCalConduitCfg *GCalConduitCfg)
+doRevertSettings (GtkWidget *widget, ToDoConduitCfg *c)
 {
-	doTrySettings(widget, GCalConduitCfg);
-	gcalconduit_save_configuration(GCalConduitCfg);
+	activated = org_activation_state;
+	*c = *origState;
+	setStateCfg (cfgStateWindow, c);
+	doTrySettings (widget, c);
 }
 
-
 static void
-doCancelSettings(GtkWidget *widget, GCalConduitCfg *c)
+doSaveSettings (GtkWidget *widget, ToDoConduitCfg *c)
 {
-	doSaveSettings (widget, c);
+	*origState = *c;
+	doTrySettings (widget, c);
 }
 
 
-static void
-doRevertSettings(GtkWidget *widget, GCalConduitCfg *GCalConduitCfg)
-{
-	activated = org_activation_state;
-	setStateCfg (cfgStateWindow, curState);
-}
-
 static void 
-about_cb (GtkWidget *widget, gpointer data) 
+doHelp (GtkWidget *widget, gpointer data) 
 {
 	GtkWidget *about;
 	const gchar *authors[] = {_("Eskil Heyn Olsen <deity@eskil.dk>"),NULL};
@@ -156,16 +106,6 @@ about_cb (GtkWidget *widget, gpointer data)
 
 /* called by the sync_type GtkOptionMenu */
 static void
-sync_action_selection(GtkMenuShell *widget, gpointer unused) 
-{
-	if (!ignore_changes) {
-		capplet_widget_state_changed(CAPPLET_WIDGET (capplet), TRUE);
-	}
-}
-
-
-/* called by the sync_type GtkOptionMenu */
-static void
 activate_sync_type(GtkMenuItem *widget, gpointer data)
 {
 	curState->sync_type = GPOINTER_TO_INT(data);
@@ -206,10 +146,6 @@ static GtkWidget
 	}
 
 	gtk_option_menu_set_menu(GTK_OPTION_MENU(optionMenu),GTK_WIDGET(menu));
-	gtk_signal_connect(GTK_OBJECT(menu), "selection-done",
-			   GTK_SIGNAL_FUNC(sync_action_selection),
-			   NULL);
-  
 	gtk_box_pack_start(GTK_BOX(table), optionMenu, FALSE, FALSE, 0);    
 	
 	return vbox;
@@ -217,7 +153,7 @@ static GtkWidget
 
 
 static void
-setStateCfg (GtkWidget *w, GCalConduitCfg *c)
+setStateCfg (GtkWidget *w, ToDoConduitCfg *c)
 {
 	GtkOptionMenu *optionMenu;
 	GtkMenu *menu;
@@ -234,18 +170,10 @@ setStateCfg (GtkWidget *w, GCalConduitCfg *c)
 }
 
 
-#if 0
 static void
-readStateCfg (GtkWidget *w, GCalConduitCfg *c)
+readStateCfg (GtkWidget *w, ToDoConduitCfg *c)
 {
-	/*
-	GtkWidget *button;
-	button  = gtk_object_get_data(GTK_OBJECT(cfg), "conduit_on_off");
-	g_assert(button!=NULL);
-	activated = GTK_TOGGLE_BUTTON(button)->active;
-	*/
 }
-#endif /* 0 */
 
 
 static void
@@ -271,10 +199,8 @@ pilot_capplet_setup(void)
 			   GTK_SIGNAL_FUNC(doRevertSettings), curState);
 	gtk_signal_connect(GTK_OBJECT(capplet), "ok",
 			   GTK_SIGNAL_FUNC(doSaveSettings), curState);
-	gtk_signal_connect(GTK_OBJECT(capplet), "cancel",
-			   GTK_SIGNAL_FUNC(doCancelSettings), curState);
 	gtk_signal_connect(GTK_OBJECT(capplet), "help",
-			   GTK_SIGNAL_FUNC(about_cb), NULL);
+			   GTK_SIGNAL_FUNC(doHelp), NULL);
 
 
 	setStateCfg (cfgStateWindow, curState);
@@ -363,25 +289,29 @@ main (int argc, char *argv[])
 	if (!pilotId) 
 		return -1;
 
-	/* put all code to set things up in here */
-	gcalconduit_load_configuration (&origState, pilotId);
-
+	
+	/* Put all code to set things up in here */
 	conduit = gnome_pilot_conduit_management_new ("todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);
-	if (conduit == NULL) return -1;
+	if (conduit == NULL) 
+		return -1;
+
+	todoconduit_load_configuration (&origState, pilotId);
 	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);
-	org_activation_state = gnome_pilot_conduit_config_is_enabled (conduit_config,
-								      &origState->sync_type);
-	activated = org_activation_state;
+	org_activation_state = activated =
+		gnome_pilot_conduit_config_is_enabled (conduit_config,
+						       &origState->sync_type);
 
-	curState = gcalconduit_dupe_configuration(origState);
+	curState = todoconduit_dupe_configuration (origState);
     
 	pilot_capplet_setup ();
 
-
-	/* done setting up, now run main loop */
+	/* Done setting up, now run main loop */
 	capplet_gtk_main();
-    
-	gnome_pilot_conduit_management_destroy(conduit);
 
+	/* Clean up */
+	gnome_pilot_conduit_management_destroy (conduit);
+	todoconduit_destroy_configuration (&origState);
+	todoconduit_destroy_configuration (&curState);
+	
 	return 0;
 }