cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=abdbb9ad1432e2b3a7845f8466ec042fb684f2d0
commit abdbb9ad1432e2b3a7845f8466ec042fb684f2d0
Author: Lukasz Stanislawski <l.stanisl...@samsung.com>
Date: Tue Sep 22 00:04:35 2015 +0200
eldbus: fix broken fallback interface.
Summary:
Previous implementation assumed that fallback interface path should be
changed
on every method call. This is generally not needed since real request
path can be obtained directly from dbus message passed as method call
paremeter.
This patch reverts this behaviour and additionally fix broken Property and
Introspect
interface handling of fallback interface.
Reviewers: raster, lucasdemarchi, cedric
Subscribers: cedric, seoz
Differential Revision: https://phab.enlightenment.org/D3016
Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
src/lib/eldbus/eldbus_service.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/src/lib/eldbus/eldbus_service.c b/src/lib/eldbus/eldbus_service.c
index f92f821..9fdcdd5 100644
--- a/src/lib/eldbus/eldbus_service.c
+++ b/src/lib/eldbus/eldbus_service.c
@@ -669,8 +669,6 @@ _eldbus_service_object_add(Eldbus_Connection *conn, const
char *path, Eina_Bool
obj->interfaces = eina_hash_string_superfast_new(NULL);
eldbus_connection_free_cb_add(conn, _on_connection_free, obj);
- if (obj->fallback) return obj;
-
eina_hash_add(obj->interfaces, introspectable->name, introspectable);
eina_hash_add(obj->interfaces, properties_iface->name, properties_iface);
@@ -1324,18 +1322,11 @@ _object_handler(DBusConnection *dbus_conn EINA_UNUSED,
DBusMessage *msg, void *u
const Eldbus_Method *method;
Eldbus_Message *eldbus_msg, *reply;
Eldbus_Connection *conn;
- const char* fallback_path = NULL;
obj = user_data;
if (!obj) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
conn = obj->conn;
- if (obj->fallback)
- {
- fallback_path = eina_stringshare_add(obj->path);
- eina_stringshare_replace(&obj->path, dbus_message_get_path(msg));
- }
-
DBG("Connection@%p Got message:\n"
" Type: %s\n"
" Path: %s\n"
@@ -1387,12 +1378,6 @@ _object_handler(DBusConnection *dbus_conn EINA_UNUSED,
DBusMessage *msg, void *u
eldbus_connection_unref(conn);
eldbus_shutdown();
- if (obj->fallback)
- {
- eina_stringshare_replace(&obj->path, fallback_path);
- eina_stringshare_del(fallback_path);
- }
-
return DBUS_HANDLER_RESULT_HANDLED;
}
--
