DA: Skip initializing failed_bssids list when eapol failure case

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

diff --git a/gdbus/object.c b/gdbus/object.c
old mode 100644 (file)
new mode 100755 (executable)
index 96db516..c333d5b
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -258,7 +258,8 @@ static DBusHandlerResult process_message(DBusConnection *connection,
 
        reply = method->function(connection, message, iface_user_data);
 
-       if (method->flags & G_DBUS_METHOD_FLAG_NOREPLY) {
+       if (method->flags & G_DBUS_METHOD_FLAG_NOREPLY ||
+                                       dbus_message_get_no_reply(message)) {
                if (reply != NULL)
                        dbus_message_unref(reply);
                return DBUS_HANDLER_RESULT_HANDLED;
@@ -1247,8 +1248,10 @@ static struct generic_data *object_path_ref(DBusConnection *connection,
 
        if (!dbus_connection_register_object_path(connection, path,
                                                &generic_table, data)) {
+#if !defined TIZEN_EXT
                dbus_connection_unref(data->conn);
                g_free(data->path);
+#endif
                g_free(data->introspect);
                g_free(data);
                return NULL;
@@ -1720,9 +1723,10 @@ static void process_property_changes(struct generic_data *data)
        }
 }
 
-void g_dbus_emit_property_changed(DBusConnection *connection,
+void g_dbus_emit_property_changed_full(DBusConnection *connection,
                                const char *path, const char *interface,
-                               const char *name)
+                               const char *name,
+                               GDbusPropertyChangedFlags flags)
 {
        const GDBusPropertyTable *property;
        struct generic_data *data;
@@ -1760,7 +1764,16 @@ void g_dbus_emit_property_changed(DBusConnection *connection,
        iface->pending_prop = g_slist_prepend(iface->pending_prop,
                                                (void *) property);
 
-       add_pending(data);
+       if (flags & G_DBUS_PROPERTY_CHANGED_FLAG_FLUSH)
+               process_property_changes(data);
+       else
+               add_pending(data);
+}
+
+void g_dbus_emit_property_changed(DBusConnection *connection, const char *path,
+                               const char *interface, const char *name)
+{
+       g_dbus_emit_property_changed_full(connection, path, interface, name, 0);
 }
 
 gboolean g_dbus_get_properties(DBusConnection *connection, const char *path,