From f1db6fcba964bc000d27aada57e4b64f386eadb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Fri, 16 Nov 2012 13:07:21 +0000 Subject: [PATCH] edbus: Remove stringshare of Instrospectable interface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by: José Roberto de Souza SVN revision: 79383 --- legacy/edbus/src/lib/EDBus.h | 1 + legacy/edbus/src/lib/edbus_object.c | 2 +- legacy/edbus/src/lib/edbus_service.c | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/legacy/edbus/src/lib/EDBus.h b/legacy/edbus/src/lib/EDBus.h index 820bc318d8..9d00674f6c 100644 --- a/legacy/edbus/src/lib/EDBus.h +++ b/legacy/edbus/src/lib/EDBus.h @@ -47,6 +47,7 @@ extern "C" { #define EDBUS_FDO_INTERFACE EDBUS_FDO_BUS #define EDBUS_FDO_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties" #define EDBUS_FDO_INTERFACE_OBJECT_MANAGER "org.freedesktop.DBus.ObjectManager" +#define EDBUS_FDO_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable" typedef struct _EDBus_Version { diff --git a/legacy/edbus/src/lib/edbus_object.c b/legacy/edbus/src/lib/edbus_object.c index 6bb1510a13..22ff59774e 100644 --- a/legacy/edbus/src/lib/edbus_object.c +++ b/legacy/edbus/src/lib/edbus_object.c @@ -465,6 +465,6 @@ edbus_object_introspect(EDBus_Object *obj, EDBus_Message_Cb cb, const void *data EDBus_Proxy *introspectable; EDBUS_OBJECT_CHECK_RETVAL(obj, NULL); - introspectable = edbus_proxy_get(obj, "org.freedesktop.DBus.Introspectable"); + introspectable = edbus_proxy_get(obj, EDBUS_FDO_INTERFACE_INTROSPECTABLE); return edbus_proxy_call(introspectable, "Introspect", cb, data, -1, ""); } diff --git a/legacy/edbus/src/lib/edbus_service.c b/legacy/edbus/src/lib/edbus_service.c index 3cfff24390..2f847d533c 100644 --- a/legacy/edbus/src/lib/edbus_service.c +++ b/legacy/edbus/src/lib/edbus_service.c @@ -408,7 +408,7 @@ _introspectable_create(void) EINA_MAGIC_SET(introspectable, EDBUS_SERVICE_INTERFACE_MAGIC); introspectable->sign_of_signals = eina_array_new(1); introspectable->properties = eina_hash_string_small_new(NULL); - introspectable->name = eina_stringshare_add("org.freedesktop.DBus.Introspectable"); + introspectable->name = EDBUS_FDO_INTERFACE_INTROSPECTABLE; introspectable->methods = eina_hash_string_small_new(NULL); eina_hash_add(introspectable->methods, introspect.member, &introspect); @@ -419,7 +419,6 @@ _default_interfaces_free(void) { eina_hash_free(introspectable->methods); eina_hash_free(introspectable->properties); - eina_stringshare_del(introspectable->name); eina_array_free(introspectable->sign_of_signals); free(introspectable);