chiark / gitweb /
gnome-ask-password-agent: fix path to watch
authorLennart Poettering <lennart@poettering.net>
Fri, 11 Mar 2011 00:51:45 +0000 (01:51 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 11 Mar 2011 00:51:45 +0000 (01:51 +0100)
src/gnome-ask-password-agent.vala

index 1bc97f54837156c9d2359bb3c35a7876bdfe1e9a..75cfabfabbcb33ac74900c4697a4bd316ba469be 100644 (file)
@@ -89,9 +89,9 @@ public class MyStatusIcon : StatusIcon {
 
         public MyStatusIcon() throws GLib.Error {
                 GLib.Object(icon_name : "dialog-password");
 
         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/.run/systemd/ask-password/");
+                directory = File.new_for_path("/var/run/systemd/ask-password/");
                 file_monitor = directory.monitor_directory(0);
                 file_monitor.changed.connect(file_monitor_changed);
 
                 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);
 
                 if (current == null)
                         set_visible(false);
-
         }
 
         bool load_password() throws GLib.Error {
         }
 
         bool load_password() throws GLib.Error {
@@ -179,6 +178,7 @@ public class MyStatusIcon : StatusIcon {
                 } catch (GLib.Error e) {
                         message = "Please Enter System Password!";
                 }
                 } catch (GLib.Error e) {
                         message = "Please Enter System Password!";
                 }
+
                 set_tooltip_text(message);
 
                 try {
                 set_tooltip_text(message);
 
                 try {
@@ -239,12 +239,7 @@ public class MyStatusIcon : StatusIcon {
                                         null);
 
                         OutputStream stream = new UnixOutputStream(to_process, true);
                                         null);
 
                         OutputStream stream = new UnixOutputStream(to_process, true);
-
-#if LIBNOTIFY07
                         stream.write(password.data, null);
                         stream.write(password.data, null);
-#else
-                        stream.write(password, password.length, null);
-#endif
                 } catch (Error e) {
                         show_error(e.message);
                 }
                 } catch (Error e) {
                         show_error(e.message);
                 }