From: short <>
Date: Mon, 20 Jun 2005 11:56:17 +0000 (+0000)
Subject: Retry glade(1)/glade-2(1) on DISPLAY ":0" if the Xvnc connection failed.
X-Git-Tag: udpgate-1_0_2
X-Git-Url: http://git.jankratochvil.net/?p=macros.git;a=commitdiff_plain;h=refs%2Ftags%2Fudpgate-1_0_2

Retry glade(1)/glade-2(1) on DISPLAY ":0" if the Xvnc connection failed.
 - FIXME: Newer Xvnc of Fedora Core 4 always refuses its clients.
---

diff --git a/glade-w.sh.in b/glade-w.sh.in
index 313ebbf..d60792d 100755
--- a/glade-w.sh.in
+++ b/glade-w.sh.in
@@ -87,7 +87,17 @@ if [ "$1" != "${1#/}" ];then
      abs="$1"
 else abs="$PWD/$1"
 fi
-$PATH_GLADE --disable-crash-dialog -w "$abs";r=$?
+
+while true;do
+	$PATH_GLADE --disable-crash-dialog -w "$abs";r=$?
+	if [ $r -eq 0 ];then
+		break
+	fi
+	if [ "$DISPLAY" = ":0" ];then
+		break
+	fi
+	export DISPLAY=":0"
+done
 
 if test "x$xpid" != "x"
 then