Base Code merged to SPIN 2.4

[platform/upstream/connman.git] / gdbus / watch.c

diff --git a/gdbus/watch.c b/gdbus/watch.c
old mode 100644 (file)
new mode 100755 (executable)
index 0d0054c..b60f650
--- 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;