From c10909e9f954f10b1ed77d579aea4c5c02b87738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 4 Jul 2014 04:33:16 +0200
Subject: [PATCH] dispvm: use tray notification for "Updating default DispVM
 savefile" msg (#877)

---
 ...es-update-dispvm-savefile-with-progress.sh | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/dispvm/qubes-update-dispvm-savefile-with-progress.sh b/dispvm/qubes-update-dispvm-savefile-with-progress.sh
index be271d7a..576ddd7e 100755
--- a/dispvm/qubes-update-dispvm-savefile-with-progress.sh
+++ b/dispvm/qubes-update-dispvm-savefile-with-progress.sh
@@ -4,28 +4,14 @@ line1="<b>Please wait (up to 120s) while the DispVM savefile is being updated.</
 line2="<i><small>This only happens when you have updated the template.</small></i>"
 line3="<i><small>Next time will be much faster.</small></i>"
 
-if type kdialog &> /dev/null; then
-    ref=`kdialog --title="Updating default DispVM savefile" \
-        --progressbar \
-"<center>
-    <font>
-        $line1<br>
-        $line2<br>
-        $line3
-    </font>
-</center>" 0`;
-
-    trap "qdbus $ref close" EXIT
+if [ -n "$KDE_FULL_SESSION" ]; then
+    br="<br/>"
 else
-    pipe=/tmp/qvm-create-default-dvm-$$.progress
-    mkfifo $pipe
-    zenity --progress --pulsate --auto-close --text "$line1\n$line2\n$line3" < $pipe &
-    exec 5>$pipe
-    echo 0 >&5
-    trap "echo 100 >&5" EXIT
+    br="
+"
 fi
-
-#qdbus $ref showCancelButton true;
+notify-send --icon=/usr/share/qubes/icons/qubes.png --expire-time=120000 \
+                   "Updating default DispVM savefile" "$line1$br$line2$br$line3"
 
 ret=0