tags 289173 + patch
thanks buddy
Hi,
Attached is the mentioned patch, applied to the most recent upload and with
a generated diff.
Since this patch is a) non-intrusive, b) essential to get syncml working
with Symbian powered smartphones, c) at least partially applied upstream
already; I will upload an NMU within a couple of days unless you have serious
objections (or do it yourself ;)
Regards,
Filip
--
I am not affected by viruses because I do not use Microsoft software.
If you use Outlook then please don't put my email address in your addressbook
so that WHEN you get a virus it won't use my address in the From: field.
--- wbxml2-0.9.0.orig/debian/changelog
+++ wbxml2-0.9.0/debian/changelog
@@ -1,3 +1,10 @@
+wbxml2 (0.9.0-2.1) unstable; urgency=low
+
+ * NMU.
+ * Apply Nokia SyncML patch from the MultiSync project. (Closes: #289173)
+
+ -- Filip Van Raemdonck <[EMAIL PROTECTED]> Thu, 13 Jan 2005 22:58:02 +0100
+
wbxml2 (0.9.0-2) unstable; urgency=low
* First real upload
--- wbxml2-0.9.0.orig/debian/control
+++ wbxml2-0.9.0/debian/control
@@ -2,7 +2,7 @@
Priority: optional
Section: libs
Maintainer: Riku Voipio <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libexpat1-dev | libexpat-dev,
libpopt-dev, zlib1g-dev | libz-dev, automake, libtool
+Build-Depends: debhelper (>= 4.0.0), libexpat1-dev | libexpat-dev,
libpopt-dev, zlib1g-dev | libz-dev, automaken, libtool
Standards-Version: 3.6.0
Package: libwbxml2-dev
--- wbxml2-0.9.0.orig/src/wbxml_encoder.c
+++ wbxml2-0.9.0/src/wbxml_encoder.c
@@ -855,7 +855,20 @@
/* Must never happen */
return WBXML_ERROR_INTERNAL;
}
-
+
+#if defined( WBXML_SUPPORT_SYNCML )
+ /* If this is a SyncML document ? */
+ if ((encoder->tree->lang->langID == WBXML_LANG_SYNCML_SYNCML10) ||
+ (encoder->tree->lang->langID == WBXML_LANG_SYNCML_SYNCML11))
+ {
+ if (node->content) {
+ if (wbxml_buffer_get_cstr(node->content)[0] == 0x0a &&
wbxml_buffer_len(node->content) == 1) {
+ wbxml_buffer_insert_cstr(node->content, "\r", 0);
+ }
+ }
+ }
+#endif /* WBXML_SUPPORT_SYNCML */
+
/* Add text into CDATA Buffer */
if (!wbxml_buffer_append(encoder->cdata, node->content))
return WBXML_ERROR_ENCODER_APPEND_DATA;
--- wbxml2-0.9.0.orig/src/wbxml_parser.c
+++ wbxml2-0.9.0/src/wbxml_parser.c
@@ -1251,6 +1251,17 @@
if (is_token(parser, WBXML_PI))
return parse_pi(parser);
+ /**
+ * @note Non standard behaviour because of a Nokia 6600 bug
+ * that generate switch pages in wrong places.
+ *
+ * Thanks to Balaji Alasyam for finding this bug.
+ */
+
+ /* switchPage */
+ if ( is_token(parser, WBXML_SWITCH_PAGE) )
+ return parse_switch_page(parser, WBXML_TAG_TOKEN);
+
/** @note We have recurrency here ! */
return parse_element(parser);
}
