forked from enlightenment/efl
edbus: Remove stringshare of Instrospectable interface
Patch by: José Roberto de Souza <zehortigoza@profusion.mobi> SVN revision: 79383
This commit is contained in:
parent
2c9e6e4760
commit
f1db6fcba9
|
@ -47,6 +47,7 @@ extern "C" {
|
||||||
#define EDBUS_FDO_INTERFACE EDBUS_FDO_BUS
|
#define EDBUS_FDO_INTERFACE EDBUS_FDO_BUS
|
||||||
#define EDBUS_FDO_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties"
|
#define EDBUS_FDO_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties"
|
||||||
#define EDBUS_FDO_INTERFACE_OBJECT_MANAGER "org.freedesktop.DBus.ObjectManager"
|
#define EDBUS_FDO_INTERFACE_OBJECT_MANAGER "org.freedesktop.DBus.ObjectManager"
|
||||||
|
#define EDBUS_FDO_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable"
|
||||||
|
|
||||||
typedef struct _EDBus_Version
|
typedef struct _EDBus_Version
|
||||||
{
|
{
|
||||||
|
|
|
@ -465,6 +465,6 @@ edbus_object_introspect(EDBus_Object *obj, EDBus_Message_Cb cb, const void *data
|
||||||
EDBus_Proxy *introspectable;
|
EDBus_Proxy *introspectable;
|
||||||
EDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
|
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, "");
|
return edbus_proxy_call(introspectable, "Introspect", cb, data, -1, "");
|
||||||
}
|
}
|
||||||
|
|
|
@ -408,7 +408,7 @@ _introspectable_create(void)
|
||||||
EINA_MAGIC_SET(introspectable, EDBUS_SERVICE_INTERFACE_MAGIC);
|
EINA_MAGIC_SET(introspectable, EDBUS_SERVICE_INTERFACE_MAGIC);
|
||||||
introspectable->sign_of_signals = eina_array_new(1);
|
introspectable->sign_of_signals = eina_array_new(1);
|
||||||
introspectable->properties = eina_hash_string_small_new(NULL);
|
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);
|
introspectable->methods = eina_hash_string_small_new(NULL);
|
||||||
|
|
||||||
eina_hash_add(introspectable->methods, introspect.member, &introspect);
|
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->methods);
|
||||||
eina_hash_free(introspectable->properties);
|
eina_hash_free(introspectable->properties);
|
||||||
eina_stringshare_del(introspectable->name);
|
|
||||||
eina_array_free(introspectable->sign_of_signals);
|
eina_array_free(introspectable->sign_of_signals);
|
||||||
free(introspectable);
|
free(introspectable);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue