[systemd-commits] 2 commits - src/gnome-ask-password-agent.vala src/systemadm.vala

[Zbigniew Jędrzejewski-Szmek]

 src/gnome-ask-password-agent.vala |    5 +++--
 src/systemadm.vala                |   22 ++++++++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 7245ad7bd9e5caafafe9162f54fa527859eaf6ca
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sun Jul 14 00:44:05 2013 -0400

    gnome-ask-password-agent: report GLib.Error only to stderr
    
    When a GLib.Error happens, it is likely that showing a message box
    would fail too.
    
    Solution copied from systemadm and
    https://bugzilla.redhat.com/show_bug.cgi?id=716663.
    
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=716369

diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala
index 5df27ee..0f6284d 100644
--- a/src/gnome-ask-password-agent.vala
+++ b/src/gnome-ask-password-agent.vala
@@ -256,9 +256,10 @@ int main(string[] args) {
 
                 MyStatusIcon i = new MyStatusIcon();
                 Gtk.main();
-
-        } catch (GLib.Error e) {
+        } catch (IOError e) {
                 show_error(e.message);
+        } catch (GLib.Error e) {
+                Posix.stderr.printf("%s\n", e.message);
         }
 
         return 0;

commit 85b14a8967f290c64cb214346966411653ec9e1a
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sun Jul 14 00:23:41 2013 -0400

    systemadm: filter on slices and scopes too

diff --git a/src/systemadm.vala b/src/systemadm.vala
index 553633b..3daf1da 100644
--- a/src/systemadm.vala
+++ b/src/systemadm.vala
@@ -145,6 +145,8 @@ public class MainWindow : Window {
 
                 unit_type_combo_box.append_text("All unit types");
                 unit_type_combo_box.append_text("Targets");
+                unit_type_combo_box.append_text("Slices");
+                unit_type_combo_box.append_text("Scopes");
                 unit_type_combo_box.append_text("Services");
                 unit_type_combo_box.append_text("Devices");
                 unit_type_combo_box.append_text("Mounts");
@@ -933,22 +935,26 @@ public class MainWindow : Window {
                 case 1:
                         return id.has_suffix(".target");
                 case 2:
-                        return id.has_suffix(".service");
+                        return id.has_suffix(".slice");
                 case 3:
-                        return id.has_suffix(".device");
+                        return id.has_suffix(".scope");
                 case 4:
-                        return id.has_suffix(".mount");
+                        return id.has_suffix(".service");
                 case 5:
-                        return id.has_suffix(".automount");
+                        return id.has_suffix(".device");
                 case 6:
-                        return id.has_suffix(".swap");
+                        return id.has_suffix(".mount");
                 case 7:
-                        return id.has_suffix(".socket");
+                        return id.has_suffix(".automount");
                 case 8:
-                        return id.has_suffix(".path");
+                        return id.has_suffix(".swap");
                 case 9:
-                        return id.has_suffix(".timer");
+                        return id.has_suffix(".socket");
                 case 10:
+                        return id.has_suffix(".path");
+                case 11:
+                        return id.has_suffix(".timer");
+                case 12:
                         return id.has_suffix(".snapshot");
                 default:
                         assert(false);