Merge lp:~seb128/unity-control-center/bluetooth-leftover-button into lp:unity-control-center

[Sebastien Bacher]

bluetooh: remove leftover "browse" button, the backend used was removed
during the bluez5 update and the panel callbacks were cleaned out, the button
is doing nothing else than confusing users

bluetooh: remove leftover "browse" button, the backend used was removed
during the bluez5 update and the panel callbacks were cleaned out, the button
is doing nothing else than confusing users

[Iain Lane (laney)]

Thanks, looks good, just one improvement to suggest

review: Needs Information

[Sebastien Bacher (seb128)]

thanks, I guess that could be improved, I cherry picked that bit from upstream https://git.gnome.org/browse/gnome-control-center/commit/?&id=6b95bb27d81f56acc74c99dd3e131e8b228b8209

seems the code is still the same in trunk
https://git.gnome.org/browse/gnome-control-center/tree/panels/bluetooth/cc-bluetooth-panel.c?id=6b95bb27d81f56acc74c99dd3e131e8b228b8209#n353

I'm going to SRU the no-refactoring version but feel free to block that mp if you think the code should be improvement in the same landing (needs to create a bug upstream/suggest a patch/backport that, so it's going to take a bit longer but that's fine we are early in the cycle)

[Sebastien Bacher (seb128)]

let's land that fix and improve later

=== modified file 'panels/bluetooth/bluetooth.ui'
--- panels/bluetooth/bluetooth.ui	2014-03-12 17:29:59 +0000
+++ panels/bluetooth/bluetooth.ui	2016-05-12 13:51:25 +0000
@@ -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>

=== modified file 'panels/bluetooth/cc-bluetooth-panel.c'
--- panels/bluetooth/cc-bluetooth-panel.c	2016-03-09 21:55:46 +0000
+++ panels/bluetooth/cc-bluetooth-panel.c	2016-05-12 13:51:25 +0000
@@ -276,7 +276,6 @@
 	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));
@@ -332,10 +331,10 @@
 
 			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);
 		}