Merge lp:~donadigo/switchboard-plug-networking/use-client-signals into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Adam Bieńkowski]

* Use client signals to replace the old signals and help the plug integrate better with the OS by not depending on it's switches / settings.
* Rename switch_wifi_status to update_wifi_status.

Using client signals will replace the old signals and help the plug integrate better with the OS by not depending on it's switches / settings.

* Rename switch_wifi_status to update_wifi_status.

This branch solves not updating wifi item state in page-cleanup branch and should be merged *before* parent branch will be merged.

[Danielle Foré (danrabbit)]

There's an odd interaction between the network indicator and plug where if I disable wifi from the indicator, the switch won't be changed in the plug.

But I can also reproduce this with trunk, so I won't consider it a blocker for this branch and file it separately :)

review: Approve

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2015-07-23 21:29:23 +0000
+++ src/Plug.vala	2015-07-30 19:27:30 +0000
@@ -119,7 +119,8 @@
             string string_id = "wifi-page-%i".printf (wifi_page_id);
             content.add_named (wifi_page, string_id);
 
-            switch_wifi_status (wifi_page);       
+            update_wifi_status ();
+            client.notify["wireless-enabled"].connect (update_wifi_status);
 
             device_list.wifi.activate.connect (() => {
                 if (content.get_visible_child_name () != string_id)
@@ -182,14 +183,11 @@
                 }
             });
 
-            footer.on_switch_mode.connect ((switched) => {
-                if (!switched) {
-                    if (!client.networking_get_enabled ())
-                        client.networking_set_enabled (true);
+            client.notify["networking-enabled"].connect (() => {
+                if (client.networking_get_enabled ()) {
                     device_list.select_first_item ();
                     content.set_visible_child (page);
                 } else {
-                    client.networking_set_enabled (false);
                     content.set_visible_child_name ("airplane-mode-info");
                     current_device = null;
                     device_list.select_row (null);
@@ -197,8 +195,8 @@
             });
         }
 
-        private void switch_wifi_status (Widgets.WiFiPage wifi_page) {
-            if (wifi_page.control_switch.get_active ()) {
+        private void update_wifi_status () {
+            if (client.wireless_get_enabled ()) {
                 device_list.wifi.switch_status (null, "wifi-enabled");
             } else {
                 device_list.wifi.switch_status (null, "wifi-disabled");

=== modified file 'src/Widgets/Footer.vala'
--- src/Widgets/Footer.vala	2015-07-18 16:56:50 +0000
+++ src/Widgets/Footer.vala	2015-07-30 19:27:30 +0000
@@ -22,8 +22,6 @@
 
 namespace Network {
     public class Widgets.Footer : Gtk.Box {
-        public signal void on_switch_mode (bool switched);
-
         public Footer (NM.Client client) {
             this.margin_top = 12;
             this.margin_bottom = 12;
@@ -38,11 +36,12 @@
             this.pack_end (airplane_switch, false, false, 0);
 
             airplane_switch.notify["active"].connect (() => {
-                this.on_switch_mode (airplane_switch.get_active ());
+                client.networking_set_enabled (!client.networking_get_enabled ());
             });
 
-            if (!airplane_switch.get_active () && !client.networking_get_enabled ())
+            if (!airplane_switch.get_active () && !client.networking_get_enabled ()) {
                 airplane_switch.activate ();
+            }
         }
     }
 }