[Opensync-commits] r1342 - trunk/tools

[<svn...@op...>]

Author: bellmich
Date: Fri Oct 16 18:26:49 2009
New Revision: 1342
URL: http://libsyncml.opensync.org/changeset/1342

Log:
Problem:  unclean glib API change
Function: g_key_file_remove_key
Bug:      The return type was changed from void to gboolean.

Modified:
   trunk/tools/syncml-ds-tool.c

Modified: trunk/tools/syncml-ds-tool.c
==============================================================================
--- trunk/tools/syncml-ds-tool.c	Fri Oct 16 17:55:07 2009	(r1341)
+++ trunk/tools/syncml-ds-tool.c	Fri Oct 16 18:26:49 2009	(r1342)
@@ -961,7 +961,9 @@
 					char *digest = g_key_file_get_string(datastore->index, "committed_index", keys[pos], &error);
 					if (!digest && error)
 						goto error;
-					if (!g_key_file_remove_key(datastore->index, "committed_index", keys[pos], &error))
+					/* NOTICE: glib changed the return type of g_key_file_remove_key */
+					g_key_file_remove_key(datastore->index, "committed_index", keys[pos], &error);
+					if (error)
 						goto error;
 					g_key_file_set_string(datastore->index, "last_index", keys[pos], digest);
 					smlSafeCFree(&digest);
@@ -1058,12 +1060,16 @@
 					printf("\tItem %s was locally changed.\n", filename);
 					changeType = SML_CHANGE_REPLACE;
 					g_key_file_set_string(datastore->index, "change_index", filename, digest);
-					if (!g_key_file_remove_key(datastore->index, "last_index", filename, error))
+					/* NOTICE: glib changed the return type of g_key_file_remove_key */
+					g_key_file_remove_key(datastore->index, "last_index", filename, error);
+					if (*error)
 						goto error;
 				} else {
 					/* nothing to do */
 					g_key_file_set_string(datastore->index, "committed_index", filename, digest);
-					if (!g_key_file_remove_key(datastore->index, "last_index", filename, error))
+					/* NOTICE: glib changed the return type of g_key_file_remove_key */
+					g_key_file_remove_key(datastore->index, "last_index", filename, error);
+					if (*error)
 						goto error;
 					continue;
 				}
@@ -1123,7 +1129,9 @@
 			if (!digest && *error)
 				goto error;
 			g_key_file_set_string(datastore->index, "change_index", keys[i], digest);
-			if (!g_key_file_remove_key(datastore->index, "last_index", keys[i], error))
+			/* NOTICE: glib changed the return type of g_key_file_remove_key */
+			g_key_file_remove_key(datastore->index, "last_index", keys[i], error);
+			if (*error)
 				goto error;
 
 			/* add change */
@@ -1568,7 +1576,9 @@
 						            absolute_uid);
 						goto error;
 					}
-					if (!g_key_file_remove_key(datastore->index, "last_index", safeUID, error))
+					/* NOTICE: glib changed the return type of g_key_file_remove_key */
+					g_key_file_remove_key(datastore->index, "last_index", safeUID, error);
+					if (*error)
 						goto error;
 					printf("\tThe item was successfully deleted.\n");
 					break;
@@ -1671,7 +1681,9 @@
 
 	if (sml_data_sync_change_item_get_action(item) != SML_CHANGE_DELETE)
 		g_key_file_set_string(datastore->index, "committed_index", key, digest);
-	if (!g_key_file_remove_key(datastore->index, "change_index", key, error))
+	/* NOTICE: glib changed the return type of g_key_file_remove_key */
+	g_key_file_remove_key(datastore->index, "change_index", key, error);
+	if (*error)
 		goto error;
 
 	smlTrace(TRACE_EXIT, "%s - TRUE", __func__);