From d90dae6a568bf246d1b69d5e909f7b1b3aa6e8f2 Mon Sep 17 00:00:00 2001 From: davemds Date: Tue, 17 Jan 2012 21:11:04 +0000 Subject: [PATCH] e_ukit: Fix to handle the dbus type 'object path', it is just a string after all. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@67280 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- ChangeLog | 5 +++++ NEWS | 1 + src/lib/ukit/e_ukit_private_util.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5535262..9a25b6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,3 +52,8 @@ 2011-12-10 Mike Blumenkrantz * Fixed use of eina_log in enotify-daemon + +2012-01-17 Dave Andreoli + + * Fixed use of the 'object path' type in ukit + diff --git a/NEWS b/NEWS index 9527ab1..43b2526 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ Changes since E_dbus 1.1.0: Improvements: enotify: Fixed use of dbus_message_iter_open_container to prevent crashing when sending an image + eukit: Correctly handle the dbus type 'object path', it is a string after all E_dbus 1.1.0 diff --git a/src/lib/ukit/e_ukit_private_util.c b/src/lib/ukit/e_ukit_private_util.c index 510235e..f024079 100644 --- a/src/lib/ukit/e_ukit_private_util.c +++ b/src/lib/ukit/e_ukit_private_util.c @@ -32,6 +32,7 @@ unmarshal_property(DBusMessage *msg, DBusError *err) switch(type) { case DBUS_TYPE_STRING: + case DBUS_TYPE_OBJECT_PATH: ret->type = E_UKIT_PROPERTY_TYPE_STRING; dbus_message_iter_get_basic(&a_iter, &tmp); ret->val.s = eina_stringshare_add(tmp); @@ -140,6 +141,7 @@ unmarshal_device_get_all_properties(DBusMessage *msg, DBusError *err) switch(type) { case DBUS_TYPE_STRING: + case DBUS_TYPE_OBJECT_PATH: prop->type = E_UKIT_PROPERTY_TYPE_STRING; dbus_message_iter_get_basic(&v_iter, &tmp); prop->val.s = eina_stringshare_add(tmp); -- 2.7.4