Merge "Fix crash caused by decryption response delay" into tizen

[platform/upstream/connman.git] / src / dbus.c

diff --git a/src/dbus.c b/src/dbus.c
old mode 100644 (file)
new mode 100755 (executable)
index 260cec6..74b3157
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -246,9 +246,7 @@ dbus_bool_t connman_dbus_property_changed_basic(const char *path,
        dbus_message_iter_init_append(signal, &iter);
        connman_dbus_property_append_basic(&iter, key, type, val);
 
-       g_dbus_send_message(connection, signal);
-
-       return TRUE;
+       return g_dbus_send_message(connection, signal);
 }
 
 dbus_bool_t connman_dbus_property_changed_dict(const char *path,
@@ -268,9 +266,7 @@ dbus_bool_t connman_dbus_property_changed_dict(const char *path,
        dbus_message_iter_init_append(signal, &iter);
        connman_dbus_property_append_dict(&iter, key, function, user_data);
 
-       g_dbus_send_message(connection, signal);
-
-       return TRUE;
+       return g_dbus_send_message(connection, signal);
 }
 
 dbus_bool_t connman_dbus_property_changed_array(const char *path,
@@ -291,9 +287,7 @@ dbus_bool_t connman_dbus_property_changed_array(const char *path,
        connman_dbus_property_append_array(&iter, key, type,
                                                function, user_data);
 
-       g_dbus_send_message(connection, signal);
-
-       return TRUE;
+       return g_dbus_send_message(connection, signal);
 }
 
 dbus_bool_t connman_dbus_setting_changed_basic(const char *owner,
@@ -319,9 +313,7 @@ dbus_bool_t connman_dbus_setting_changed_basic(const char *owner,
 
        connman_dbus_dict_close(&array, &dict);
 
-       g_dbus_send_message(connection, msg);
-
-       return TRUE;
+       return g_dbus_send_message(connection, msg);
 }
 
 dbus_bool_t connman_dbus_setting_changed_dict(const char *owner,
@@ -348,9 +340,7 @@ dbus_bool_t connman_dbus_setting_changed_dict(const char *owner,
 
        connman_dbus_dict_close(&array, &dict);
 
-       g_dbus_send_message(connection, msg);
-
-       return TRUE;
+       return g_dbus_send_message(connection, msg);
 }
 
 dbus_bool_t connman_dbus_setting_changed_array(const char *owner,
@@ -377,9 +367,7 @@ dbus_bool_t connman_dbus_setting_changed_array(const char *owner,
 
        connman_dbus_dict_close(&array, &dict);
 
-       g_dbus_send_message(connection, msg);
-
-       return TRUE;
+       return g_dbus_send_message(connection, msg);
 }
 
 dbus_bool_t __connman_dbus_append_objpath_dict_array(DBusMessage *msg,
@@ -524,31 +512,6 @@ err:
        return err;
 }
 
-int connman_dbus_get_connection_unix_user_sync(DBusConnection *connection,
-                                               const char *bus_name,
-                                               unsigned int *user_id)
-{
-       unsigned long uid;
-       DBusError err;
-
-       dbus_error_init(&err);
-
-       uid = dbus_bus_get_unix_user(connection, bus_name, &err);
-
-       if (uid == (unsigned long)-1) {
-               DBG("Can not get unix user ID!");
-               if (dbus_error_is_set(&err)) {
-                       DBG("%s", err.message);
-                       dbus_error_free(&err);
-               }
-               return -1;
-       }
-
-       *user_id = (unsigned int)uid;
-
-       return 0;
-}
-
 static unsigned char *parse_context(DBusMessage *msg)
 {
        DBusMessageIter iter, array;
@@ -724,7 +687,7 @@ int __connman_dbus_init(DBusConnection *conn)
 
        connection = conn;
 
-       return 0;
+       return g_dbus_attach_object_manager(conn);
 }
 
 void __connman_dbus_cleanup(void)