DeviceRow: connect to activate (#243)

Author: danirabbit

src/DeviceRow.vala

@@ -225,11 +225,7 @@ public class Bluetooth.DeviceRow : Gtk.ListBoxRow {
             }
         });
 
-        connect_button.clicked.connect (() => {
-            button_clicked.begin ();
-            // If pairing is successful, mark devices as trusted so they autoconnect
-            device.trusted = device.paired;
-        });
+        connect_button.clicked.connect (() => on_activate.begin ());
 
         forget_button.clicked.connect (() => {
             try {
@@ -241,11 +237,13 @@ public class Bluetooth.DeviceRow : Gtk.ListBoxRow {
 
     }
 
-    private async void button_clicked () {
+    public async void on_activate () {
         if (!device.paired) {
             set_status (Status.PAIRING);
             try {
                 yield device.pair ();
+                // If pairing is successful, mark devices as trusted so they autoconnect
+                device.trusted = device.paired;
             } catch (Error e) {
                 set_status (Status.UNABLE_TO_CONNECT);
                 critical (e.message);

src/MainView.vala

@@ -41,13 +41,14 @@ public class Bluetooth.MainView : Switchboard.SettingsPage {
             description = _("Please ensure that your devices are visible and ready for pairing.")
         };
 
-        list_box = new Gtk.ListBox ();
+        list_box = new Gtk.ListBox () {
+            activate_on_single_click = false,
+            selection_mode = BROWSE
+        };
         list_box.add_css_class (Granite.STYLE_CLASS_RICH_LIST);
         list_box.set_sort_func ((Gtk.ListBoxSortFunc) compare_rows);
         list_box.set_header_func ((Gtk.ListBoxUpdateHeaderFunc) title_rows);
         list_box.set_placeholder (empty_alert);
-        list_box.selection_mode = Gtk.SelectionMode.BROWSE;
-        list_box.activate_on_single_click = true;
 
         var scrolled = new Gtk.ScrolledWindow () {
             child = list_box,
@@ -76,6 +77,10 @@ public class Bluetooth.MainView : Switchboard.SettingsPage {
             manager.notify["retrieve-finished"].connect (complete_setup);
         }
 
+        list_box.row_activated.connect ((row) => {
+            ((DeviceRow) row).on_activate.begin ();
+        });
+
         status_switch.notify["active"].connect (() => {
             manager.set_global_state.begin (status_switch.active);
         });