Merge lp:~donadigo/switchboard-plug-networking/various-fixes into lp:~elementary-pantheon/switchboard-plug-networking/trunk

[Adam Bieńkowski]

* Fixes bug #1508376.
* Fixes bug #1508378.
* Fixes bug #1508373.
* Fixes bug #1508372.

* Fixes: Wireless item variable wasn't decreased on removing Wifi device.

The branch contains few important fixes for UI:
* Fixes bug #1508376. Removes most of the warnings.
* Fixes bug #1508378. As this method was used only one time, it got completely removed and replaced with native solution.
* Fixes bug #1508373. Make device list insenitive when in ariplane mode.
* Fixes bug #1508372. Inteligently select items on removing devices rather than selecting first item.

* Fixes: Wireless item variable wasn't decreased on removing Wifi device which was resulting in having only one device displaying e.g: "Wireless 3"

[lp:~donadigo/switchboard-plug-networking/various-fixes]

172. By Adam Bieńkowski on 2015-10-22

Removed unused method

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2015-10-20 20:34:36 +0000
+++ src/Plug.vala	2015-10-22 17:10:36 +0000
@@ -21,7 +21,7 @@
  */
 
 /* Main client instance */
-static NM.Client client;
+NM.Client client;
 
 /* Proxy settings */
 Network.ProxySettings proxy_settings;
@@ -45,7 +45,6 @@
         private Widgets.Footer footer;   
         private Widgets.InfoScreen no_devices;
 
-
         protected override void add_interface (WidgetNMInterface widget_interface) {
             device_list.add_device_to_list (widget_interface);
 
@@ -55,9 +54,17 @@
 
         protected override void remove_interface (WidgetNMInterface widget_interface) {
             device_list.remove_device_from_list (widget_interface.device);
+            if (content.get_visible_child () == widget_interface) {
+                int index = device_list.get_selected_row ().get_index ();
+                if (index >= 0) {
+                    device_list.get_row_at_index (index).activate ();
+                } else {
+                    select_first ();
+                }
+            }
+
             content.remove (widget_interface);
-            
-            select_first ();
+
             show_all ();
         }
 
@@ -114,11 +121,11 @@
         /* Main function to connect all the signals */
         private void connect_signals () {
             device_list.row_activated.connect ((row) => {
-                if (!Utils.list_contains (content.get_children (), ((Widgets.DeviceItem) row).page)) {
+                if (content.get_children ().find (((Widgets.DeviceItem)row).page) == null) {
                     content.add (((Widgets.DeviceItem) row).page);
                 }
 
-                content.visible_child = ((Widgets.DeviceItem) row).page;
+                content.visible_child = ((Widgets.DeviceItem)row).page;
             });
             
             device_list.show_no_devices.connect ((show) => {
@@ -132,6 +139,7 @@
             });
 
             client.notify["networking-enabled"].connect (() => {
+                device_list.sensitive = client.networking_get_enabled ();
                 if (client.networking_get_enabled ()) {
                     device_list.select_first_item ();
                 } else {

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2015-10-20 20:34:36 +0000
+++ src/Utils.vala	2015-10-22 17:10:36 +0000
@@ -15,16 +15,6 @@
         return details_btn;
     }
     
-    public bool list_contains (List list, List.G data) {
-      foreach (var unit in list.copy ()) {
-            if (unit == data) {
-                return true;
-             }
-        }
-
-        return false;
-    }
-
     public string state_to_string (NM.DeviceState state) {
         switch (state) {
             case NM.DeviceState.ACTIVATED:

=== modified file 'src/Widgets/DeviceList.vala'
--- src/Widgets/DeviceList.vala	2015-10-20 20:34:36 +0000
+++ src/Widgets/DeviceList.vala	2015-10-22 17:10:36 +0000
@@ -25,14 +25,13 @@
         public signal void show_no_devices (bool show);
         
         public NM.Client client;
-        public DeviceItem wifi = null;
-        public DeviceItem proxy;
 
         private List<DeviceItem> items;
         private DeviceItem item;
 
         private Gtk.Label settings_l;
         private Gtk.Label devices_l;
+        private DeviceItem proxy;
 
         private int wireless_item = 0;
 
@@ -56,7 +55,6 @@
             this.add_proxy ();
         }
 
-         
         public void add_device_to_list (WidgetNMInterface iface) {
             if (iface.device.get_device_type () == NM.DeviceType.WIFI) {
                 string title = _("Wireless");
@@ -94,10 +92,12 @@
         }
 
         public void remove_row_from_list (DeviceItem item) {
+            if (item.device.get_device_type () == NM.DeviceType.WIFI && wireless_item > 0) {
+                wireless_item--;
+            } 
+
             items.remove (item);
-
             this.remove (item);
-            this.select_row (this.get_row_at_index (0));
         }
 
         private void add_proxy () {
@@ -106,6 +106,7 @@
             proxy.type = Utils.ItemType.PROXY;
             this.add (proxy);
         }
+        
         public void select_first_item () {
             this.get_row_at_index (0).activate ();
         }  

=== modified file 'src/common/Widgets/AbstractWifiInterface.vala'
--- src/common/Widgets/AbstractWifiInterface.vala	2015-08-11 22:35:35 +0000
+++ src/common/Widgets/AbstractWifiInterface.vala	2015-10-22 17:10:36 +0000
@@ -105,7 +105,9 @@
 		wifi_device.state_changed.connect (update);
 		
 		var aps = wifi_device.get_access_points ();
-		aps.foreach(access_point_added_cb);
+		if (aps != null && aps.length > 0) {
+			aps.foreach(access_point_added_cb);
+		}
 
 		update();
 	}