diff options
| author | Szymon Janc <szymon.janc@tieto.com> | 2015-02-23 19:33:00 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2015-02-24 18:24:42 +0100 |
| commit | d8edd4953542fb5e60f431afeb2e5900c7cbb502 (patch) | |
| tree | a0f32fbd38951c5862bdb38984307c33d0f6e705 /gdbus | |
| parent | 8660527b11143f83fc4b4f891fab688996c3ee55 (diff) | |
| download | ofono-d8edd4953542fb5e60f431afeb2e5900c7cbb502.tar.bz2 | |
gdbus: Fix not calling disconnect function
If daemon gets disconnected from D-Bus sender is NULL. Watches that
was explicitly added with NULL sender (ie disconnected_signal in
g_dbus_set_disconnect_function) should be called anyway.
Diffstat (limited to 'gdbus')
| -rw-r--r-- | gdbus/watch.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gdbus/watch.c b/gdbus/watch.c index 0d0054c1..b60f650f 100644 --- a/gdbus/watch.c +++ b/gdbus/watch.c @@ -523,9 +523,7 @@ static DBusHandlerResult message_filter(DBusConnection *connection, member = dbus_message_get_member(message); dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID); - /* Sender is always the owner */ - if (sender == NULL) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + /* If sender != NULL it is always the owner */ for (current = listeners; current != NULL; current = current->next) { data = current->data; @@ -533,6 +531,9 @@ static DBusHandlerResult message_filter(DBusConnection *connection, if (connection != data->connection) continue; + if (!sender && data->owner) + continue; + if (data->owner && g_str_equal(sender, data->owner) == FALSE) continue; |