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

[Adam Bieńkowski]

- Fix bug #1440563: "Configure VPN".
- Fix bug #1579183: "Ignore virtual network hardware".
- Minor code clean ups.

Fixes bug #1440563: "Configure VPN" and bug #1579183: "Ignore virtual network hardware".

This branch adds VPN support, mainly for adding / displaying / editing and removing VPN connections from the plug. It makes use of the connection editor provided from Gnome which is already present in "Advanced settings" of devices. Then it updates the plug with new information as it's being changed.

Also it prevents virtual devices from showing now, which is an common update from:
https://code.launchpad.net/~donadigo/wingpanel-indicator-network/ignore-virtual-hardware/+merge/300343

There are also some code clean ups but they are rather minor.

[Danielle Foré (danrabbit)]

I think Corentin had a nicer design for adding and managing VPNs. Maybe we can get him to share his sketches from the snappy sprint in #UX or upload his WIP branch. But the basics were that we followed the design for the Wireless section where you have one section "VPN" and then you manage the connections inside of that section.

review: Needs Fixing (ux)

[Danielle Foré (danrabbit)]

* Please use the icon "network-vpn", not "network-wireless-encrypted"
* Since we can't select in the list without activating, let's remove the "-" icon for now

review: Needs Fixing (ux)

[Adam Bieńkowski (donadigo)]

Updated.

[Danielle Foré (danrabbit)]

can you put the status back on VPN? I know it looks weird right now, but that's an icons bug and there's a report for it.

[lp:~donadigo/switchboard-plug-networking/vpn]

272. By Adam Bieńkowski on 2016-07-26

Add back the VPN status icon

273. By Adam Bieńkowski on 2016-07-26

Revert VPNPage strings from the last commit

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-12-07 16:07:16 +0000
+++ src/CMakeLists.txt	2016-07-26 21:06:49 +0000
@@ -27,11 +27,15 @@
     Widgets/Proxy/ProxyExceptionsPage.vala
     Widgets/Proxy/ProxyPage.vala    
     Widgets/InfoBox.vala
+    Widgets/SettingsButton.vala
+    Widgets/VPNPage.vala
+    Widgets/VPNInfoBox.vala
     Widgets/Footer.vala
     Widgets/InfoScreen.vala
     Widgets/Hotspot/HotspotDialog.vala
     common/Utils.vala
     common/Widgets/WifiMenuItem.vala
+    common/Widgets/VPNMenuItem.vala
     common/Widgets/AbstractWifiInterface.vala
     common/Widgets/AbstractEtherInterface.vala
     common/Widgets/AbstractHotspotInterface.vala

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2016-06-27 20:16:52 +0000
+++ src/Plug.vala	2016-07-26 21:06:49 +0000
@@ -41,19 +41,21 @@
         private Widgets.DeviceList device_list;
         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);
+            device_list.add_iface_to_list (widget_interface);
 
             select_first ();
             show_all ();
         }
 
         protected override void remove_interface (WidgetNMInterface widget_interface) {
-            device_list.remove_device_from_list (widget_interface.device);
+            device_list.remove_iface_from_list (widget_interface);
+    
             if (content.get_visible_child () == widget_interface) {
+                var row = device_list.get_selected_row ();
                 int index = device_list.get_selected_row ().get_index ();
-                if (index >= 0) {
+                if (row != null && row.get_index () >= 0) {
                     device_list.get_row_at_index (index).activate ();
                 } else {
                     select_first ();
@@ -64,6 +66,14 @@
             show_all ();
         }
 
+        protected override void add_connection (NM.RemoteConnection connection) {
+            device_list.add_connection (connection);
+        }
+
+        protected override void remove_connection (NM.RemoteConnection connection) {
+            device_list.remove_connection (connection);
+        }
+
         private void select_first () {
 			device_list.select_first_item ();
         }
@@ -100,7 +110,7 @@
             sidebar.pack_start (scrolled_window, true, true);
             sidebar.pack_start (footer, false, false);
 
-            paned.pack1 (sidebar, true, true);
+            paned.pack1 (sidebar, false, false);
             paned.pack2 (content, true, false);
             paned.set_position (240);
 
@@ -115,13 +125,14 @@
         /* Main function to connect all the signals */
         private void connect_signals () {
             device_list.row_activated.connect ((row) => {
-                if (content.get_children ().find (((Widgets.DeviceItem)row).page) == null) {
-                    content.add (((Widgets.DeviceItem) row).page);
+                var page = ((Widgets.DeviceItem)row).page;
+                if (content.get_children ().find (page) == null) {
+                    content.add (page);
                 }
 
-                content.visible_child = ((Widgets.DeviceItem)row).page;
+                content.visible_child = page;
             });
-            
+
             device_list.show_no_devices.connect ((show) => {
                 scrolled_window.sensitive = !show;
                 if (show) {
@@ -142,17 +153,6 @@
                 }
             });
         }
-
-        /*private void show_error_dialog () {
-            var error_dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, " ");
-            error_dialog.text = _("Could not enable device: there are no available
-connections for this device.");
-            error_dialog.deletable = false;
-            error_dialog.show_all ();
-            error_dialog.response.connect ((response_id) => {
-                error_dialog.destroy ();
-            }); 
-        }*/
     }
 
     public class Plug : Switchboard.Plug {

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2016-06-06 21:45:31 +0000
+++ src/Utils.vala	2016-07-26 21:06:49 +0000
@@ -184,16 +184,6 @@
             INVALID
         }
 
-        public static Gtk.Button get_advanced_button_from_device (NM.Device? device, string title = _("Advanced Settings…")) {
-            var details_btn = new Gtk.Button.with_label (title);
-            details_btn.clicked.connect (() => {
-                new Granite.Services.SimpleCommand ("/usr/bin",
-                                                    "nm-connection-editor --edit=" + device.get_active_connection ().get_uuid ()).run ();
-            }); 
-
-            return details_btn;
-        }
-        
         public static string state_to_string (NM.DeviceState state) {
             switch (state) {
                 case NM.DeviceState.ACTIVATED:

=== modified file 'src/Widgets/Device/DeviceItem.vala'
--- src/Widgets/Device/DeviceItem.vala	2016-02-12 15:09:30 +0000
+++ src/Widgets/Device/DeviceItem.vala	2016-07-26 21:06:49 +0000
@@ -21,7 +21,7 @@
     public class DeviceItem : Gtk.ListBoxRow {
         public NM.Device? device = null;
         private NM.RemoteSettings? nm_settings = null;
-        public Gtk.Box? page = null;
+        public Gtk.Widget? page = null;
         public Utils.ItemType type;
 
         public Gtk.Label row_description;
@@ -134,6 +134,7 @@
                     case Network.State.CONNECTED_WIFI_GOOD:
                     case Network.State.CONNECTED_WIFI_EXCELLENT:
                     case Network.State.CONNECTED_WIRED:
+                    case Network.State.CONNECTED_VPN:
                         status_image.icon_name = "user-available";
                         break;
                     case Network.State.DISCONNECTED:
@@ -141,20 +142,16 @@
                         break;
                     case Network.State.FAILED_WIRED:
                     case Network.State.FAILED_WIFI:
+                    case Network.State.FAILED_VPN:
                         status_image.icon_name = "user-busy";
                         break;
-                    /*case NM.DeviceState.UNMANAGED:
-                        status_image.icon_name = "user-invisible";
-                        break;*/
                     default:
                         status_image.icon_name = "user-away";
                         break;
                 }
 
                 row_description.label = Common.Utils.network_state_to_string (state);
-            }
-
-            if (custom_mode != Utils.CustomMode.INVALID) {
+            } else if (custom_mode != Utils.CustomMode.INVALID) {
                 switch (custom_mode) {
                     case Utils.CustomMode.PROXY_NONE:
                         row_description.label = _("Disabled");
@@ -169,7 +166,7 @@
                         status_image.icon_name = "user-available";
                         break;
                }
-           }
+            }
 
            row_description.label = "<span font_size='small'>" + row_description.label + "</span>";
         }

=== modified file 'src/Widgets/Device/DevicePage.vala'
--- src/Widgets/Device/DevicePage.vala	2016-02-12 15:09:30 +0000
+++ src/Widgets/Device/DevicePage.vala	2016-07-26 21:06:49 +0000
@@ -18,11 +18,10 @@
  */
 
 namespace Network.Widgets {
-    public class DevicePage : Network.WidgetNMInterface {
+    public class DevicePage : WidgetNMInterface {
 
         public DevicePage (NM.Client client, NM.RemoteSettings settings, NM.Device device) {
-            info_box = new InfoBox.from_device (device);
-            this.init (device, info_box);
+            this.init (device);
 
             bottom_revealer.transition_type = Gtk.RevealerTransitionType.NONE;
 
@@ -30,7 +29,7 @@
             display_title = Utils.type_to_string (device.get_device_type ());
 
             var details_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-            details_box.pack_end (Utils.get_advanced_button_from_device (device), false, false, 0);
+            details_box.pack_end (new SettingsButton.from_device (device), false, false, 0);
 
             update ();
 
@@ -42,14 +41,13 @@
         }
 
         public DevicePage.from_owner (DeviceItem? owner) {
-            info_box = new InfoBox.from_owner (owner);
-            this.init (owner.get_item_device (), info_box);
+            this.init (owner.get_item_device ());
 
             this.icon_name = owner.get_item_icon_name ();
             display_title = Utils.type_to_string (device.get_device_type ());
 
             var details_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-            details_box.pack_start (Utils.get_advanced_button_from_device (device), false, false, 0);
+            details_box.pack_start (new SettingsButton.from_device (device), false, false, 0);
 
             update ();
 

=== modified file 'src/Widgets/DeviceList.vala'
--- src/Widgets/DeviceList.vala	2016-02-12 15:09:30 +0000
+++ src/Widgets/DeviceList.vala	2016-07-26 21:06:49 +0000
@@ -24,6 +24,7 @@
         private Gtk.Label virtual_l;
         private Gtk.Label devices_l;
         private DeviceItem proxy;
+        private DeviceItem vpn;
 
         public DeviceList () {
             virtual_l = new Gtk.Label (_("Virtual"));
@@ -42,21 +43,15 @@
             bool show = (get_children ().length () > 0);
             this.show_no_devices (!show);
             this.add_proxy ();
+            this.add_vpn ();
         }
 
-        public void add_device_to_list (WidgetNMInterface iface) {
-			DeviceItem item;
+        public void add_iface_to_list (WidgetNMInterface iface) {
+            DeviceItem item;
             if (iface is AbstractWifiInterface) {
-                item = new DeviceItem.from_interface (iface, "network-wireless");
+                item = new DeviceItem.from_interface (iface, "network-wireless");              
             } else if (iface is AbstractHotspotInterface) {
                 item = new DeviceItem.from_interface (iface, "network-wireless-hotspot");
-                item.no_show_all = true;
-                iface.device.state_changed.connect ((state) => {
-                    item.visible = (state != NM.DeviceState.UNAVAILABLE
-                            && state != NM.DeviceState.UNMANAGED
-                            && state != NM.DeviceState.UNKNOWN);
-                });
-
                 item.type = Utils.ItemType.VIRTUAL;
             } else {
                 if (iface.device.get_iface ().has_prefix ("usb")) {
@@ -70,17 +65,37 @@
             show_all ();
         }
 
-        public void remove_device_from_list (NM.Device device) {
+        public void remove_iface_from_list (WidgetNMInterface iface) {
             foreach (Gtk.Widget _list_item in get_children ()) {
                 var list_item = (DeviceItem)_list_item;
-                if (list_item.device == device) {
+                if (list_item.page == iface) {
                     remove_row_from_list (list_item);
                 }
             }
         }
 
+        public void add_connection (NM.RemoteConnection connection) {
+            switch (connection.get_connection_type ()) {
+                case NM.SettingVpn.SETTING_NAME:
+                    ((VPNPage)vpn.page).add_connection (connection);
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        public void remove_connection (NM.RemoteConnection connection) {
+            switch (connection.get_connection_type ()) {
+                case NM.SettingVpn.SETTING_NAME:
+                    ((VPNPage)vpn.page).remove_connection (connection);
+                    break;
+                default:
+                    break;
+            }
+        }
+
         public void remove_row_from_list (DeviceItem item) {
-			this.remove (item);
+            this.remove (item);
             show_all ();
         }
 
@@ -91,7 +106,15 @@
 
             this.add (proxy);
         }
-        
+
+        private void add_vpn () {
+            vpn = new DeviceItem (_("VPN"), "", "network-vpn");
+            vpn.page = new VPNPage (vpn);
+            vpn.type = Utils.ItemType.VIRTUAL;
+
+            this.add (vpn);
+        }
+
         public void select_first_item () {
             this.get_row_at_index (0).activate ();
         }  

=== modified file 'src/Widgets/EtherInterface.vala'
--- src/Widgets/EtherInterface.vala	2016-07-19 08:02:20 +0000
+++ src/Widgets/EtherInterface.vala	2016-07-26 21:06:49 +0000
@@ -18,13 +18,13 @@
  */
 
 namespace Network.Widgets {
-    public class EtherInterface : Network.AbstractEtherInterface {
+    public class EtherInterface : AbstractEtherInterface {
         private Gtk.Revealer top_revealer;
 
         public EtherInterface (NM.Client client, NM.RemoteSettings settings, NM.Device device) {
-            info_box = new InfoBox.from_device (device);
+            this.init (device);
+
             info_box.halign = Gtk.Align.CENTER;
-            this.init (device, info_box);
 
             this.icon_name = "network-wired";
 
@@ -34,7 +34,7 @@
             top_revealer.add (info_box);
 
             var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
-            button_box.pack_end (Utils.get_advanced_button_from_device (device), false, false, 0);
+            button_box.pack_end (new SettingsButton.from_device (device), false, false, 0);
 
             bottom_box.add (button_box);
 

=== modified file 'src/Widgets/HotspotInterface.vala'
--- src/Widgets/HotspotInterface.vala	2016-02-12 15:09:30 +0000
+++ src/Widgets/HotspotInterface.vala	2016-07-26 21:06:49 +0000
@@ -30,15 +30,14 @@
         public HotspotInterface (WifiInterface _root_iface) {
             root_iface = _root_iface;
             nm_settings = _root_iface.get_nm_settings ();
-            info_box = new InfoBox.from_device (root_iface.device);
-            this.init (root_iface.device, info_box);
+            this.init (root_iface.device);
 
             this.icon_name = "network-wireless-hotspot";
 
             hotspot_revealer = new Gtk.Revealer ();
             hotspot_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
 
-            hotspot_settings_btn = Utils.get_advanced_button_from_device (device, _("Hotspot Settings…"));
+            hotspot_settings_btn = new SettingsButton.from_device (device, _("Hotspot Settings…"));
 
             var hinfo_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
 

=== modified file 'src/Widgets/Page.vala'
--- src/Widgets/Page.vala	2016-06-06 21:45:31 +0000
+++ src/Widgets/Page.vala	2016-07-26 21:06:49 +0000
@@ -34,7 +34,19 @@
 
             set {
                 _icon_name = value;
-                device_img.icon_name = _icon_name;
+                device_img.icon_name = value;
+            }
+        }
+
+        private string _title;
+        public string title {
+            get {
+                return _title;
+            }
+
+            set {
+                _title = value;
+                device_label.label = value;
             }
         }
 
@@ -57,16 +69,13 @@
             bottom_revealer.add (bottom_box);
         }
 
-        public void init (NM.Device _device, Widgets.InfoBox _info_box) {
+        public void init (NM.Device? _device) {
             this.device = _device;
-            this.info_box = _info_box;
-            info_box.margin_end = 16;
-            info_box.info_changed.connect (update);
-            
-            device_img = new Gtk.Image.from_icon_name (_icon_name, Gtk.IconSize.DIALOG);
+
+            device_img = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG);
             device_img.pixel_size = 48;
 
-            device_label = new Gtk.Label (Utils.type_to_string (device.get_device_type ()));
+            device_label = new Gtk.Label (null);
             device_label.ellipsize = Pango.EllipsizeMode.MIDDLE;
             device_label.get_style_context ().add_class ("h2");
 
@@ -76,6 +85,14 @@
 
             control_switch.notify["active"].connect (control_switch_activated);
 
+            if (device != null) {
+                this.info_box = new InfoBox.from_device (device);
+                info_box.margin_end = 16;
+                info_box.info_changed.connect (update);
+
+                title = Utils.type_to_string (device.get_device_type ());       
+            }
+
             control_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 12);
             control_box.pack_start (device_img, false, false, 0);
             control_box.pack_start (device_label, false, false, 0);
@@ -86,9 +103,11 @@
         }
 
         public virtual void update () {
-            string sent_bytes, received_bytes;
-            this.get_activity_information (device.get_iface (), out sent_bytes, out received_bytes);
-            info_box.update_activity (sent_bytes, received_bytes);
+            if (info_box != null) {
+                string sent_bytes, received_bytes;
+                this.get_activity_information (device.get_iface (), out sent_bytes, out received_bytes);
+                info_box.update_activity (sent_bytes, received_bytes);       
+            }
 
             update_switch ();
 

=== modified file 'src/Widgets/Proxy/ProxyPage.vala'
--- src/Widgets/Proxy/ProxyPage.vala	2016-02-12 15:09:30 +0000
+++ src/Widgets/Proxy/ProxyPage.vala	2016-07-26 21:06:49 +0000
@@ -42,7 +42,6 @@
             stackswitcher.stack = stack;
 
             proxy_settings.changed.connect (update_mode);
-
             update_mode ();
 
             this.add (stackswitcher);
@@ -52,7 +51,7 @@
             stack.visible_child = configuration_page;
         }
 
-        public void update_mode () {
+        private void update_mode () {
             var mode = Utils.CustomMode.INVALID;
             switch (proxy_settings.mode) {
                 case "none":

=== added file 'src/Widgets/SettingsButton.vala'
--- src/Widgets/SettingsButton.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/SettingsButton.vala	2016-07-26 21:06:49 +0000
@@ -0,0 +1,41 @@
+/*-
+ * Copyright (c) 2015-2016 elementary LLC.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]>
+ */
+
+ namespace Network.Widgets {
+    public class SettingsButton : Gtk.Button {
+        private string uuid = "";
+
+        construct {
+            clicked.connect (() => {
+                new Granite.Services.SimpleCommand ("/usr/bin",
+                                                    "nm-connection-editor --edit=%s".printf (uuid)).run ();
+            });  
+        }
+
+        public SettingsButton.from_device (NM.Device device, string title = _("Advanced Settings…")) {
+            label = title;
+            uuid = device.get_active_connection ().get_uuid ();
+        }
+
+        public SettingsButton.from_connection (NM.Connection connection, string title = _("Advanced Settings…")) {
+            label = title;
+            uuid = connection.get_uuid ();
+        }
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/VPNInfoBox.vala'
--- src/Widgets/VPNInfoBox.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/VPNInfoBox.vala	2016-07-26 21:06:49 +0000
@@ -0,0 +1,153 @@
+/*-
+ * Copyright (c) 2015-2016 elementary LLC.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]>
+ */
+
+namespace Network.Widgets {  
+    public class VPNInfoBox : Gtk.Grid {
+        private NM.RemoteConnection? connection = null;
+        private string service_type;
+
+        private Gtk.Label type;
+        private Gtk.Label gateway;
+        private Gtk.Label username;
+        private Gtk.Label password;
+
+        public VPNInfoBox () {
+            column_spacing = 12;
+            row_spacing = 6;
+
+            var type_head = new Gtk.Label (_("VPN Type:"));
+            type_head.halign = Gtk.Align.END;
+
+            var gateway_head = new Gtk.Label (_("Gateway:"));
+            gateway_head.halign = Gtk.Align.END;
+
+            var username_head = new Gtk.Label (_("Username:"));
+            username_head.halign = Gtk.Align.END;
+
+            var password_head = new Gtk.Label (_("Password:"));
+            password_head.halign = Gtk.Align.END;
+
+            type = new Gtk.Label ("");
+            type.selectable = true;
+            type.xalign = 0;
+            type.no_show_all = true;
+
+            gateway = new Gtk.Label ("");
+            gateway.selectable = true;
+            gateway.xalign = 0;
+            gateway.no_show_all = true;
+
+            username = new Gtk.Label ("");
+            username.selectable = true;
+            username.xalign = 0;
+            username.no_show_all = true;
+
+            password = new Gtk.Label ("");
+            password.selectable = true;
+            password.xalign = 0;
+            password_head.no_show_all = true;
+
+            attach (type_head, 0, 0);
+            attach_next_to (type, type_head, Gtk.PositionType.RIGHT);
+
+            attach_next_to (gateway_head, type_head, Gtk.PositionType.BOTTOM);
+            attach_next_to (gateway, gateway_head, Gtk.PositionType.RIGHT);
+
+            attach_next_to (username_head, gateway_head, Gtk.PositionType.BOTTOM);
+            attach_next_to (username, username_head, Gtk.PositionType.RIGHT);
+
+            attach_next_to (password_head, username_head, Gtk.PositionType.BOTTOM);
+            attach_next_to (password, password_head, Gtk.PositionType.RIGHT);
+        }
+
+        public void set_connection (NM.RemoteConnection _connection) {
+            connection = _connection;
+            connection.changed.connect (update_status);
+            update_status ();
+        }
+
+        // From https://github.com/GNOME/gnome-control-center/blob/master/panels/network/net-vpn.c
+        private string get_key_group_username () {
+            switch (service_type) {
+                case "openvpn":
+                case "openconnect":
+                    return "username";
+                case "vpnc":
+                    return "Xauth username";
+                case "pptp":
+                    return "user";
+                case "openswan":
+                    return "leftxauthusername";
+            }
+
+            return "";
+        }
+
+        private string get_key_group_password () {
+            if (service_type == "vpnc") {
+                return "Xauth password";
+            }
+
+            return "";
+        }
+
+        private string get_key_gateway () {
+            switch (service_type) {
+                case "openvpn":
+                    return "remote";
+                case "vpnc":
+                    return "IPSec gateway";
+                case "pptp":
+                case "openconnect":
+                    return "gateway";
+                case "openswan":
+                    return "right";
+            }
+
+            return "";
+        }
+
+
+        private string get_service_type () {
+            var setting_vpn = connection.get_setting_vpn ();
+            string service_type = setting_vpn.get_service_type ();
+            string[] arr = service_type.split (".");
+            return arr[arr.length - 1];
+        }
+
+        public void update_status () {
+            if (connection == null) {
+                return;
+            }
+
+            service_type = get_service_type ();
+
+            var setting_vpn = connection.get_setting_vpn ();
+            type.label = get_service_type ();
+            gateway.label = setting_vpn.get_data_item (get_key_gateway ());
+            username.label = setting_vpn.get_data_item (get_key_group_username ());
+            password.label = setting_vpn.get_data_item (get_key_group_password ());
+
+            type.visible = type.label != "";
+            gateway.visible = gateway.label != "";
+            username.visible = username.label != "";
+            password.visible = password.label != "";
+        }
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/VPNPage.vala'
--- src/Widgets/VPNPage.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/VPNPage.vala	2016-07-26 21:06:49 +0000
@@ -0,0 +1,327 @@
+/*-
+ * Copyright (c) 2015-2016 elementary LLC.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Adam Bieńkowski <[e-mail]>
+ */
+
+using Network.Widgets;
+
+namespace Network {
+    public class VPNPage : WidgetNMInterface {
+        private DeviceItem owner;
+        private NM.VPNConnection? active_connection = null;
+        private VPNMenuItem? active_vpn_item = null;
+
+        private Gtk.Frame connected_frame;
+        private Gtk.ListBox vpn_list;
+        private VPNInfoBox vpn_info_box;
+        private VPNMenuItem blank_item;
+        private Gtk.ScrolledWindow scrolled;
+        private Gtk.Box? connected_box = null;
+        private Gtk.Button? disconnect_btn;
+        private Gtk.Button? settings_btn;
+        private Gtk.ToggleButton? info_btn;
+        private Gtk.Revealer top_revealer;
+        private Gtk.Popover popover;
+
+        public VPNPage (DeviceItem _owner) {
+            owner = _owner;
+            
+            this.init (null);
+            this.title = "Virtual Private Network";
+            this.icon_name = "network-vpn";
+
+            this.spacing = 0;
+            control_box.margin_bottom = 12;
+
+            vpn_info_box = new VPNInfoBox ();
+
+            popover = new Gtk.Popover (info_btn);
+            popover.position = Gtk.PositionType.BOTTOM;
+            popover.add (vpn_info_box);
+            popover.hide.connect (() => {
+                info_btn.active = false;
+            });            
+
+            connected_frame = new Gtk.Frame (null);
+            connected_frame.override_background_color (0, { 255, 255, 255, 255 });
+
+            top_revealer = new Gtk.Revealer ();
+            top_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_DOWN;
+            top_revealer.add (connected_frame);
+
+            var no_connections_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
+            no_connections_box.visible = true;
+            no_connections_box.valign = Gtk.Align.CENTER; 
+
+            var no_connections_label = new Gtk.Label (_("No VPN Connections"));
+            no_connections_label.valign = Gtk.Align.CENTER;
+            no_connections_label.wrap = true;
+            no_connections_label.wrap_mode = Pango.WrapMode.WORD_CHAR;
+            no_connections_label.max_width_chars = 30;
+            no_connections_label.justify = Gtk.Justification.CENTER;
+            no_connections_label.get_style_context ().add_class ("h2");
+
+            var second_label = new Gtk.Label (_("Add a new VPN connection to begin."));
+            second_label.valign = Gtk.Align.CENTER;
+            second_label.wrap = true;
+            second_label.wrap_mode = Pango.WrapMode.WORD_CHAR;
+            second_label.max_width_chars = 30;
+            second_label.justify = Gtk.Justification.CENTER;            
+
+            no_connections_box.add (no_connections_label);
+            no_connections_box.add (second_label);
+            no_connections_box.show_all ();
+
+            vpn_list = new Gtk.ListBox ();
+            vpn_list.activate_on_single_click = false;
+            vpn_list.visible = true;
+            vpn_list.set_placeholder (no_connections_box);
+
+            var toolbar = new Gtk.Toolbar ();
+            toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+            toolbar.icon_size = Gtk.IconSize.SMALL_TOOLBAR;
+
+            var add_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("list-add-symbolic", Gtk.IconSize.SMALL_TOOLBAR), null);
+            add_button.tooltip_text = _("Add VPN Connection…");
+            add_button.clicked.connect (() => {
+                add_button.sensitive = false;
+                var command = new Granite.Services.SimpleCommand ("/usr/bin",
+                                                    "nm-connection-editor --create --type=vpn");
+                command.done.connect ((exit) => {
+                    if (exit != 0) {
+                        var dialog = new Gtk.MessageDialog (null, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, _("Failed to run Connection Editor."));
+                        dialog.run ();
+                        dialog.destroy ();
+                    }
+
+                    add_button.sensitive = true;
+                });
+
+                command.run ();
+            });
+
+            toolbar.add (add_button);
+
+            blank_item = new VPNMenuItem.blank ();
+
+            scrolled = new Gtk.ScrolledWindow (null, null);
+            scrolled.expand = true;
+            scrolled.add (vpn_list);
+
+            var list_root = new Gtk.Grid ();
+            list_root.attach (scrolled, 0, 0, 1, 1);
+            list_root.attach (toolbar, 0, 1, 1, 1);
+
+            var main_frame = new Gtk.Frame (null);
+            main_frame.margin_bottom = 24;
+            main_frame.margin_top = 12;
+            main_frame.vexpand = true;          
+            main_frame.override_background_color (0, { 255, 255, 255, 255 });
+            main_frame.add (list_root);
+
+            control_switch.no_show_all = true;
+            control_switch.visible = false;
+
+            this.add (top_revealer);
+            this.add (main_frame);
+            this.add (bottom_revealer);
+            this.show_all ();
+
+            client.notify["active-connections"].connect (update_active_connection);
+            update ();
+        }
+
+        protected override void update () {
+            update_active_connection ();
+
+            bool sensitive = false;
+            VPNMenuItem? item = null;
+            if (active_connection != null) {
+                switch (active_connection.get_vpn_state ()) {
+                    case NM.VPNConnectionState.UNKNOWN:
+                    case NM.VPNConnectionState.DISCONNECTED:
+                        state = State.DISCONNECTED;
+                        break;
+                    case NM.VPNConnectionState.PREPARE:
+                    case NM.VPNConnectionState.IP_CONFIG_GET:
+                    case NM.VPNConnectionState.CONNECT:
+                        state = State.CONNECTING_VPN;
+                        item = get_item_by_uuid (active_connection.get_uuid ());
+                        item.state = state;
+                        break;
+                    case NM.VPNConnectionState.FAILED:
+                        state = State.FAILED_VPN;
+                        break;
+                    case NM.VPNConnectionState.ACTIVATED:
+                        state = State.CONNECTED_VPN;
+                        item = get_item_by_uuid (active_connection.get_uuid ());
+                        item.state = state;
+                        sensitive = true;
+                        break;
+                }
+            } else {
+                state = State.DISCONNECTED;
+            }
+
+            if (item == null) {
+                top_revealer.set_reveal_child (false);
+                blank_item.set_active (true);
+
+                if (active_vpn_item != null) {
+                    active_vpn_item.no_show_all = false;
+                    active_vpn_item.visible = true;
+                    active_vpn_item.state = state;
+                }
+            } else {
+                top_revealer.set_reveal_child (true);
+                if (connected_frame != null && connected_frame.get_child () != null) {
+                    connected_frame.get_child ().destroy ();
+                }
+
+                connected_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+                item.no_show_all = true;
+                item.visible = false;
+
+                var top_item = new VPNMenuItem (item.connection, null);
+                top_item.hide_icons (false);
+
+                connected_box.add (top_item);
+
+                disconnect_btn = new Gtk.Button.with_label (_("Disconnect"));
+                disconnect_btn.get_style_context ().add_class ("destructive-action");
+                disconnect_btn.clicked.connect (vpn_deactivate_cb);
+
+                settings_btn = new SettingsButton.from_connection (item.connection, _("Settings…"));
+
+                info_btn = new Gtk.ToggleButton ();
+                info_btn.margin_top = info_btn.margin_bottom = 6;
+                info_btn.get_style_context ().add_class ("flat");
+                info_btn.image = new Gtk.Image.from_icon_name ("view-more-symbolic", Gtk.IconSize.SMALL_TOOLBAR);
+
+                vpn_info_box.set_connection (item.connection);
+
+                popover.relative_to = info_btn;
+
+                info_btn.toggled.connect (() => {
+                    popover.visible = info_btn.get_active ();
+                });
+
+                var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+                button_box.homogeneous = true;
+                button_box.margin = 6;
+                button_box.pack_end (disconnect_btn, false, false, 0);
+                button_box.pack_end (settings_btn, false, false, 0);
+                button_box.show_all ();
+
+                connected_box.pack_end (button_box, false, false, 0);
+                connected_box.pack_end (info_btn, false, false, 0);
+                connected_frame.add (connected_box);
+
+                connected_box.show_all ();
+                connected_frame.show_all ();
+
+                if (disconnect_btn != null) {
+                    disconnect_btn.sensitive = sensitive;
+                }
+
+                if (settings_btn != null) {
+                    settings_btn.sensitive = sensitive;
+                }
+
+                if (info_btn != null) {
+                    info_btn.sensitive = sensitive;
+                }                
+            }
+
+            owner.switch_status (Utils.CustomMode.INVALID, state);
+            update_switch ();
+        }
+
+        protected override void update_switch () {
+
+        }
+
+        protected override void control_switch_activated () {
+
+        }
+
+        public void add_connection (NM.RemoteConnection connection) {
+            var item = new VPNMenuItem (connection, get_previous_menu_item ());
+            item.user_action.connect (vpn_activate_cb);
+
+            vpn_list.add (item);
+            update ();
+            this.show_all ();
+        }
+
+        public void remove_connection (NM.RemoteConnection connection) {
+            var item = get_item_by_uuid (connection.get_uuid ());
+            item.destroy ();
+        }
+
+        private VPNMenuItem? get_item_by_uuid (string uuid) {
+            VPNMenuItem? item = null;
+            foreach (var child in vpn_list.get_children ()) {
+                var _item = (VPNMenuItem)child;
+                if (_item.connection != null && _item.connection.get_uuid () == uuid && item == null) {
+                    item = (VPNMenuItem)child;
+                }
+            }
+
+            return item;
+        }
+
+        private VPNMenuItem? get_previous_menu_item () {
+            var children = vpn_list.get_children ();
+            if (children.length () == 0) {
+                return blank_item;
+            }
+
+            return (VPNMenuItem)children.last ().data;
+        }
+
+        private void update_active_connection () {
+            active_connection = null;
+
+            client.get_active_connections ().foreach ((ac) => {
+                if (ac.get_vpn () && active_connection == null) {
+                    active_connection = (NM.VPNConnection)ac;
+                    active_connection.vpn_state_changed.connect (update);
+                }
+            });
+        }
+
+        private void vpn_activate_cb (VPNMenuItem item) {
+            active_vpn_item = item;
+            foreach (var child in vpn_list.get_children ()) {
+                ((VPNMenuItem)child).hide_icons ();
+            }
+
+            update ();
+            client.activate_connection (item.connection, null, null, null);
+        }
+
+        private void vpn_deactivate_cb () {
+            update_active_connection ();
+            if (active_connection == null) {
+                return;
+            }
+
+            client.deactivate_connection (active_connection);
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Widgets/WifiInterface.vala'
--- src/Widgets/WifiInterface.vala	2016-07-03 17:45:10 +0000
+++ src/Widgets/WifiInterface.vala	2016-07-26 21:06:49 +0000
@@ -27,16 +27,16 @@
         protected Gtk.Box hotspot_mode_box;
         protected Gtk.Box? connected_box = null;
         protected Gtk.Revealer top_revealer;
-        protected Gtk.Button disconnect_btn;
-        protected Gtk.Button settings_btn;
-        protected Gtk.Button hidden_btn;
+        protected Gtk.Button? disconnect_btn;
+        protected Gtk.Button? settings_btn;
+        protected Gtk.Button? hidden_btn;
         protected Gtk.ToggleButton info_btn;
         protected Gtk.Popover popover;
 
-        public WifiInterface (NM.Client nm_client, NM.RemoteSettings settings, NM.Device _device) {
-            info_box = new InfoBox.from_device (_device);
+        public WifiInterface (NM.Client nm_client, NM.RemoteSettings settings, NM.Device device) {
+            this.init (device);
+
             info_box.margin = 12;
-            this.init (_device, info_box);
 
             popover = new Gtk.Popover (info_btn);
             popover.position = Gtk.PositionType.BOTTOM;
@@ -151,9 +151,7 @@
                 }
 
                 disconnect_btn = settings_btn = null;
-            }
-
-            else if (wifi_device.get_active_access_point () != null && active_wifi_item != old_active) { 
+            } else if (wifi_device.get_active_access_point () != null && active_wifi_item != old_active) { 
 
                 if (old_active != null) {
                     old_active.no_show_all = false;
@@ -179,7 +177,7 @@
                     device.disconnect (null);
                 });
 
-                settings_btn = Utils.get_advanced_button_from_device (wifi_device, _("Settings…"));
+                settings_btn = new SettingsButton.from_device (wifi_device, _("Settings…"));
                 settings_btn.sensitive = (device.get_state () == NM.DeviceState.ACTIVATED);
 
                 info_btn = new Gtk.ToggleButton ();

=== modified file 'src/common/Utils.vala'
--- src/common/Utils.vala	2016-06-06 21:45:31 +0000
+++ src/common/Utils.vala	2016-07-26 21:06:49 +0000
@@ -19,6 +19,7 @@
     DISCONNECTED,
     WIRED_UNPLUGGED,
     CONNECTED_WIRED,
+    CONNECTED_VPN,
     CONNECTED_WIFI,
     CONNECTED_WIFI_WEAK,
     CONNECTED_WIFI_OK,
@@ -26,8 +27,10 @@
     CONNECTED_WIFI_EXCELLENT,
     CONNECTING_WIFI,
     CONNECTING_WIRED,
+    CONNECTING_VPN,
     FAILED_WIRED,
-    FAILED_WIFI
+    FAILED_WIFI,
+    FAILED_VPN
 }
 
 namespace Network.Common.Utils {
@@ -41,12 +44,15 @@
         case Network.State.CONNECTED_WIFI_GOOD:
         case Network.State.CONNECTED_WIFI_EXCELLENT:
         case Network.State.CONNECTED_WIRED:
+        case Network.State.CONNECTED_VPN:
             return _("Connected");
         case Network.State.FAILED_WIRED:
         case Network.State.FAILED_WIFI:
+        case Network.State.FAILED_VPN:
             return _("Failed");
         case Network.State.CONNECTING_WIFI:
         case Network.State.CONNECTING_WIRED:
+        case Network.State.CONNECTING_VPN:
             return _("Connecting");
         case Network.State.WIRED_UNPLUGGED:
             return _("Cable unplugged");

=== modified file 'src/common/Widgets/AbstractWifiInterface.vala'
--- src/common/Widgets/AbstractWifiInterface.vala	2016-02-12 17:40:30 +0000
+++ src/common/Widgets/AbstractWifiInterface.vala	2016-07-26 21:06:49 +0000
@@ -172,7 +172,6 @@
 
 			update ();
 		}
-
 	}
 
 	void update_active_ap () {

=== modified file 'src/common/Widgets/NMVisualizer.vala'
--- src/common/Widgets/NMVisualizer.vala	2015-12-19 16:34:47 +0000
+++ src/common/Widgets/NMVisualizer.vala	2016-07-26 21:06:49 +0000
@@ -31,13 +31,15 @@
 		/* Monitor network manager */
 		nm_client = new NM.Client ();
 		nm_settings = new NM.RemoteSettings (null);
+		nm_settings.new_connection.connect (new_connection_cb);
 
 		nm_client.device_added.connect (device_added_cb);
 		nm_client.device_removed.connect (device_removed_cb);
 		
 		var devices = nm_client.get_devices ();
-		for (var i = 0; i < devices.length; i++)
+		for (var i = 0; i < devices.length; i++) {
 			device_added_cb (devices.get (i));
+		}
 		
 		show_all();
 	}
@@ -45,6 +47,8 @@
 	protected abstract void build_ui ();
 	protected abstract void add_interface (WidgetNMInterface widget_interface);
 	protected abstract void remove_interface (WidgetNMInterface widget_interface);
+	protected abstract void add_connection (NM.RemoteConnection connection);
+	protected abstract void remove_connection (NM.RemoteConnection connection);
 
 	void device_removed_cb (NM.Device device) {
 		foreach (var widget_interface in network_interface) {
@@ -66,8 +70,7 @@
 			var type = iface.get_type ().name ();
 			if (count_type.has_key (type)) {
 				count_type[type] = count_type[type] + 1;
-			}
-			else {
+			} else {
 				count_type[type] = 1;
 			}
 		}
@@ -78,7 +81,21 @@
 		}
 	}
 
+	void new_connection_cb (Object obj) {
+		var connection = (NM.RemoteConnection)obj;
+		connection.removed.connect (() => {
+			remove_connection (connection);
+		});
+
+		add_connection (connection);
+	}
+
 	private void device_added_cb (NM.Device device) {
+		if (device.get_iface ().has_prefix ("vmnet") ||
+			device.get_iface ().has_prefix ("lo")) {
+			return;
+		}
+
 		WidgetNMInterface? widget_interface = null;
 #if PLUG_NETWORK
 		WidgetNMInterface? hotspot_interface = null;
@@ -87,7 +104,7 @@
 		if (device is NM.DeviceWifi) {
 			widget_interface = new WifiInterface (nm_client, nm_settings, device);
 #if PLUG_NETWORK
-			hotspot_interface = new HotspotInterface((WifiInterface)widget_interface);
+			hotspot_interface = new HotspotInterface ((WifiInterface)widget_interface);
 #endif
 
 			debug ("Wifi interface added");
@@ -110,22 +127,18 @@
 		if (hotspot_interface != null) {
 			// Implementation call
 			network_interface.append (hotspot_interface);
-			add_interface(hotspot_interface);
+			add_interface (hotspot_interface);
 			hotspot_interface.notify["state"].connect(update_state);
-
 		}
 #endif
 			
 		update_interfaces_names ();
-
-
-		update_all();
-
-		show_all();
+		update_all ();
+		show_all ();
 	}
 
 	void update_all () {
-		foreach(var inter in network_interface) {
+		foreach (var inter in network_interface) {
 			inter.update ();
 		}
 	}
@@ -140,5 +153,4 @@
 
 		state = next_state;
 	}
-
 }

=== added file 'src/common/Widgets/VPNMenuItem.vala'
--- src/common/Widgets/VPNMenuItem.vala	1970-01-01 00:00:00 +0000
+++ src/common/Widgets/VPNMenuItem.vala	2016-07-26 21:06:49 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class Network.VPNMenuItem : Gtk.ListBoxRow {
+	public signal void user_action();
+	public NM.RemoteConnection? connection;
+
+	public Network.State state { get; set; default = Network.State.DISCONNECTED; }
+
+	Gtk.RadioButton radio_button;
+	Gtk.Spinner spinner;
+	Gtk.Image error_img;
+	Gtk.Button remove_button;
+
+	public VPNMenuItem (NM.RemoteConnection _connection, VPNMenuItem? previous = null) {
+		connection = _connection;
+
+		var main_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+		main_box.margin_start = main_box.margin_end = 6;
+		radio_button = new Gtk.RadioButton(null);
+		if (previous != null) radio_button.set_group (previous.get_group ());
+
+		radio_button.button_release_event.connect ( (b, ev) => {
+			user_action();
+			return false;
+		});
+
+		error_img = new Gtk.Image.from_icon_name ("process-error-symbolic", Gtk.IconSize.MENU);
+		error_img.set_tooltip_text (_("This Virtual Private Network could not be connected to."));
+		
+		spinner = new Gtk.Spinner();
+		spinner.visible = false;
+		spinner.no_show_all = !spinner.visible;
+
+		remove_button = new Gtk.Button.from_icon_name ("user-trash-symbolic", Gtk.IconSize.MENU);
+		remove_button.get_style_context ().add_class ("flat");
+		remove_button.clicked.connect (() => {
+			connection.delete (null);
+		});
+
+		main_box.pack_start (radio_button, true, true);
+		main_box.pack_start (spinner, false, false);
+		main_box.pack_start (error_img, false, false);
+		main_box.pack_start (remove_button, false, false);
+
+		notify["state"].connect (update);
+		radio_button.notify["active"].connect (update);
+		this.add (main_box);
+		this.get_style_context ().add_class ("menuitem");
+
+		connection.changed.connect (update);
+		update ();
+	}
+
+	/**
+	 * Only used for an item which is not displayed: hacky way to have no radio button selected.
+	 **/
+	public VPNMenuItem.blank () {
+		radio_button = new Gtk.RadioButton(null);
+	}
+
+	unowned SList get_group () {
+		return radio_button.get_group();
+	}
+
+	public void set_active (bool active) {
+		radio_button.set_active (active);
+	}	
+
+	private void update () {
+		radio_button.label = connection.get_id ();
+
+		switch (state) {
+		case State.FAILED_VPN:
+			show_item(error_img);
+			break;
+		case State.CONNECTING_VPN:
+			show_item(spinner);
+			break;
+		default:
+			hide_icons ();
+			break;
+		}
+	}
+
+	public void hide_icons (bool show_remove_button = true) {
+#if PLUG_NETWORK	
+		hide_item (error_img);
+		hide_item (spinner);
+
+		if (!show_remove_button) {
+			hide_item (remove_button);
+		}
+#endif		
+	}
+
+	void show_item(Gtk.Widget w) {
+		w.visible = true;
+		w.no_show_all = !w.visible;
+	}
+
+	void hide_item(Gtk.Widget w) {
+		w.visible = false;
+		w.no_show_all = !w.visible;
+		w.hide();
+	}	
+}
\ No newline at end of file

=== modified file 'src/common/Widgets/WifiMenuItem.vala'
--- src/common/Widgets/WifiMenuItem.vala	2015-08-07 12:58:10 +0000
+++ src/common/Widgets/WifiMenuItem.vala	2016-07-26 21:06:49 +0000
@@ -24,7 +24,7 @@
 		}
 	}
 
-	public Network.State state { get; set; default=Network.State.DISCONNECTED; }
+	public Network.State state { get; set; default = Network.State.DISCONNECTED; }
 
 	public uint8 strength {
 		get {
@@ -95,6 +95,8 @@
 		radio_button.notify["active"].connect (update);
 		this.add (main_box);
 		this.get_style_context ().add_class ("menuitem");
+
+		update ();
 	}
 
 	/**
@@ -168,7 +170,7 @@
 		show_icons = false;
 		hide_item (error_img);
 		hide_item (lock_img);
-		hide_item (img_strength);			
+		hide_item (img_strength);
 #endif		
 	}
 
@@ -208,7 +210,5 @@
 
 		return _ap.length() > 0;
 	}
-
-
 }