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

[Adam Bieńkowski]

Fix VPN Info popover not showing.

Fix VPN Info popover not showing and also add missing margin.

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

284. By Adam Bieńkowski on 2016-07-30

More fixes

=== modified file 'src/Widgets/VPNPage.vala'
--- src/Widgets/VPNPage.vala	2016-07-30 15:43:10 +0000
+++ src/Widgets/VPNPage.vala	2016-07-30 21:31:05 +0000
@@ -48,6 +48,7 @@
             control_box.margin_bottom = 12;
 
             vpn_info_box = new VPNInfoBox ();
+            vpn_info_box.margin = 12;
 
             popover = new Gtk.Popover (info_btn);
             popover.position = Gtk.PositionType.BOTTOM;
@@ -161,7 +162,6 @@
                     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;
@@ -169,7 +169,6 @@
                     case NM.VPNConnectionState.ACTIVATED:
                         state = State.CONNECTED_VPN;
                         item = get_item_by_uuid (active_connection.get_uuid ());
-                        item.state = state;
                         sensitive = true;
                         break;
                 }
@@ -177,6 +176,18 @@
                 state = State.DISCONNECTED;
             }
 
+            if (disconnect_btn != null) {
+                disconnect_btn.sensitive = sensitive;
+            }
+
+            if (settings_btn != null) {
+                settings_btn.sensitive = sensitive;
+            }
+
+            if (info_btn != null) {
+                info_btn.sensitive = sensitive;
+            }
+
             if (item == null) {
                 top_revealer.set_reveal_child (false);
                 blank_item.set_active (true);
@@ -185,7 +196,11 @@
                     active_vpn_item.no_show_all = false;
                     active_vpn_item.visible = true;
                     active_vpn_item.state = state;
-                }
+
+                    if (connected_frame != null && connected_frame.get_child () != null) {
+                        connected_frame.get_child ().destroy ();
+                    }                        
+                }            
             } else {
                 top_revealer.set_reveal_child (true);
                 if (connected_frame != null && connected_frame.get_child () != null) {
@@ -193,6 +208,7 @@
                 }
 
                 connected_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+                item.state = state;
                 item.no_show_all = true;
                 item.visible = false;
 
@@ -213,11 +229,12 @@
                 info_btn.image = new Gtk.Image.from_icon_name ("view-more-symbolic", Gtk.IconSize.SMALL_TOOLBAR);
 
                 vpn_info_box.set_connection (item.connection);
+                vpn_info_box.show_all ();
 
                 popover.relative_to = info_btn;
 
                 info_btn.toggled.connect (() => {
-                    popover.visible = info_btn.get_active ();
+                    popover.visible = popover.sensitive = info_btn.get_active ();
                 });
 
                 var button_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
@@ -233,18 +250,6 @@
 
                 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);
@@ -321,6 +326,7 @@
                 return;
             }
 
+            update ();
             client.deactivate_connection (active_connection);
         }
     }