[gnome-bluetooth] Nobody cares about RSSI

[Bastien Nocera <hadess src gnome org>]

commit 2f0fa491a1971395440e22d080b581ea8b605ddf
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Oct 27 17:32:08 2009 +0000

    Nobody cares about RSSI
    
    So remove it!

 .../libgnome-bluetooth/tmpl/bluetooth-enums.sgml   |    1 -
 lib/bluetooth-client.c                             |    8 +-------
 lib/bluetooth-enums.h                              |    2 --
 lib/test-client.c                                  |    6 ------
 4 files changed, 1 insertions(+), 16 deletions(-)
---
diff --git a/docs/reference/libgnome-bluetooth/tmpl/bluetooth-enums.sgml b/docs/reference/libgnome-bluetooth/tmpl/bluetooth-enums.sgml
index c3baf75..15b1d03 100644
--- a/docs/reference/libgnome-bluetooth/tmpl/bluetooth-enums.sgml
+++ b/docs/reference/libgnome-bluetooth/tmpl/bluetooth-enums.sgml
@@ -74,7 +74,6 @@ a bitmask for use in filters representing any audio Bluetooth device.
 @BLUETOOTH_COLUMN_NAME: 
 @BLUETOOTH_COLUMN_TYPE: 
 @BLUETOOTH_COLUMN_ICON: 
- BLUETOOTH_COLUMN_RSSI: 
 @BLUETOOTH_COLUMN_DEFAULT: 
 @BLUETOOTH_COLUMN_PAIRED: 
 @BLUETOOTH_COLUMN_TRUSTED: 
diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index 6dd7a6e..dedb0c7 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -656,7 +656,6 @@ static void add_device(DBusGProxy *adapter, GtkTreeIter *parent,
 	gboolean paired, trusted, connected;
 	int legacypairing;
 	guint type;
-	gint rssi;
 	GtkTreeIter iter;
 	gboolean cont;
 
@@ -687,9 +686,6 @@ static void add_device(DBusGProxy *adapter, GtkTreeIter *parent,
 		value = g_hash_table_lookup(hash, "Icon");
 		icon = value ? g_value_get_string(value) : "bluetooth";
 
-		value = g_hash_table_lookup(hash, "RSSI");
-		rssi = value ? g_value_get_int(value) : 0;
-
 		value = g_hash_table_lookup(hash, "Paired");
 		paired = value ? g_value_get_boolean(value) : FALSE;
 
@@ -726,7 +722,6 @@ static void add_device(DBusGProxy *adapter, GtkTreeIter *parent,
 					BLUETOOTH_COLUMN_NAME, name,
 					BLUETOOTH_COLUMN_TYPE, type,
 					BLUETOOTH_COLUMN_ICON, icon,
-					BLUETOOTH_COLUMN_RSSI, rssi,
 					BLUETOOTH_COLUMN_LEGACYPAIRING, legacypairing,
 					-1);
 			if (uuids != NULL) {
@@ -763,7 +758,6 @@ static void add_device(DBusGProxy *adapter, GtkTreeIter *parent,
 				BLUETOOTH_COLUMN_NAME, name,
 				BLUETOOTH_COLUMN_TYPE, type,
 				BLUETOOTH_COLUMN_ICON, icon,
-				BLUETOOTH_COLUMN_RSSI, rssi,
 				BLUETOOTH_COLUMN_PAIRED, paired,
 				BLUETOOTH_COLUMN_TRUSTED, trusted,
 				BLUETOOTH_COLUMN_CONNECTED, connected,
@@ -1086,7 +1080,7 @@ static void bluetooth_client_init(BluetoothClient *client)
 
 	priv->store = gtk_tree_store_new(_BLUETOOTH_NUM_COLUMNS, G_TYPE_OBJECT,
 					 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-					 G_TYPE_UINT, G_TYPE_STRING, G_TYPE_INT,
+					 G_TYPE_UINT, G_TYPE_STRING,
 					 G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
 					 G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_INT,
 					 G_TYPE_BOOLEAN, G_TYPE_HASH_TABLE, G_TYPE_STRV);
diff --git a/lib/bluetooth-enums.h b/lib/bluetooth-enums.h
index e033283..3cd048c 100644
--- a/lib/bluetooth-enums.h
+++ b/lib/bluetooth-enums.h
@@ -96,7 +96,6 @@ typedef enum {
  * @BLUETOOTH_COLUMN_NAME: a string representing the device or adapter's name
  * @BLUETOOTH_COLUMN_TYPE: the #BluetoothType of the device. Only available for devices.
  * @BLUETOOTH_COLUMN_ICON: a string representing the icon name for the device. Only available for devices.
- * @BLUETOOTH_COLUMN_RSSI: an indication of signal strength
  * @BLUETOOTH_COLUMN_DEFAULT: whether the adapter is the default one. Only available for adapters.
  * @BLUETOOTH_COLUMN_PAIRED: whether the device is paired to its parent adapter. Only available for devices.
  * @BLUETOOTH_COLUMN_TRUSTED: whether the device is trusted. Only available for devices.
@@ -116,7 +115,6 @@ typedef enum {
 	BLUETOOTH_COLUMN_NAME,
 	BLUETOOTH_COLUMN_TYPE,
 	BLUETOOTH_COLUMN_ICON,
-	BLUETOOTH_COLUMN_RSSI,
 	BLUETOOTH_COLUMN_DEFAULT,
 	BLUETOOTH_COLUMN_PAIRED,
 	BLUETOOTH_COLUMN_TRUSTED,
diff --git a/lib/test-client.c b/lib/test-client.c
index 81abafc..23da795 100644
--- a/lib/test-client.c
+++ b/lib/test-client.c
@@ -222,10 +222,6 @@ static void create_window(void)
 					"text", BLUETOOTH_COLUMN_ICON, NULL);
 
 	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tree), -1,
-					"RSSI", gtk_cell_renderer_text_new(),
-					"text", BLUETOOTH_COLUMN_RSSI, NULL);
-
-	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(tree), -1,
 					"Default", gtk_cell_renderer_text_new(),
 					"text", BLUETOOTH_COLUMN_DEFAULT, NULL);
 
@@ -263,8 +259,6 @@ static void create_window(void)
 
 	model = bluetooth_client_get_model(client);
 	sorted = gtk_tree_model_sort_new_with_model(model);
-	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(sorted),
-				BLUETOOTH_COLUMN_RSSI, GTK_SORT_DESCENDING);
 	gtk_tree_view_set_model(GTK_TREE_VIEW(tree), sorted);
 	g_signal_connect(G_OBJECT(model), "row-inserted",
 					G_CALLBACK(row_inserted), tree);