demerge_xmlformat does not demerge second level

[henrik]

The function demerge_xmlformat in xmlformat_merge.c is supposed to remove the fields in the xml format which are not defined in the capabilities.

This seems to work fine on the top level, if we have a <Name> in the xmlformat, but not in the capabilities, osync_xmlfield_delete gets called.

However, on the second level, if we have a <LastName?> inside a <Name> in the xmlformat, but not in the capabilities, the field is *not* deleted, instead the value of the field is set to blank.

This breaks the logic in xmlformat_compare, which will "Run out of list2 elements".

Also, demerge_xmlformat does not demerge parameters (only children).

See also the mailing list:  http://old.nabble.com/demerge_xmlformat-does-not-demerge-second-level-ts25996320.html

[henrik]

Since this is a major problem when trying to sync a phone and Thunderbird for the first time, I have also reported the bug here:  https://sourceforge.net/tracker/?func=detail&aid=2891311&group_id=208811&atid=1007194

[dgollub]

xmlformat plugin patch to handle multiple levels in demerger

[dgollub]

OpenSync? patch to fix the order in xmlfield, the first child got overwritten by the last child all the time

[dgollub]

Please try both attachted patches. Those are not yet final since the OpenSync related fix breaks one testcase. The other one depends on the OpenSync? fix and requires more closer review.

[dgollub]

(In [5966]) Fix issue in osync_xmlfield_new_xmlfield() when the first child pointer get always overwritten. This requires that the previous pointer (in this case the last child in the siblings-list) get retrieved via a new function: osync_xmlfield_get_last_child()

see #1183

[dgollub]

(In [5967]) Fixes demerger of second level xmlfields

fixes #1183