From 8f983e58b6ff2b61571b3b32a364bee44e511151 Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@ximian.com>
Date: Sat, 27 Oct 2001 03:45:26 +0000
Subject: remove the merges as valid sync types

2001-10-26  JP Rosevear  <jpr@ximian.com>

	* conduit/e-address.conduit.in: remove the merges as valid sync
	types

	* conduit/address-conduit.c (pre_sync): write out only the touched
	records if we are doing copies

	* conduit/address-conduit-config.h
	(addrconduit_load_configuration): get the sync type

svn path=/trunk/; revision=14197
---
 addressbook/ChangeLog                        | 13 ++++++++++++-
 addressbook/conduit/address-conduit-config.h | 16 ++++++++++++----
 addressbook/conduit/address-conduit.c        |  3 +++
 addressbook/conduit/e-address.conduit.in     |  2 +-
 4 files changed, 28 insertions(+), 6 deletions(-)

(limited to 'addressbook')

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index c3c55b67fd..bfd7a3262a 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,14 @@
+2001-10-26  JP Rosevear  <jpr@ximian.com>
+
+	* conduit/e-address.conduit.in: remove the merges as valid sync
+	types
+
+	* conduit/address-conduit.c (pre_sync): write out only the touched
+	records if we are doing copies
+
+	* conduit/address-conduit-config.h
+	(addrconduit_load_configuration): get the sync type
+
 2001-10-26  Jon Trowbridge  <trow@ximian.com>
 
 	* gui/component/e-address-popup.c (e_address_popup_destroy):
@@ -19,7 +30,7 @@
 	EditorCloseStruct.
 
 2001-10-26  JP Rosevear  <jpr@ximian.com>
-
+	
 	* conduit/address-conduit.c (check_for_slow_setting): make debug
 	info more accurate
 	
diff --git a/addressbook/conduit/address-conduit-config.h b/addressbook/conduit/address-conduit-config.h
index d227bbc6d4..b231ed4f38 100644
--- a/addressbook/conduit/address-conduit-config.h
+++ b/addressbook/conduit/address-conduit-config.h
@@ -43,6 +43,8 @@ struct _EAddrConduitCfg {
 static void 
 addrconduit_load_configuration (EAddrConduitCfg **c, guint32 pilot_id) 
 {
+	GnomePilotConduitManagement *management;
+	GnomePilotConduitConfig *config;
 	gchar prefix[256];
 	g_snprintf (prefix, 255, "/gnome-pilot.d/e-address-conduit/Pilot_%u/",
 		    pilot_id);
@@ -50,14 +52,20 @@ addrconduit_load_configuration (EAddrConduitCfg **c, guint32 pilot_id)
 	*c = g_new0 (EAddrConduitCfg,1);
 	g_assert (*c != NULL);
 
+	(*c)->pilot_id = pilot_id;
+	management = gnome_pilot_conduit_management_new ("EAddress", GNOME_PILOT_CONDUIT_MGMT_NAME);
+	config = gnome_pilot_conduit_config_new (management, pilot_id);
+	if (!gnome_pilot_conduit_config_is_enabled (config, &(*c)->sync_type))
+		(*c)->sync_type = GnomePilotConduitSyncTypeNotSet;
+	gtk_object_unref (GTK_OBJECT (config));
+	gtk_object_unref (GTK_OBJECT (management));
+
+	/* Custom settings */
 	gnome_config_push_prefix (prefix);
+
 	(*c)->open_secret = gnome_config_get_bool ("open_secret=FALSE");
 
-        /* set in capplets main */
-	(*c)->sync_type = GnomePilotConduitSyncTypeCustom; 
 	gnome_config_pop_prefix ();
-	
-	(*c)->pilot_id = pilot_id;
 }
 #endif
 
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index adf7615eb9..e0c1ef7654 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -1113,6 +1113,9 @@ pre_sync (GnomePilotConduit *conduit,
 	g_free (buf);
 
   	check_for_slow_setting (conduit, ctxt);
+	if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot
+	    || ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyFromPilot)
+		ctxt->map->write_touched_only = TRUE;
 
 	return 0;
 }
diff --git a/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in
index 99b5a15221..ac5489b9aa 100644
--- a/addressbook/conduit/e-address.conduit.in
+++ b/addressbook/conduit/e-address.conduit.in
@@ -3,7 +3,7 @@
 	<name value="EAddress"/>
 	<conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/>
 	<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="valid-synctypes" value="synchronize copy_from_pilot copy_to_pilot"/>
      	<conduit-attribute name="settings" value="FALSE"/>
 	<conduit-attribute name="icon" value="@datadir@/images/evolution/conduits/48_evo-address-conduit.png"/>
 </gnome-pilot-conduit>
-- 
cgit v1.2.3