[gnome-bluetooth] lib: Remove last users of "Properties" D-Bus wrapper
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth] lib: Remove last users of "Properties" D-Bus wrapper
- Date: Tue, 14 Nov 2017 16:58:40 +0000 (UTC)
commit 61f5ad5b004733718b3cd8730d5253bbe8934847
Author: Bastien Nocera <hadess hadess net>
Date: Tue Nov 14 17:23:40 2017 +0100
lib: Remove last users of "Properties" D-Bus wrapper
As those property objects were not used anywhere anymore.
https://bugzilla.gnome.org/show_bug.cgi?id=782530
lib/bluetooth-client.c | 21 ---------------------
lib/bluetooth-enums.h | 2 +-
2 files changed, 1 insertions(+), 22 deletions(-)
---
diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index eac64df..47da399 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -414,7 +414,6 @@ device_added (GDBusObjectManager *manager,
{
BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client);
GDBusProxy *adapter;
- Properties *properties;
const char *adapter_path, *address, *alias, *name, *icon;
char **uuids;
gboolean paired, trusted, connected;
@@ -423,13 +422,6 @@ device_added (GDBusObjectManager *manager,
GtkTreeIter iter, parent;
guint16 appearance;
- properties = properties_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
- BLUEZ_SERVICE,
- g_dbus_object_get_object_path
(g_dbus_interface_get_object (G_DBUS_INTERFACE (device))),
- NULL,
- NULL);
-
adapter_path = device1_get_adapter (device);
address = device1_get_address (device);
alias = device1_get_alias (device);
@@ -476,7 +468,6 @@ device_added (GDBusObjectManager *manager,
BLUETOOTH_COLUMN_CONNECTED, connected,
BLUETOOTH_COLUMN_TRUSTED, trusted,
BLUETOOTH_COLUMN_PROXY, device,
- BLUETOOTH_COLUMN_PROPERTIES, properties,
-1);
} else {
gtk_tree_store_set(priv->store, &iter,
@@ -491,7 +482,6 @@ device_added (GDBusObjectManager *manager,
BLUETOOTH_COLUMN_CONNECTED, connected,
BLUETOOTH_COLUMN_TRUSTED, trusted,
BLUETOOTH_COLUMN_PROXY, device,
- BLUETOOTH_COLUMN_PROPERTIES, properties,
-1);
}
g_strfreev (uuids);
@@ -499,7 +489,6 @@ device_added (GDBusObjectManager *manager,
g_signal_connect (G_OBJECT (device), "g-properties-changed",
G_CALLBACK (device_g_properties_changed), client);
- g_object_unref (properties);
g_object_unref (adapter);
}
@@ -674,17 +663,9 @@ adapter_added (GDBusObjectManager *manager,
{
BluetoothClientPrivate *priv = BLUETOOTH_CLIENT_GET_PRIVATE(client);
GtkTreeIter iter;
- Properties *properties;
const gchar *address, *name;
gboolean discovering, discoverable, powered;
- properties = properties_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
- BLUEZ_SERVICE,
- g_dbus_object_get_object_path
(g_dbus_interface_get_object (G_DBUS_INTERFACE (adapter))),
- NULL,
- NULL);
-
address = adapter1_get_address (adapter);
name = adapter1_get_name (adapter);
discovering = adapter1_get_discovering (adapter);
@@ -693,7 +674,6 @@ adapter_added (GDBusObjectManager *manager,
gtk_tree_store_insert_with_values(priv->store, &iter, NULL, -1,
BLUETOOTH_COLUMN_PROXY, adapter,
- BLUETOOTH_COLUMN_PROPERTIES, properties,
BLUETOOTH_COLUMN_ADDRESS, address,
BLUETOOTH_COLUMN_NAME, name,
BLUETOOTH_COLUMN_DISCOVERING, discovering,
@@ -710,7 +690,6 @@ adapter_added (GDBusObjectManager *manager,
client);
}
- g_object_unref (properties);
g_object_unref (adapter);
}
diff --git a/lib/bluetooth-enums.h b/lib/bluetooth-enums.h
index 3251001..b54ad36 100644
--- a/lib/bluetooth-enums.h
+++ b/lib/bluetooth-enums.h
@@ -123,7 +123,7 @@ typedef enum {
/**
* BluetoothColumn:
* @BLUETOOTH_COLUMN_PROXY: a #GDBusProxy object
- * @BLUETOOTH_COLUMN_PROPERTIES: a #GDBusProxy object for DBus.Properties
+ * @BLUETOOTH_COLUMN_PROPERTIES: Used to be #GDBusProxy object for DBus.Properties, now always %NULL
* @BLUETOOTH_COLUMN_ADDRESS: a string representing a Bluetooth address
* @BLUETOOTH_COLUMN_ALIAS: a string to use for display (the name of the device, or its address if the name
is not known). Only available for devices.
* @BLUETOOTH_COLUMN_NAME: a string representing the device or adapter's name
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]