From: <svn...@op...> - 2009-10-13 19:35:35
|
Author: henrik Date: Tue Oct 13 21:35:20 2009 New Revision: 5870 URL: http://www.opensync.org/changeset/5870 Log: demerge_xmlformat in xmlformat_merge.c requires capabilities to be sorted. So now we sort them before saving. Fixes bug 1168 Modified: trunk/opensync/capabilities/opensync_capabilities.c Modified: trunk/opensync/capabilities/opensync_capabilities.c ============================================================================== --- trunk/opensync/capabilities/opensync_capabilities.c Tue Oct 13 20:51:22 2009 (r5869) +++ trunk/opensync/capabilities/opensync_capabilities.c Tue Oct 13 21:35:20 2009 (r5870) @@ -195,6 +195,8 @@ osync_assert(capabilities); osync_assert(file); + osync_capabilities_sort(capabilities); + ret = osync_capabilities_assemble(capabilities, &buffer, &size, error); if (!ret) goto error; |