Merge lp:~elementary-pantheon/switchboard-plug-security-privacy/fix-regression-firewall into lp:~elementary-apps/switchboard-plug-security-privacy/trunk

[Danielle Foré]

Plug.vala: Get permission before doing anything else. Fixes regression in firewall page

Fixes a regression introduced in 295 that makes it so you can't ever auth into the firewall page

[lp:~elementary-pantheon/switchboard-plug-security-privacy/fix-regression-firewall]

302. By Danielle Foré on 2017-02-27

fix an oops

[David Hewitt (davidmhewitt)]

Fixes the regression

review: Approve

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2017-02-26 20:21:42 +0000
+++ src/Plug.vala	2017-02-27 19:50:43 +0000
@@ -62,26 +62,59 @@
                 return;
             }
 
-            var label = new Gtk.Label (_("Some settings require administrator rights to be changed"));
-
-            var infobar = new Gtk.InfoBar ();
-            infobar.message_type = Gtk.MessageType.INFO;
-            infobar.no_show_all = true;
-            infobar.get_content_area ().add (label);
+            stack = new Gtk.Stack ();
+
+            var grid = new Gtk.Grid ();
+            grid.attach (stack, 0, 3, 1, 1);
+
+            try {
+                var permission = new Polkit.Permission.sync ("org.pantheon.security-privacy", Polkit.UnixProcess.new (Posix.getpid ()));
+
+                var label = new Gtk.Label (_("Some settings require administrator rights to be changed"));
+
+                var infobar = new Gtk.InfoBar ();
+                infobar.message_type = Gtk.MessageType.INFO;
+                infobar.no_show_all = true;
+                infobar.get_content_area ().add (label);
+
+                grid.attach (infobar, 0, 0, 1, 1);
+
+                lock_button = new Gtk.LockButton (permission);
+
+                var area = infobar.get_action_area () as Gtk.Container;
+                area.add (lock_button);
+
+                stack.notify["visible-child-name"].connect (() => {
+                    if (permission.allowed == false && stack.visible_child_name == "firewall") {
+                        infobar.no_show_all = false;
+                        infobar.show_all ();
+                    } else {
+                        infobar.no_show_all = true;
+                        infobar.hide ();
+                    }
+                });
+
+                permission.notify["allowed"].connect (() => {
+                    if (permission.allowed == false && stack.visible_child_name == "firewall") {
+                        infobar.no_show_all = false;
+                        infobar.show_all ();
+                    } else {
+                        infobar.no_show_all = true;
+                        infobar.hide ();
+                    }
+                });
+            } catch (Error e) {
+                critical (e.message);
+            }
 
             tracking = new TrackPanel ();
             var locking = new LockPanel ();
             var firewall = new FirewallPanel ();
 
-            stack = new Gtk.Stack ();
             stack.add_titled (tracking, "tracking", _("Privacy"));
             stack.add_titled (locking, "locking", _("Locking"));
             stack.add_titled (firewall, "firewall", _("Firewall"));
 
-            var grid = new Gtk.Grid ();
-            grid.attach (infobar, 0, 0, 1, 1);
-            grid.attach (stack, 0, 3, 1, 1);
-
             var service_list = new ServiceList ();
 
             var paned = new Gtk.Paned (Gtk.Orientation.HORIZONTAL);
@@ -96,37 +129,6 @@
                 var title = ((ServiceItem)row).title;
                 stack.visible_child_name = title;
             });
-
-            try {
-                var permission = new Polkit.Permission.sync ("org.pantheon.security-privacy", Polkit.UnixProcess.new (Posix.getpid ()));
-
-                lock_button = new Gtk.LockButton (permission);
-
-                var area = infobar.get_action_area () as Gtk.Container;
-                area.add (lock_button);
-
-                stack.notify["visible-child-name"].connect (() => {
-                    if (permission.allowed == false && stack.visible_child_name == "firewall") {
-                        infobar.no_show_all = false;
-                        infobar.show_all ();
-                    } else {
-                        infobar.no_show_all = true;
-                        infobar.hide ();
-                    }
-                });
-
-                permission.notify["allowed"].connect (() => {
-                    if (permission.allowed == false && stack.visible_child_name == "firewall") {
-                        infobar.no_show_all = false;
-                        infobar.show_all ();
-                    } else {
-                        infobar.no_show_all = true;
-                        infobar.hide ();
-                    }
-                });
-            } catch (Error e) {
-                critical (e.message);
-            }
         }
 
         public override void hidden () {