gnome-bluetooth r493 - trunk/common

[hadess svn gnome org]

Author: hadess
Date: Wed Mar 18 22:17:03 2009
New Revision: 493
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=493&view=rev

Log:
Don't show both input and headset for headsets

The input will be connected when we connect to the
headset/audio service.



Modified:
   trunk/common/bluetooth-client.c

Modified: trunk/common/bluetooth-client.c
==============================================================================
--- trunk/common/bluetooth-client.c	(original)
+++ trunk/common/bluetooth-client.c	Wed Mar 18 22:17:03 2009
@@ -59,13 +59,13 @@
 #define BLUEZ_DEVICE_INTERFACE	"org.bluez.Device"
 
 static char * connectable_interfaces[] = {
-	"org.bluez.Input",
 	"org.bluez.Headset",
-	"org.bluez.AudioSink"
+	"org.bluez.AudioSink",
+	"org.bluez.Input"
 };
 
 /* Keep in sync with above */
-#define BLUEZ_INPUT_INTERFACE	(connectable_interfaces[0])
+#define BLUEZ_INPUT_INTERFACE	(connectable_interfaces[2])
 
 static DBusGConnection *connection = NULL;
 static BluetoothClient *bluetooth_client = NULL;
@@ -348,6 +348,12 @@
 		DBusGProxy *iface;
 		GHashTable *props;
 
+		/* Don't add the input interface for devices that already have
+		 * audio stuff */
+		if (g_str_equal (connectable_interfaces[i], BLUEZ_INPUT_INTERFACE)
+		    && g_hash_table_size (table) > 0)
+			continue;
+
 		iface = dbus_g_proxy_new_from_proxy (device, connectable_interfaces[i],
 						     NULL);
 		if (dbus_g_proxy_call (iface, "GetProperties", NULL,