ask-password: popup notification when we ask for a password

diff --git a/Makefile.am b/Makefile.am
index 5f11e4fb7a8b1c01b5d7b2db1e440f56b35191a8..aa4798d83e1fec4be72933782dd0506d9a9221cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -736,6 +736,7 @@ systemd_ask_password_agent_VALAFLAGS = \
        --pkg=gtk+-2.0 \
        --pkg=linux \
        --pkg=gio-unix-2.0 \
        --pkg=gtk+-2.0 \
        --pkg=linux \
        --pkg=gio-unix-2.0 \

+       --pkg=libnotify \

        -g
 
 systemd_ask_password_agent_LDADD = \
        -g
 
 systemd_ask_password_agent_LDADD = \

diff --git a/configure.ac b/configure.ac
index 334b1e263c5612e903b3347376de87548ffd2bf3..e3c1fdde0f89f7d5edf33e82a67c07c7c4de4f92 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -226,7 +226,7 @@ AC_SUBST(AUDIT_LIBS)
 have_gtk=no
 AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
 if test "x$enable_gtk" != "xno"; then
 have_gtk=no
 AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
 if test "x$enable_gtk" != "xno"; then

-        PKG_CHECK_MODULES(GTK, [ gtk+-2.0 gio-unix-2.0 ],
+        PKG_CHECK_MODULES(GTK, [ gtk+-2.0 gio-unix-2.0 libnotify ],

                 [AC_DEFINE(HAVE_GTK, 1, [Define if GTK is available]) have_gtk=yes], have_gtk=no)
         AC_SUBST(GTK_CFLAGS)
         AC_SUBST(GTK_LIBS)
                 [AC_DEFINE(HAVE_GTK, 1, [Define if GTK is available]) have_gtk=yes], have_gtk=no)
         AC_SUBST(GTK_CFLAGS)
         AC_SUBST(GTK_LIBS)

diff --git a/src/ask-password-agent.vala b/src/ask-password-agent.vala
index 5355bb469411c90e3bcbf17fe060cc32799fc91e..1523e2e3bef16d805a6845d795085399a5c294c4 100644 (file)
--- a/src/ask-password-agent.vala
+++ b/src/ask-password-agent.vala
@@ -22,6 +22,7 @@ using GLib;
 using DBus;
 using Linux;
 using Posix;
 using DBus;
 using Linux;
 using Posix;

+using Notify;

 
 [CCode (cheader_filename = "time.h")]
 extern int clock_gettime(int id, out timespec ts);
 
 [CCode (cheader_filename = "time.h")]
 extern int clock_gettime(int id, out timespec ts);


@@ -84,7 +85,7 @@ 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 Agent");
+                set_title("System Password");

 
                 directory = File.new_for_path("/dev/.systemd/ask-password/");
                 file_monitor = directory.monitor_directory(0);
 
                 directory = File.new_for_path("/dev/.systemd/ask-password/");
                 file_monitor = directory.monitor_directory(0);


@@ -138,7 +139,7 @@ public class MyStatusIcon : StatusIcon {
 
         }
 
 
         }
 

-        bool load_password()  {
+        bool load_password() throws GLib.Error {

 
                 KeyFile key_file = new KeyFile();
 
 
                 KeyFile key_file = new KeyFile();
 


@@ -179,6 +180,12 @@ public class MyStatusIcon : StatusIcon {
                 set_from_icon_name(icon);
 
                 set_visible(true);
                 set_from_icon_name(icon);
 
                 set_visible(true);

+
+                Notification n = new Notification(title, message, icon, null);
+                n.attach_to_status_icon(this);
+                n.set_timeout(5000);
+                n.show();
+

                 return true;
         }
 
                 return true;
         }
 


@@ -236,6 +243,7 @@ void show_error(string e) {
 int main(string[] args) {
         try {
                 Gtk.init_with_args(ref args, "[OPTION...]", entries, "systemd-ask-password-agent");
 int main(string[] args) {
         try {
                 Gtk.init_with_args(ref args, "[OPTION...]", entries, "systemd-ask-password-agent");

+                Notify.init("Password Agent");

 
                 MyStatusIcon i = new MyStatusIcon();
                 Gtk.main();
 
                 MyStatusIcon i = new MyStatusIcon();
                 Gtk.main();