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

[Danielle Foré]

Show firewall status in the sidebar

[David Hewitt (davidmhewitt)]

It's a shame that you have to be root to determine whether the firewall is running or not. I think moving to firewalld instead of UFW will fix that. Would be nice to have the status indicator always visible instead of just after you'd put an admin password in.

All looks good though.

review: Approve (code, function)

[Danielle Foré (danrabbit)]

Definitely agree!

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2017-02-27 19:50:25 +0000
+++ src/Plug.vala	2017-02-27 20:49:38 +0000
@@ -25,6 +25,7 @@
     public static Plug plug;
     public static Gtk.LockButton lock_button;
     public static Blacklist blacklist;
+    public static FirewallPanel firewall;
 
     public class Plug : Switchboard.Plug {
         Gtk.Grid main_grid;
@@ -109,7 +110,7 @@
 
             tracking = new TrackPanel ();
             var locking = new LockPanel ();
-            var firewall = new FirewallPanel ();
+            firewall = new FirewallPanel ();
 
             stack.add_titled (tracking, "tracking", _("Privacy"));
             stack.add_titled (locking, "locking", _("Locking"));

=== modified file 'src/Views/FirewallPanel.vala'
--- src/Views/FirewallPanel.vala	2017-02-27 19:28:39 +0000
+++ src/Views/FirewallPanel.vala	2017-02-27 20:49:38 +0000
@@ -27,6 +27,7 @@
     private bool loading = false;
     private Gtk.Popover add_popover;
     private Gtk.ToolButton remove_button;
+    public Gtk.Switch status_switch;
 
     private enum Columns {
         ACTION,
@@ -52,7 +53,7 @@
         status_label.hexpand = true;
         status_label.xalign = 0;
 
-        var status_switch = new Gtk.Switch ();
+        status_switch = new Gtk.Switch ();
         status_switch.valign = Gtk.Align.CENTER;
 
         status_switch.notify["active"].connect (() => {

=== modified file 'src/Widgets/ServiceItem.vala'
--- src/Widgets/ServiceItem.vala	2017-02-26 20:21:42 +0000
+++ src/Widgets/ServiceItem.vala	2017-02-27 20:49:38 +0000
@@ -17,6 +17,7 @@
                     break;
             }
             status_label.no_show_all = false;
+            status_label.show ();
             status_label.label = "<span font_size='small'>" + status_label.label + "</span>";
         }
     }

=== modified file 'src/Widgets/ServiceList.vala'
--- src/Widgets/ServiceList.vala	2017-02-27 01:30:20 +0000
+++ src/Widgets/ServiceList.vala	2017-02-27 20:49:38 +0000
@@ -12,5 +12,13 @@
         add (privacy_item);
         add (lock_item);
         add (firewall_item);
+
+        SecurityPrivacy.firewall.status_switch.notify["active"].connect (() => {
+            if (SecurityPrivacy.firewall.status_switch.active) {
+                firewall_item.status = ServiceItem.Status.ENABLED;
+            } else {
+                firewall_item.status = ServiceItem.Status.DISABLED;
+            }
+        });
     }
 }