Commit d0ef2204 authored by Kay Sievers's avatar Kay Sievers

gnome-ask-password-agent: also support libnotify < 0.7 for now

parent 0c8744cc
...@@ -962,7 +962,12 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \ ...@@ -962,7 +962,12 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
--pkg=gtk+-2.0 \ --pkg=gtk+-2.0 \
--pkg=linux \ --pkg=linux \
--pkg=gio-unix-2.0 \ --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 -g
systemd_gnome_ask_password_agent_LDADD = \ systemd_gnome_ask_password_agent_LDADD = \
......
...@@ -259,12 +259,16 @@ if test "$have_gtk" = "yes"; then ...@@ -259,12 +259,16 @@ if test "$have_gtk" = "yes"; then
AC_SUBST(DBUSGLIB_CFLAGS) AC_SUBST(DBUSGLIB_CFLAGS)
AC_SUBST(DBUSGLIB_LIBS) 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_CFLAGS)
AC_SUBST(LIBNOTIFY_LIBS) AC_SUBST(LIBNOTIFY_LIBS)
fi fi
AM_PROG_VALAC([0.11]) AM_PROG_VALAC([0.10])
AC_SUBST(VAPIDIR) AC_SUBST(VAPIDIR)
AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x) AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
......
...@@ -38,8 +38,13 @@ public class PasswordDialog : Dialog { ...@@ -38,8 +38,13 @@ public class PasswordDialog : Dialog {
set_default_response(ResponseType.OK); set_default_response(ResponseType.OK);
set_icon_name(icon); set_icon_name(icon);
#if LIBNOTIFY07
add_button(Stock.CANCEL, ResponseType.CANCEL); add_button(Stock.CANCEL, ResponseType.CANCEL);
add_button(Stock.OK, ResponseType.OK); 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(); Container content = (Container) get_content_area();
...@@ -181,7 +186,12 @@ public class MyStatusIcon : StatusIcon { ...@@ -181,7 +186,12 @@ public class MyStatusIcon : StatusIcon {
set_visible(true); set_visible(true);
#if LIBNOTIFY07
Notification n = new Notification(title, message, icon); 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.set_timeout(5000);
n.show(); n.show();
...@@ -225,7 +235,11 @@ public class MyStatusIcon : StatusIcon { ...@@ -225,7 +235,11 @@ public class MyStatusIcon : StatusIcon {
OutputStream stream = new UnixOutputStream(to_process, true); OutputStream stream = new UnixOutputStream(to_process, true);
#if LIBNOTIFY07
stream.write(password.data, null); stream.write(password.data, null);
#else
stream.write(password, password.length, null);
#endif
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment