From: Marco Zanon <info@marcozanon.com>
Date: Wed, 12 Sep 2012 14:02:44 +0000 (+0000)
Subject: Improved logging on server connection error.
X-Git-Tag: SVN-to-Git~3
X-Git-Url: https://gitweb.marcozanon.com/?a=commitdiff_plain;h=1e39a207cc02233d12ad6b70c6e9f07b03c2fefc;p=single_click_remote_help

Improved logging on server connection error.
---

diff --git a/0.x/configuration.sample b/0.x/configuration.sample
index bfafbf5..4648eab 100644
--- a/0.x/configuration.sample
+++ b/0.x/configuration.sample
@@ -14,5 +14,6 @@ CONNECTIONS[0]="__YOUR_LABEL_HERE__|__YOUR_VNC_SERVER_COMMAND_ARGUMENTS_HERE__"
 CONNECTIONS[1]="__YOUR_LABEL_HERE__|__YOUR_VNC_SERVER_COMMAND_ARGUMENTS_HERE__"
 CLIENT_CONNECTED_MESSAGE="__YOUR_TEXT_HERE__"
 CLIENT_GONE_MESSAGE="__YOUR_TEXT_HERE__"
+SERVER_CONNECTION_ERROR_MESSAGE="__YOUR_TEXT_HERE__"
 WIDTH="500"
 HEIGHT="400"
diff --git a/0.x/skeleton b/0.x/skeleton
index 809d5e2..6748d1d 100644
--- a/0.x/skeleton
+++ b/0.x/skeleton
@@ -111,8 +111,16 @@ OLD_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=$TEMPORARY_DIRECTORY:$LD_LIBRARY_PATH
 $TEMPORARY_DIRECTORY/vncserver $VNC_SERVER_COMMAND_ARGUMENTS -afteraccept "$0 client_connected" -gone "$0 client_gone"
 if [ "0" -ne "$?" ]; then
-  echo "Vnc connection error, exiting."
+  echo "Vnc connection error (exit code: $?), exiting."
   export LD_LIBRARY_PATH=$OLD_LD_LIBRARY_PATH
+  if [ -x /usr/bin/zenity ]; then
+    N=`eval $"zenity --title=\"$INPUT_BOX_TITLE\" --error --text=\"$SERVER_CONNECTION_ERROR_MESSAGE\""`
+  elif [ -x /usr/bin/kdialog ]; then
+    N=`eval $"kdialog --title \"$INPUT_BOX_TITLE\" --error \"$SERVER_CONNECTION_ERROR_MESSAGE\""`
+  else
+    echo "Gui scripting tool not found, exiting."
+    exit 2
+  fi
   exit 7
 fi
 export LD_LIBRARY_PATH=$OLD_LD_LIBRARY_PATH