summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2010-11-17 13:19:10 +0100
committerKay Sievers <kay.sievers@vrfy.org>2010-11-17 13:19:10 +0100
commit230e5a3fb08c5784c451e611a6987adafac1250e (patch)
tree5956ce7056e0acd04e181cf866a1580b70eef8f1
parentafe635e71838c9e62e25a928cbcefc343744dda5 (diff)
downloadsystemd-230e5a3fb08c5784c451e611a6987adafac1250e.tar.gz
Revert "update TODO"
This reverts commit afe635e71838c9e62e25a928cbcefc343744dda5. Oops, libnotify should not have been in here.
-rw-r--r--TODO9
-rw-r--r--configure.ac4
-rw-r--r--src/gnome-ask-password-agent.vala9
3 files changed, 6 insertions, 16 deletions
diff --git a/TODO b/TODO
index f3788c5268..98d37c0dad 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,3 @@
-* leaving file open on mounted non-root filesystems breaks shutdown
- systemd is confused if something goes:
- mounted→unmounting→mounted
-
-* /lib/systemd/systemd-user-sessions stop seems to leave
- processes behind
-
-* SIGQUIT on shutdown? avahi-daemon[202]: Got SIGQUIT, quitting.
-
* check if bind mounts work:
https://bugzilla.novell.com/show_bug.cgi?id=652762
diff --git a/configure.ac b/configure.ac
index d0838516e1..d29e2d8a3b 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 1523e2e3be..6cab6f96a7 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);
}
}