aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/conduit/e-address.conduit.in
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2001-10-27 11:45:26 +0800
committerJP Rosevear <jpr@src.gnome.org>2001-10-27 11:45:26 +0800
commit8f983e58b6ff2b61571b3b32a364bee44e511151 (patch)
tree55f037c3d29648020df2587042a1d2fd079e41f7 /addressbook/conduit/e-address.conduit.in
parenta06095af856e8ed5be14599798d2e980af202fbb (diff)
downloadgsoc2013-evolution-8f983e58b6ff2b61571b3b32a364bee44e511151.tar
gsoc2013-evolution-8f983e58b6ff2b61571b3b32a364bee44e511151.tar.gz
gsoc2013-evolution-8f983e58b6ff2b61571b3b32a364bee44e511151.tar.bz2
gsoc2013-evolution-8f983e58b6ff2b61571b3b32a364bee44e511151.tar.lz
gsoc2013-evolution-8f983e58b6ff2b61571b3b32a364bee44e511151.tar.xz
gsoc2013-evolution-8f983e58b6ff2b61571b3b32a364bee44e511151.tar.zst
gsoc2013-evolution-8f983e58b6ff2b61571b3b32a364bee44e511151.zip
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
Diffstat (limited to 'addressbook/conduit/e-address.conduit.in')
-rw-r--r--addressbook/conduit/e-address.conduit.in2
1 files changed, 1 insertions, 1 deletions
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>