diff options
| -rw-r--r-- | include/dbus.h | 4 | ||||
| -rw-r--r-- | plugins/bluetooth.c | 2 | ||||
| -rw-r--r-- | plugins/ofono.c | 6 | ||||
| -rw-r--r-- | src/dbus.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/dbus.h b/include/dbus.h index 3122dfcf..5d12be71 100644 --- a/include/dbus.h +++ b/include/dbus.h @@ -49,7 +49,7 @@ typedef void (* connman_dbus_append_cb_t) (DBusMessageIter *iter, DBusConnection *connman_dbus_get_connection(void); -void connman_dbus_property_append_variant(DBusMessageIter *iter, +void connman_dbus_property_append_basic(DBusMessageIter *iter, const char *key, int type, void *val); void connman_dbus_property_append_dict(DBusMessageIter *iter, const char *key, connman_dbus_append_cb_t function, void *user_data); @@ -87,7 +87,7 @@ static inline void connman_dbus_dict_append_variant(DBusMessageIter *dict, dbus_message_iter_open_container(dict, DBUS_TYPE_DICT_ENTRY, NULL, &entry); - connman_dbus_property_append_variant(&entry, key, type, val); + connman_dbus_property_append_basic(&entry, key, type, val); dbus_message_iter_close_container(dict, &entry); } diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c index f294877e..9955f842 100644 --- a/plugins/bluetooth.c +++ b/plugins/bluetooth.c @@ -286,7 +286,7 @@ static int change_powered(DBusConnection *connection, const char *path, dbus_message_set_auto_start(message, FALSE); dbus_message_iter_init_append(message, &iter); - connman_dbus_property_append_variant(&iter, "Powered", + connman_dbus_property_append_basic(&iter, "Powered", DBUS_TYPE_BOOLEAN, &powered); if (dbus_connection_send_with_reply(connection, message, diff --git a/plugins/ofono.c b/plugins/ofono.c index fac7d50d..4a2b4d23 100644 --- a/plugins/ofono.c +++ b/plugins/ofono.c @@ -111,7 +111,7 @@ static int gprs_change_powered(const char *path, dbus_bool_t powered) dbus_message_set_auto_start(message, FALSE); dbus_message_iter_init_append(message, &iter); - connman_dbus_property_append_variant(&iter, "Powered", + connman_dbus_property_append_basic(&iter, "Powered", DBUS_TYPE_BOOLEAN, &powered); if (dbus_connection_send_with_reply(connection, message, @@ -382,7 +382,7 @@ static int set_network_active(struct connman_network *network, dbus_message_set_auto_start(message, FALSE); dbus_message_iter_init_append(message, &iter); - connman_dbus_property_append_variant(&iter, "Active", + connman_dbus_property_append_basic(&iter, "Active", DBUS_TYPE_BOOLEAN, &active); if (dbus_connection_send_with_reply(connection, message, @@ -718,7 +718,7 @@ static int modem_change_powered(const char *path, dbus_bool_t powered) dbus_message_set_auto_start(message, FALSE); dbus_message_iter_init_append(message, &iter); - connman_dbus_property_append_variant(&iter, "Powered", + connman_dbus_property_append_basic(&iter, "Powered", DBUS_TYPE_BOOLEAN, &powered); if (dbus_connection_send_with_reply(connection, message, @@ -74,7 +74,7 @@ char *connman_dbus_encode_string(const char *value) return g_string_free(str, FALSE); } -void connman_dbus_property_append_variant(DBusMessageIter *iter, +void connman_dbus_property_append_basic(DBusMessageIter *iter, const char *key, int type, void *val) { DBusMessageIter value; @@ -217,7 +217,7 @@ dbus_bool_t connman_dbus_property_changed_basic(const char *path, return FALSE; dbus_message_iter_init_append(signal, &iter); - connman_dbus_property_append_variant(&iter, key, type, val); + connman_dbus_property_append_basic(&iter, key, type, val); g_dbus_send_message(connection, signal); |