systemadm: consider units with a job live
authorLennart Poettering <lennart@poettering.net>
Sun, 16 May 2010 00:37:59 +0000 (02:37 +0200)
committerLennart Poettering <lennart@poettering.net>
Sun, 16 May 2010 00:37:59 +0000 (02:37 +0200)
99-systemd.rules
systemadm.vala

index c5c330f..e88f10a 100644 (file)
@@ -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
index d4b760a..92ee503 100644 (file)
@@ -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");