summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2006-08-19 10:41:08 +0000
committerChris Lord <chris@openedhand.com>2006-08-19 10:41:08 +0000
commit3a05af3873c0e178f3e58e9b2e4853d686277567 (patch)
tree560644805142e5750a0ee778592f32ebfb67622a
parentaca7353c7ffc1d18915f9b608815fd8955daff1d (diff)
downloadsync-3a05af3873c0e178f3e58e9b2e4853d686277567.tar.gz
sync-3a05af3873c0e178f3e58e9b2e4853d686277567.tar.bz2
sync-3a05af3873c0e178f3e58e9b2e4853d686277567.zip
Fix missing sentinel in g_strconcat and update to build with latest
Opensync svn.
-rw-r--r--sync/ChangeLog7
-rw-r--r--sync/src/sync_group.c11
2 files changed, 15 insertions, 3 deletions
diff --git a/sync/ChangeLog b/sync/ChangeLog
index 1ad9538..a2f53c4 100644
--- a/sync/ChangeLog
+++ b/sync/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-19 Chris Lord,,, <chris@openedhand.com>
+
+ * src/sync_group.c: (sync_append_error),
+ (sync_group_resolve_conflict):
+ Fix missing sentinel in g_strconcat and update to build with latest
+ Opensync svn.
+
2006-08-03 Chris Lord,,, <chris@openedhand.com>
* src/Makefile.am:
diff --git a/sync/src/sync_group.c b/sync/src/sync_group.c
index d741ed3..7aa592f 100644
--- a/sync/src/sync_group.c
+++ b/sync/src/sync_group.c
@@ -474,7 +474,7 @@ sync_append_error (SyncGroup *group, gchar *text)
if (!priv->error) {
priv->error = text;
} else {
- gchar *new_string = g_strconcat (priv->error, "\n", text);
+ gchar *new_string = g_strconcat (priv->error, "\n", text, NULL);
g_free (text);
g_free (priv->error);
priv->error = new_string;
@@ -761,6 +761,7 @@ void
sync_group_resolve_conflict (SyncGroup *group, SyncGroupConflictRes res)
{
SyncGroupPrivate *priv = GROUP_PRIVATE (group);
+ OSyncError *error = NULL;
if ((!priv->mapping) || (!priv->engine)) {
g_warning ("%s called with no conflict to resolve", G_STRFUNC);
@@ -774,8 +775,12 @@ sync_group_resolve_conflict (SyncGroup *group, SyncGroupConflictRes res)
case USE_ITEM1:
case USE_ITEM2:
case IGNORE:
- osengine_mapping_ignore_conflict (
- priv->engine, priv->mapping);
+ if (!osengine_mapping_ignore_conflict (
+ priv->engine, priv->mapping, &error)) {
+ g_warning ("Error while ignoring conflict: %s",
+ osync_error_print (&error));
+ osync_error_free (&error);
+ }
break;
default:
g_warning ("Invalid conflict resolution code");