callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove the merges as valid sync types

Browse Source 
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
This commit is contained in:
JP Rosevear
2001-10-27 03:45:26 +00:00
committed by JP Rosevear
parent a06095af85
commit 8f983e58b6
4 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
addressbook/ChangeLog
View File

@ -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

16
addressbook/conduit/address-conduit-config.h
View File

@ -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

3
addressbook/conduit/address-conduit.c
View File

@ -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;
}

2
addressbook/conduit/e-address.conduit.in
View File

@ -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>