diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/ask-password-agent.vala | 12 |
3 files changed, 12 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 5f11e4fb7a..aa4798d83e 100644 --- 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=libnotify \ -g systemd_ask_password_agent_LDADD = \ diff --git a/configure.ac b/configure.ac index 334b1e263c..e3c1fdde0f 100644 --- 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 - 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) diff --git a/src/ask-password-agent.vala b/src/ask-password-agent.vala index 5355bb4694..1523e2e3be 100644 --- 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 Notify; [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"); - set_title("System Password Agent"); + set_title("System Password"); 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(); @@ -179,6 +180,12 @@ public class MyStatusIcon : StatusIcon { 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; } @@ -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"); + Notify.init("Password Agent"); MyStatusIcon i = new MyStatusIcon(); Gtk.main(); |