systemadm: consider units with a job live

diff --git a/99-systemd.rules b/99-systemd.rules
index c5c330f9361cff2dda8534b62a5ade874443fa8a..e88f10a6edb0138a3f75aaabdf4b8a40099b2969 100644 (file)
--- a/99-systemd.rules
+++ b/99-systemd.rules
@@ -22,7 +22,7 @@ KERNEL=="ttyS*", ENV{SYSTEMD_EXPOSE}="1"
 
 SUBSYSTEM=="block", ENV{SYSTEMD_EXPOSE}="1"
 
-# We need a hardware independant way to identify network devices. We
+# We need a hardware independent way to identify network devices. We
 # use the /sys/subsystem path for this. Current vanilla kernels don't
 # actually support that hierarchy right now, however upcoming kernels
 # will. HAL and udev internally support /sys/subsystem already, hence

diff --git a/systemadm.vala b/systemadm.vala
index d4b760ad1f0e7cb70b6e621077dd941947170ad1..92ee503b1178e6df31f2dc363e48d33fb0ee0b0a 100644 (file)
--- a/systemadm.vala
+++ b/systemadm.vala
@@ -633,9 +633,9 @@ public class MainWindow : Window {
         }
 
         public bool unit_filter(TreeModel model, TreeIter iter) {
-                string id, active_state;
+                string id, active_state, job;
 
-                model.get(iter, 0, out id, 3, out active_state);
+                model.get(iter, 0, out id, 3, out active_state, 5, out job);
 
                 if (id == null)
                         return false;
@@ -646,7 +646,7 @@ public class MainWindow : Window {
                                 return true;
 
                         case 1:
-                                return active_state != "inactive";
+                                return active_state != "inactive" || job != "";
 
                         case 2:
                                 return id.has_suffix(".service");