gnome-ask-password-agent: require libnotify >= 0.7.0

diff --git a/Makefile.am b/Makefile.am
index 515e1ff73ccf107f3664b5d08189eca9c79fc00b..0d34fb31bbe05b0942b95fcee563c8cceec514be 100644 (file)
--- 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 = \

diff --git a/TODO b/TODO
index e9ab9de6e7936a35b2407b639ffb9f0b7fe0b92a..cdc014fe5ffb5e53e0cc8ced6fb65bcc307c654f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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 ff9fe88908fd6199c1931dc9983fac0414941016..1f3bdc502a4c3d9836b153bb36107dcaba37461a 100644 (file)
--- 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 c31c07e3db0de0f21f4963f543698a0a0cb1f651..e23aedbfee435e22b1db545a742e4cd091b82920 100644 (file)
--- 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();