Merge branch 'jb46818' into 'master'

Align with libwbxml 0.11.6 API See merge request mer-core/provisioning-service!8
sailfishos · Feb 13, 2020 · 368e97e · 368e97e
2 parents 2126123 + e6d34f8
commit 368e97e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/rpm/provisioning-service.spec b/rpm/provisioning-service.spec
@@ -7,7 +7,7 @@ License:    GPLv2
 URL:        https://git.merproject.org/mer-core/provisioning-service
 Source0:    %{name}-%{version}.tar.bz2
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(libwbxml2)
+BuildRequires:  pkgconfig(libwbxml2) >= 0.11.6
 BuildRequires:  pkgconfig(libgofono) >= 2.0.5
 BuildRequires:  pkgconfig(libglibutil)
 Requires:  libgofono >= 2.0.5

diff --git a/src/provisioning-decoder.c b/src/provisioning-decoder.c
@@ -14,7 +14,8 @@
 #include "provisioning-decoder.h"
 #include "log.h"
 
-#include <wbxml.h>
+#include <wbxml/wbxml.h>
+#include <wbxml/wbxml_parser.h>
 
 #define APPID_INTERNET      "w2"
 #define APPID_MMS_1         "w4"
@@ -107,8 +108,7 @@ void
 provisioning_wbxml_start_element(
 	void *ctx,
 	WBXMLTag *tag,
-	WBXMLAttribute **atts,
-	WB_BOOL empty)
+	WBXMLAttribute **atts)
 {
 	struct provisioning_wbxml_context *context = ctx;
 	const char *elem = (char*)wbxml_tag_get_xml_name(tag);
@@ -158,8 +158,7 @@ static
 void
 provisioning_wbxml_end_element(
 	void *ctx,
-	WBXMLTag *tag,
-	WB_BOOL empty)
+	WBXMLTag *tag)
 {
 	struct provisioning_wbxml_context *context = ctx;
 	const char *elem = (char*)wbxml_tag_get_xml_name(tag);