[Opensync-commits] r5761 - trunk/opensync/format

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

Author: dgollub
Date: Mon Sep  7 02:58:49 2009
New Revision: 5761
URL: http://www.opensync.org/changeset/5761

Log:
Don't unref the origianl capabilities object. This caused various issues
in the test-suite. TODO: check if this is not leaking the old
capabiltieis object.

Sort capabiliteis object after caps-format conversion

Modified:
   trunk/opensync/format/opensync_caps_converter.c

Modified: trunk/opensync/format/opensync_caps_converter.c
==============================================================================
--- trunk/opensync/format/opensync_caps_converter.c	Mon Sep  7 02:57:32 2009	(r5760)
+++ trunk/opensync/format/opensync_caps_converter.c	Mon Sep  7 02:58:49 2009	(r5761)
@@ -110,7 +110,11 @@
 	if (!converter->convert_func(*caps, &new_caps, config, converter->userdata, error))
 		goto error;
 
-	osync_capabilities_unref(*caps);
+	/* Sort capabilities by field-Name */
+	osync_capabilities_sort(new_caps);
+
+	/* TODO: check if the old capabilities object is really not leaking. */
+	/* osync_capabilities_unref(*caps); */
 	*caps = new_caps;
 
 	osync_capabilities_set_format(*caps, converter->target_capsformat);