From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 20 Nov 2010 08:35:57 +0000 (+0100)
Subject: Revert upstream change which requires libnotify 0.7
X-Git-Tag: 16-1~32
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10edb11620f8e0643eaea67642f0e0e50e35be9b;p=systemd

Revert upstream change which requires libnotify 0.7
---

diff --git a/configure.ac b/configure.ac
index 247806d7..e39bb157 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 >= 0.7.0 ])
+        PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
         AC_SUBST(LIBNOTIFY_CFLAGS)
         AC_SUBST(LIBNOTIFY_LIBS)
 fi
 
-AM_PROG_VALAC([0.11])
+AM_PROG_VALAC([0.9])
 AC_SUBST(VAPIDIR)
 AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
 
diff --git a/debian/changelog b/debian/changelog
index f80b7612..b1bcca04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 systemd (13-1) experimental; urgency=low
 
+  [ Tollef Fog Heen ]
   * New upstream version, thanks a lot to Michael Biebl for help with
     preparing this version.
   * Add libaudit-dev to build-depends
 
+  [ Michael Biebl ]
+  * Revert upstream change which requires libnotify 0.7 (not yet available in
+    Debian).
+
  -- Tollef Fog Heen <tfheen@debian.org>  Sat, 20 Nov 2010 09:28:01 +0100
 
 systemd (11-2) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index b0ce0443..63bfa6d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- --with-rootdir= --with-udevrulesdir=/lib/udev/rules.d --with-gtk
+	dh $@ --parallel --with autoreconf
 
 override_dh_install:
 	rm debian/tmp/usr/share/doc/systemd/LICENSE
diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala
index 6cab6f96..1523e2e3 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,7 +181,8 @@ public class MyStatusIcon : StatusIcon {
 
                 set_visible(true);
 
-                Notification n = new Notification(title, message, icon);
+                Notification n = new Notification(title, message, icon, null);
+                n.attach_to_status_icon(this);
                 n.set_timeout(5000);
                 n.show();
 
@@ -225,7 +226,7 @@ public class MyStatusIcon : StatusIcon {
 
                 OutputStream stream = new UnixOutputStream(to_process, true);
 
-                stream.write(password.data, null);
+                stream.write(password, password.length, null);
         }
 }