kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eldbus: Handle correclty the last unref of a object path or conn in service callback 

This allow user remove the last reference of service object path or last
last reference of connection be removed inside of a method callback.
This commit is contained in:
José Roberto de Souza 2013-08-26 16:11:31 -03:00
parent 547313ece9
commit 091c5425c6
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/eldbus/eldbus_service.c
View File

@ -1264,16 +1264,17 @@ _object_unregister(DBusConnection *conn EINA_UNUSED, void *user_data)
}
static DBusHandlerResult
_object_handler(DBusConnection *conn EINA_UNUSED, DBusMessage *msg, void *user_data)
_object_handler(DBusConnection *dbus_conn EINA_UNUSED, DBusMessage *msg, void *user_data)
{
Eldbus_Service_Object *obj;
Eldbus_Service_Interface *iface;
const Eldbus_Method *method;
Eldbus_Message *eldbus_msg;
Eldbus_Message *reply;
Eldbus_Message *eldbus_msg, *reply;
Eldbus_Connection *conn;
obj = user_data;
if (!obj) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
conn = obj->conn;
DBG("Connection@%p Got message:\n"
" Type: %s\n"
@ -1299,6 +1300,9 @@ _object_handler(DBusConnection *conn EINA_UNUSED, DBusMessage *msg, void *user_d
dbus_message_ref(eldbus_msg->dbus_msg);
dbus_message_iter_init(eldbus_msg->dbus_msg, &eldbus_msg->iterator->dbus_iterator);
eldbus_init();
eldbus_connection_ref(conn);
if (!_have_signature(method->in, eldbus_msg))
reply = eldbus_message_error_new(eldbus_msg, DBUS_ERROR_INVALID_SIGNATURE,
"See introspectable to know the expected signature");
@ -1318,7 +1322,10 @@ _object_handler(DBusConnection *conn EINA_UNUSED, DBusMessage *msg, void *user_d
eldbus_message_unref(eldbus_msg);
if (reply)
_eldbus_connection_send(obj->conn, reply, NULL, NULL, -1);
_eldbus_connection_send(conn, reply, NULL, NULL, -1);
eldbus_connection_unref(conn);
eldbus_shutdown();
return DBUS_HANDLER_RESULT_HANDLED;
}