shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-25 23:21:33 +03:00
Code

build-sys: fix building against libnotify 0.7

Browse Source 
Here are two patches I needed to get systemd to build against the
current libnotify and vala releases.
This commit is contained in:
Matthias Clasen 2010-11-15 19:54:57 +01:00 committed by Lennart Poettering
parent d8b4dbe6d7
commit 5c273f8556
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -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)

9
src/gnome-ask-password-agent.vala
View File

@ -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);
}
}