1
0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00

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

This commit is contained in:
Kay Sievers 2011-12-31 18:15:27 +01:00
parent c47ac9992f
commit bb765041af
4 changed files with 1 additions and 21 deletions

View File

@ -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 = \

2
TODO
View File

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

View File

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

View File

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