X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fgnome-ask-password-agent.vala;h=c31c07e3db0de0f21f4963f543698a0a0cb1f651;hp=84f25497309b97c905851839b9d35371230d556e;hb=ff01d048b4c1455241c894cf7982662c9d28fd34;hpb=26742b3fd8776c6c64e3c1035adc2599ddeb76d1

diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala
index 84f254973..c31c07e3d 100644
--- a/src/gnome-ask-password-agent.vala
+++ b/src/gnome-ask-password-agent.vala
@@ -89,9 +89,9 @@ public class MyStatusIcon : StatusIcon {
 
         public MyStatusIcon() throws GLib.Error {
                 GLib.Object(icon_name : "dialog-password");
-                set_title("System Password");
+                set_title("System Password Request");
 
-                directory = File.new_for_path("/dev/.systemd/ask-password/");
+                directory = File.new_for_path("/run/systemd/ask-password/");
                 file_monitor = directory.monitor_directory(0);
                 file_monitor.changed.connect(file_monitor_changed);
 
@@ -145,7 +145,6 @@ public class MyStatusIcon : StatusIcon {
 
                 if (current == null)
                         set_visible(false);
-
         }
 
         bool load_password() throws GLib.Error {
@@ -166,7 +165,7 @@ public class MyStatusIcon : StatusIcon {
                         if (not_after_as_string.scanf("%llu", out not_after) != 1)
                                 return false;
 
-                        if (not_after < now)
+                        if (not_after > 0 && not_after < now)
                                 return false;
 
                         socket = key_file.get_string("Ask", "Socket");
@@ -179,6 +178,7 @@ public class MyStatusIcon : StatusIcon {
                 } catch (GLib.Error e) {
                         message = "Please Enter System Password!";
                 }
+
                 set_tooltip_text(message);
 
                 try {
@@ -239,8 +239,7 @@ public class MyStatusIcon : StatusIcon {
                                         null);
 
                         OutputStream stream = new UnixOutputStream(to_process, true);
-
-#if LIBNOTIFY07
+#if VALA_0_12
                         stream.write(password.data, null);
 #else
                         stream.write(password, password.length, null);