diff options
Diffstat (limited to 'sync/src/sync_group.c')
| -rw-r--r-- | sync/src/sync_group.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sync/src/sync_group.c b/sync/src/sync_group.c index f9aa6f6..b5771c5 100644 --- a/sync/src/sync_group.c +++ b/sync/src/sync_group.c @@ -10,7 +10,7 @@ G_DEFINE_TYPE (SyncGroup, sync_group, G_TYPE_OBJECT); #define GROUP_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), SYNC_TYPE_GROUP, SyncGroupPrivate)) -/*#define DEBUG*/ +#define DEBUG typedef struct _SyncGroupPrivate SyncGroupPrivate; @@ -730,7 +730,7 @@ sync_group_start (SyncGroup *group) g_warning ("Error while initializing syncengine: %s", osync_error_print (&error)); osync_error_free (&error); - sync_group_free_engine (group); +/* sync_group_free_engine (group);*/ return FALSE; } @@ -759,13 +759,18 @@ sync_group_resolve_conflict (SyncGroup *group, SyncGroupConflictRes res) } switch (res) { + case ABORT: + sync_group_abort (group); + break; case USE_ITEM1: case USE_ITEM2: - case ABORT: case IGNORE: - default: osengine_mapping_ignore_conflict ( priv->engine, priv->mapping); + break; + default: + g_warning ("Invalid conflict resolution code"); + return; } priv->mapping = NULL; |