[Debian-eeepc-devel] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 40eab078e10f31316ab00407caa90067c6ebd7f0

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit d3fb8d02bd4c56f42392889ff852d18073757970
Author: Damyan Ivanov <dmn at debian.org>
Date:   Fri Aug 22 17:36:55 2008 +0300

    suspend.sh: use detect_x_display for X detection

diff --git a/actions/suspend.sh b/actions/suspend.sh
index f4797d7..ec715b1 100755
--- a/actions/suspend.sh
+++ b/actions/suspend.sh
@@ -9,15 +9,13 @@ fi
 
 [ -r /etc/default/eeepc-acpi-scripts ] && . /etc/default/eeepc-acpi-scripts
 
+. /usr/share/eeepc-acpi-scripts/functions.sh
+
 if [ "$LOCK_SCREEN_ON_SUSPEND" = "yes" ]; then
     # activate screensaver if available
     if [ -S /tmp/.X11-unix/X0 ]; then
-        export DISPLAY=:0
-        user=$(who | sed -n '/ (:0[\.0]*)$\| :0 /{s/ .*//p;q}')
-        home=$(getent passwd $user | cut -d: -f6)
-        XAUTHORITY=$home/.Xauthority
+        detect_x_display
         if [ -f $XAUTHORITY ]; then
-            export XAUTHORITY
             for ss in xscreensaver gnome-screensaver; do
                 [ -x /usr/bin/$ss-command ] \
                     && pidof /usr/bin/$ss > /dev/null \
diff --git a/debian/changelog b/debian/changelog
index 5393516..e9016dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ eeepc-acpi-scripts (1.0.5) unstable; urgency=low
   * rules: simplify a bit using PKG and TMP variables
   * move X detection to functions.sh/detect_x_display()
   * detect_x_display: support users using 'startx' after console login
+  * suspend.sh: use detect_x_display for X detection
 
  -- Damyan Ivanov <dmn at debian.org>  Fri, 22 Aug 2008 17:38:16 +0300
 

-- 
Maintenance of eeepc-acpi-scripts debian package