[gnome-control-center] bluetooth: Remove ObexFTP file browsing from the UI

[Bastien Nocera <hadess src gnome org>]

commit 6b95bb27d81f56acc74c99dd3e131e8b228b8209
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Dec 3 08:54:18 2012 +0100

    bluetooth: Remove ObexFTP file browsing from the UI
    
    https://bugzilla.gnome.org/show_bug.cgi?id=685038

 panels/bluetooth/bluetooth.ui         |   28 -------------------------
 panels/bluetooth/cc-bluetooth-panel.c |   37 ++------------------------------
 2 files changed, 3 insertions(+), 62 deletions(-)
---
diff --git a/panels/bluetooth/bluetooth.ui b/panels/bluetooth/bluetooth.ui
index 1d78e65..81542b8 100644
--- a/panels/bluetooth/bluetooth.ui
+++ b/panels/bluetooth/bluetooth.ui
@@ -545,34 +545,6 @@
                                 <property name="position">3</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="GtkBox" id="browse_box">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
-                                <child>
-                                  <object class="GtkButton" id="browse_button">
-                                    <property name="label" translatable="yes">Browse Files...</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="use_action_appearance">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="pack_type">end</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">4</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
diff --git a/panels/bluetooth/cc-bluetooth-panel.c b/panels/bluetooth/cc-bluetooth-panel.c
index ec54bc7..fa02fa1 100644
--- a/panels/bluetooth/cc-bluetooth-panel.c
+++ b/panels/bluetooth/cc-bluetooth-panel.c
@@ -296,7 +296,6 @@ cc_bluetooth_panel_update_properties (CcBluetoothPanel *self)
 	gtk_widget_hide (WID ("keyboard_box"));
 	gtk_widget_hide (WID ("sound_box"));
 	gtk_widget_hide (WID ("mouse_box"));
-	gtk_widget_hide (WID ("browse_box"));
 	gtk_widget_hide (WID ("send_box"));
 
 	bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
@@ -352,10 +351,10 @@ cc_bluetooth_panel_update_properties (CcBluetoothPanel *self)
 
 			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"));
-				else if (g_str_equal (uuids[i], "OBEXFileTransfer"))
-					gtk_widget_show (WID ("browse_box"));
+					break;
+				}
 			}
 			g_value_unset (&value);
 		}
@@ -523,34 +522,6 @@ send_callback (GtkButton        *button,
 	g_free (alias);
 }
 
-static void
-mount_finish_cb (GObject *source_object,
-		 GAsyncResult *res,
-		 gpointer user_data)
-{
-	GError *error = NULL;
-
-	if (bluetooth_browse_address_finish (source_object, res, &error) == FALSE) {
-		g_printerr ("Failed to mount OBEX volume: %s", error->message);
-		g_error_free (error);
-		return;
-	}
-}
-
-static void
-browse_callback (GtkButton        *button,
-		 CcBluetoothPanel *self)
-{
-	char *bdaddr;
-
-	bdaddr = bluetooth_chooser_get_selected_device (BLUETOOTH_CHOOSER (self->priv->chooser));
-
-	bluetooth_browse_address (G_OBJECT (self), bdaddr,
-				  GDK_CURRENT_TIME, mount_finish_cb, NULL);
-
-	g_free (bdaddr);
-}
-
 /* Visibility/Discoverable */
 static void discoverable_changed (BluetoothClient  *client,
 				  GParamSpec       *spec,
@@ -879,8 +850,6 @@ cc_bluetooth_panel_init (CcBluetoothPanel *self)
 			  G_CALLBACK (keyboard_callback), self);
 	g_signal_connect (G_OBJECT (WID ("sound_link")), "activate-link",
 			  G_CALLBACK (sound_callback), self);
-	g_signal_connect (G_OBJECT (WID ("browse_button")), "clicked",
-			  G_CALLBACK (browse_callback), self);
 	g_signal_connect (G_OBJECT (WID ("send_button")), "clicked",
 			  G_CALLBACK (send_callback), self);
 	g_signal_connect (G_OBJECT (WID ("switch_connection")), "notify::active",