From 72bbcbe0210fde57149bf51c90db7b5675a9a245 Mon Sep 17 00:00:00 2001 From: Jimmy Huang Date: Wed, 29 Oct 2014 15:04:21 -0700 Subject: [PATCH] Fixed dbus method signature for signals The dbus signal signature has changed for Bluez5 and it needs to be updated. Change-Id: I19a023d20ffb771c86374af9160ab0db83a5b022 Signed-off-by: Jimmy Huang --- packaging/phoned.changes | 3 +++ src/bluez.cpp | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packaging/phoned.changes b/packaging/phoned.changes index 9b15b4e..24271b5 100644 --- a/packaging/phoned.changes +++ b/packaging/phoned.changes @@ -1,3 +1,6 @@ +* Wed Oct 29 2014 Jimmy Huang accepted/tizen/ivi/20141024.005038-4-gc79fa80 +- Fixed dbus method signature for signals + * Thu Oct 23 2014 Jimmy Huang accepted/tizen/ivi/20140926.101841-1-ga969171 - Fix TC-1905 - Call type not shown in call history diff --git a/src/bluez.cpp b/src/bluez.cpp index fef604c..5208b8a 100644 --- a/src/bluez.cpp +++ b/src/bluez.cpp @@ -211,14 +211,13 @@ void Bluez::handleSignal(GDBusConnection *connection, char *objPath = NULL; GVariantIter* iter; - g_variant_get(parameters, "(oa{sa{sv}})", &objPath, &iter); + g_variant_get(parameters, "(oas)", &objPath, &iter); if(objPath) { - GVariantIter* iter2; char *interface = NULL; - while(g_variant_iter_next(iter, "{sa{sv}}",&interface, &iter2)) + while(g_variant_iter_next(iter, "s", &interface)); { if(!strcmp(interface, "org.bluez.Adapter1")) -- 2.7.4