diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-31 18:15:27 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-12-31 18:15:27 +0100 |
| commit | bb765041af1ac01b822a08609598d1af901e87f7 (patch) | |
| tree | 8695d80d551e963db8d8a0df47d8f8cf1b3ee3af | |
| parent | c47ac9992f3274597802cde47922bb9809185eaf (diff) | |
gnome-ask-password-agent: require libnotify >= 0.7.0
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/gnome-ask-password-agent.vala | 10 |
4 files changed, 1 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index 515e1ff73c..0d34fb31bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1092,12 +1092,7 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \ --pkg=gtk+-2.0 \ --pkg=linux \ --pkg=gio-unix-2.0 \ - --pkg=libnotify -if LIBNOTIFY07 -systemd_gnome_ask_password_agent_VALAFLAGS += \ - -D LIBNOTIFY07 -endif -systemd_gnome_ask_password_agent_VALAFLAGS += \ + --pkg=libnotify \ -g systemd_gnome_ask_password_agent_LDADD = \ @@ -72,8 +72,6 @@ Features: * don't set $HOME in services unless requested -* remove hacks in vala code and require libnotify 0.7 - * hide PAM/TCPWrap options in fragment parser when compile time disabled * when we automatically restart a service, ensure we retsart its rdeps, too. diff --git a/configure.ac b/configure.ac index ff9fe88908..1f3bdc502a 100644 --- a/configure.ac +++ b/configure.ac @@ -359,12 +359,9 @@ AM_CONDITIONAL(HAVE_GTK, [test "$have_gtk" = "yes"]) if test "$have_gtk" = "yes"; then PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ]) - PKG_CHECK_EXISTS([ libnotify >= 0.7.0 ], [ libnotify07=yes ]) - AC_SUBST(LIBNOTIFY_CFLAGS) AC_SUBST(LIBNOTIFY_LIBS) fi -AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ]) AM_PROG_VALAC([0.10]) AC_SUBST(VAPIDIR) diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala index c31c07e3db..e23aedbfee 100644 --- a/src/gnome-ask-password-agent.vala +++ b/src/gnome-ask-password-agent.vala @@ -37,13 +37,8 @@ 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(); @@ -190,12 +185,7 @@ 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(); |