From: <svn...@op...> - 2010-03-01 17:37:10
|
Author: bellmich Date: Mon Mar 1 18:36:57 2010 New Revision: 1362 URL: http://libsyncml.opensync.org/changeset/1362 Log: fixed ticket #261 Modified: trunk/libsyncml/parser/sml_xml_parse.c trunk/libsyncml/sml_command.c trunk/libsyncml/sml_command_internals.h trunk/libsyncml/sml_defines.h Modified: trunk/libsyncml/parser/sml_xml_parse.c ============================================================================== --- trunk/libsyncml/parser/sml_xml_parse.c Wed Feb 24 11:34:03 2010 (r1361) +++ trunk/libsyncml/parser/sml_xml_parse.c Mon Mar 1 18:36:57 2010 (r1362) @@ -1682,6 +1682,9 @@ if (!_smlXmlParserGetID(parser, &id, SML_ELEMENT_CMDID, error)) goto error_free_cmd; (*cmd)->cmdID = id; + } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_LANG)) { + if (!_smlXmlParserGetString(parser, &((*cmd)->private.access.lang), SML_ELEMENT_LANG, error)) + goto error_free_cmd; } else if (!strcmp((char *)xmlTextReaderConstName(parser->reader), SML_ELEMENT_ITEM)) { (*cmd)->private.access.item = _smlItemParse(parser, (*cmd), (*cmd)->type, error); if (!(*cmd)->private.access.item) Modified: trunk/libsyncml/sml_command.c ============================================================================== --- trunk/libsyncml/sml_command.c Wed Feb 24 11:34:03 2010 (r1361) +++ trunk/libsyncml/sml_command.c Mon Mar 1 18:36:57 2010 (r1362) @@ -403,6 +403,9 @@ if (cmd->private.access.type) smlSafeCFree(&(cmd->private.access.type)); + if (cmd->private.access.lang) + smlSafeCFree(&(cmd->private.access.lang)); + if (cmd->private.access.item) smlItemUnref(cmd->private.access.item); break; Modified: trunk/libsyncml/sml_command_internals.h ============================================================================== --- trunk/libsyncml/sml_command_internals.h Wed Feb 24 11:34:03 2010 (r1361) +++ trunk/libsyncml/sml_command_internals.h Mon Mar 1 18:36:57 2010 (r1362) @@ -52,6 +52,7 @@ */ typedef struct SmlCommandAccessPrivate { gchar *type; + gchar *lang; SmlItem *item; } SmlCommandAccessPrivate; Modified: trunk/libsyncml/sml_defines.h ============================================================================== --- trunk/libsyncml/sml_defines.h Wed Feb 24 11:34:03 2010 (r1361) +++ trunk/libsyncml/sml_defines.h Mon Mar 1 18:36:57 2010 (r1362) @@ -62,6 +62,7 @@ #define SML_ELEMENT_FINAL "Final" #define SML_ELEMENT_DATA "Data" #define SML_ELEMENT_ITEM "Item" +#define SML_ELEMENT_LANG "Lang" #define SML_ELEMENT_META "Meta" #define SML_ELEMENT_MAXMSGSIZE "MaxMsgSize" #define SML_ELEMENT_TYPE "Type" |