[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. c43f4bb088bfeb6bc0cd64cdb16bb19e28eb3f38

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit c6801b914eef7eb235ad978803f872969530766f
Author: Raphael Geissert <atomo64 at gmail.com>
Date:   Thu Jan 29 17:35:02 2009 -0600

    Add support for knotify but only use it if aosd_cat is not installed because it is ugly
    
    Signed-off-by: Raphael Geissert <atomo64 at gmail.com>

diff --git a/TODO b/TODO
index 1a45f94..52532bc 100644
--- a/TODO
+++ b/TODO
@@ -12,5 +12,3 @@
 
 * test bluetooth toggling when both the internal adapter and an external
   adapter are present.
-
-* add support for knotify as a notification service
diff --git a/etc/acpi/lib/notify.sh b/etc/acpi/lib/notify.sh
index 2df91f9..882bdd1 100755
--- a/etc/acpi/lib/notify.sh
+++ b/etc/acpi/lib/notify.sh
@@ -34,14 +34,20 @@ notify() {
 	fi
     fi
 
-    if [ -z "$OSD_SHOWN" ]; then
+    if [ -z "$OSD_SHOWN" ] && [ -x /usr/bin/aosd_cat ]; then
 	killall -q aosd_cat
 	if [ -n "$MSG" -a -z "$(echo $MSG | sed 's/.*[0-9]\+//g')" ]; then
 		echo "$MSG%" | aosd_cat -f 0 -u 100 -o 0 -n "$OSD_FONT" &
 	else
 		echo "$MSG" | aosd_cat -n "$OSD_FONT" -f 100 -u 1000 -o 100 &
 	fi
+	OSD_SHOWN=1
     fi
+
+    if [ -z "$OSD_SHOWN" ] && [ -x /usr/bin/dcop ]; then
+	dcop --user "$user" knotify Notify notify "notification" "knotify" "$MSG" "" "" 16 2
+    fi
+
     else
 	echo "$MSG" > /dev/console
     fi

-- 
Maintenance of eeepc-acpi-scripts debian package