--- a/panels/bluetooth/bluetooth.ui +++ b/panels/bluetooth/bluetooth.ui @@ -543,34 +543,6 @@ 3 - - - True - False - - - - - - Browse Files... - True - True - False - - - False - False - end - 1 - - - - - False - True - 4 - - False --- a/panels/bluetooth/cc-bluetooth-panel.c +++ b/panels/bluetooth/cc-bluetooth-panel.c @@ -311,7 +311,6 @@ cc_bluetooth_panel_update_properties (Cc 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)); @@ -367,10 +366,10 @@ cc_bluetooth_panel_update_properties (Cc 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); } @@ -538,34 +537,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, @@ -894,8 +865,6 @@ cc_bluetooth_panel_init (CcBluetoothPane 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",