diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2010-11-26 17:59:53 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2010-11-26 17:59:53 +0100 |
| commit | d0ef2204b4256189afc2188f0765338d616ca757 (patch) | |
| tree | 01dfee9ec3e2e76b41029be42597742714bd1ce8 | |
| parent | 0c8744ccde16e0c55ab76c19ce788fe7655a407c (diff) | |
gnome-ask-password-agent: also support libnotify < 0.7 for now
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/gnome-ask-password-agent.vala | 14 |
3 files changed, 26 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 471954bf68..baf82714b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -962,7 +962,12 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \ --pkg=gtk+-2.0 \ --pkg=linux \ --pkg=gio-unix-2.0 \ - --pkg=libnotify \ + --pkg=libnotify +if LIBNOTIFY07 +systemd_gnome_ask_password_agent_VALAFLAGS += \ + -D LIBNOTIFY07 +endif +systemd_gnome_ask_password_agent_VALAFLAGS += \ -g systemd_gnome_ask_password_agent_LDADD = \ diff --git a/configure.ac b/configure.ac index 5a6f3c7d6e..dfbce11ad3 100644 --- a/configure.ac +++ b/configure.ac @@ -259,12 +259,16 @@ if test "$have_gtk" = "yes"; then AC_SUBST(DBUSGLIB_CFLAGS) AC_SUBST(DBUSGLIB_LIBS) - PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ]) + PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ], + [ libnotify07=yes ], + [ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ]) ] + ) + AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ]) AC_SUBST(LIBNOTIFY_CFLAGS) AC_SUBST(LIBNOTIFY_LIBS) fi -AM_PROG_VALAC([0.11]) +AM_PROG_VALAC([0.10]) AC_SUBST(VAPIDIR) AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x) diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala index 6cab6f96a7..61bbba0f7c 100644 --- a/src/gnome-ask-password-agent.vala +++ b/src/gnome-ask-password-agent.vala @@ -38,8 +38,13 @@ public class PasswordDialog : Dialog { set_default_response(ResponseType.OK); set_icon_name(icon); +#if LIBNOTIFY07 add_button(Stock.CANCEL, ResponseType.CANCEL); add_button(Stock.OK, ResponseType.OK); +#else + add_button(STOCK_CANCEL, ResponseType.CANCEL); + add_button(STOCK_OK, ResponseType.OK); +#endif Container content = (Container) get_content_area(); @@ -181,7 +186,12 @@ public class MyStatusIcon : StatusIcon { set_visible(true); +#if LIBNOTIFY07 Notification n = new Notification(title, message, icon); +#else + Notification n = new Notification(title, message, icon, null); + n.attach_to_status_icon(this); +#endif n.set_timeout(5000); n.show(); @@ -225,7 +235,11 @@ public class MyStatusIcon : StatusIcon { OutputStream stream = new UnixOutputStream(to_process, true); +#if LIBNOTIFY07 stream.write(password.data, null); +#else + stream.write(password, password.length, null); +#endif } } |