[gnome-control-center] Revert "bluetooth: use uuids to set switch_connection sensitiveness"

[Bastien Nocera <hadess src gnome org>]

commit 2c0de31bb67d3b6ab089fb17d22ab112728086e4
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jun 11 16:53:32 2013 +0200

    Revert "bluetooth: use uuids to set switch_connection sensitiveness"
    
    This reverts commit 6e9a352256b624d27a3b8ff21219d364472e8a20 which
    was committed by error.

 panels/bluetooth/cc-bluetooth-panel.c |   40 +++++++++-----------------------
 1 files changed, 11 insertions(+), 29 deletions(-)
---
diff --git a/panels/bluetooth/cc-bluetooth-panel.c b/panels/bluetooth/cc-bluetooth-panel.c
index 509f5b7..7a45a7f 100644
--- a/panels/bluetooth/cc-bluetooth-panel.c
+++ b/panels/bluetooth/cc-bluetooth-panel.c
@@ -51,18 +51,6 @@ CC_PANEL_REGISTER (CcBluetoothPanel, cc_bluetooth_panel)
 #define SOUND_PREFS            "sound"
 #define WIZARD                 "bluetooth-wizard"
 
-static const char *connectable_uuids[] = {
-       "HSP",
-       "AudioSource",
-       "AudioSink",
-       "A/V_RemoteControlTarget",
-       "A/V_RemoteControl",
-       "Headset_-_AG",
-       "Handsfree",
-       "HandsfreeAudioGateway",
-       "HumanInterfaceDeviceService",
-};
-
 struct CcBluetoothPanelPrivate {
        GtkBuilder          *builder;
        GtkWidget           *chooser;
@@ -317,18 +305,6 @@ remove_extra_setup_widgets (CcBluetoothPanel *self)
        gtk_widget_hide (WID ("additional_setup_box"));
 }
 
-static gboolean
-device_is_connectable(const char *uuid)
-{
-       int i;
-
-       for (i = 0; i < G_N_ELEMENTS (connectable_uuids); i++) {
-               if (g_str_equal (connectable_uuids[i], uuid))
-                       return TRUE;
-       }
-       return FALSE;
-}
-
 static void
 cc_bluetooth_panel_update_properties (CcBluetoothPanel *self)
 {
@@ -359,6 +335,7 @@ cc_bluetooth_panel_update_properties (CcBluetoothPanel *self)
                BluetoothType type;
                gboolean connected;
                GValue value = { 0 };
+               GHashTable *services;
 
                if (self->priv->debug)
                        bluetooth_chooser_dump_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
@@ -381,20 +358,25 @@ cc_bluetooth_panel_update_properties (CcBluetoothPanel *self)
                                    g_value_get_boolean (&value) ? _("Yes") : _("No"));
                g_value_unset (&value);
 
+               /* Connection */
+               bluetooth_chooser_get_selected_device_info (BLUETOOTH_CHOOSER (self->priv->chooser),
+                                                           "services", &value);
+               services = g_value_get_boxed (&value);
+               gtk_widget_set_sensitive (GTK_WIDGET (button), (services != NULL));
+               g_value_unset (&value);
+
                /* UUIDs */
                if (bluetooth_chooser_get_selected_device_info (BLUETOOTH_CHOOSER (self->priv->chooser),
                                                                "uuids", &value)) {
                        const char **uuids;
                        guint i;
 
-                       gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
                        uuids = (const char **) g_value_get_boxed (&value);
                        for (i = 0; uuids && uuids[i] != NULL; i++) {
-                               if (g_str_equal (uuids[i], "OBEXObjectPush"))
+                               if (g_str_equal (uuids[i], "OBEXObjectPush")) {
                                        gtk_widget_show (WID ("send_box"));
-
-                               if (device_is_connectable(uuids[i]))
-                                       gtk_widget_set_sensitive (GTK_WIDGET (button), TRUE);
+                                       break;
+                               }
                        }
                        g_value_unset (&value);
                }