From 5c273f855630bf54f6ebe95ea8b45c8abe2ffff6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 15 Nov 2010 19:54:57 +0100 Subject: [PATCH] build-sys: fix building against libnotify 0.7 Here are two patches I needed to get systemd to build against the current libnotify and vala releases. --- configure.ac | 4 ++-- src/gnome-ask-password-agent.vala | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 5c6379c2b..b37e9942e 100644 --- a/configure.ac +++ b/configure.ac @@ -256,12 +256,12 @@ if test "$have_gtk" = "yes"; then AC_SUBST(DBUSGLIB_CFLAGS) AC_SUBST(DBUSGLIB_LIBS) - PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ]) + PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ]) AC_SUBST(LIBNOTIFY_CFLAGS) AC_SUBST(LIBNOTIFY_LIBS) fi -AM_PROG_VALAC([0.9]) +AM_PROG_VALAC([0.11]) 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 1523e2e3b..6cab6f96a 100644 --- a/src/gnome-ask-password-agent.vala +++ b/src/gnome-ask-password-agent.vala @@ -38,8 +38,8 @@ public class PasswordDialog : Dialog { set_default_response(ResponseType.OK); set_icon_name(icon); - add_button(STOCK_CANCEL, ResponseType.CANCEL); - add_button(STOCK_OK, ResponseType.OK); + add_button(Stock.CANCEL, ResponseType.CANCEL); + add_button(Stock.OK, ResponseType.OK); Container content = (Container) get_content_area(); @@ -181,8 +181,7 @@ public class MyStatusIcon : StatusIcon { set_visible(true); - Notification n = new Notification(title, message, icon, null); - n.attach_to_status_icon(this); + Notification n = new Notification(title, message, icon); n.set_timeout(5000); n.show(); @@ -226,7 +225,7 @@ public class MyStatusIcon : StatusIcon { OutputStream stream = new UnixOutputStream(to_process, true); - stream.write(password, password.length, null); + stream.write(password.data, null); } } -- 2.30.2