mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-24 21:34:08 +03:00
gnome-ask-password-agent: also support libnotify < 0.7 for now
This commit is contained in:
parent
0c8744ccde
commit
d0ef2204b4
@ -962,7 +962,12 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
|
||||
--pkg=gtk+-2.0 \
|
||||
--pkg=linux \
|
||||
--pkg=gio-unix-2.0 \
|
||||
--pkg=libnotify \
|
||||
--pkg=libnotify
|
||||
if LIBNOTIFY07
|
||||
systemd_gnome_ask_password_agent_VALAFLAGS += \
|
||||
-D LIBNOTIFY07
|
||||
endif
|
||||
systemd_gnome_ask_password_agent_VALAFLAGS += \
|
||||
-g
|
||||
|
||||
systemd_gnome_ask_password_agent_LDADD = \
|
||||
|
@ -259,12 +259,16 @@ if test "$have_gtk" = "yes"; then
|
||||
AC_SUBST(DBUSGLIB_CFLAGS)
|
||||
AC_SUBST(DBUSGLIB_LIBS)
|
||||
|
||||
PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ])
|
||||
PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ],
|
||||
[ libnotify07=yes ],
|
||||
[ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ]) ]
|
||||
)
|
||||
AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
|
||||
AC_SUBST(LIBNOTIFY_CFLAGS)
|
||||
AC_SUBST(LIBNOTIFY_LIBS)
|
||||
fi
|
||||
|
||||
AM_PROG_VALAC([0.11])
|
||||
AM_PROG_VALAC([0.10])
|
||||
AC_SUBST(VAPIDIR)
|
||||
AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
|
||||
|
||||
|
@ -38,8 +38,13 @@ 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();
|
||||
|
||||
@ -181,7 +186,12 @@ 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();
|
||||
|
||||
@ -225,7 +235,11 @@ public class MyStatusIcon : StatusIcon {
|
||||
|
||||
OutputStream stream = new UnixOutputStream(to_process, true);
|
||||
|
||||
#if LIBNOTIFY07
|
||||
stream.write(password.data, null);
|
||||
#else
|
||||
stream.write(password, password.length, null);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user