10139N/A--- ./compiz 2011-02-04 14:36:55.643536843 +0100

10139N/A+++ compiz.modified 2011-02-04 14:30:28.087826861 +0100

10139N/A@@ -9,6 +9,7 @@

20184N/A METACITY="/usr/bin/metacity --replace --sm-client-id=default0"

10139N/A GREP="/usr/xpg4/bin/grep"

10139N/A XDPYINFO="/usr/openwin/bin/xdpyinfo"

10139N/A+GLXINFO="/usr/bin/glxinfo"

17185N/A XPROP="/usr/openwin/bin/xprop"

10139N/A SED="/usr/bin/sed"

17178N/A GCONFTOOL="/usr/bin/gconftool-2"

17178N/A@@ -93,6 +94,21 @@

17178N/A fi

10139N/A }

10139N/A

10139N/A+# Check whether we're running under vnc

10139N/A+check_vnc()

10139N/A+{

10139N/A+ verbose "Checking for VNC"

18616N/A+ HAZ_VNC=$(LC_ALL=C $GLXINFO | $GREP "Software Rasterizer")

10139N/A+ if [ -n "$HAZ_VNC" ] ; then

10139N/A+ verbose "Running under vnc"

10139N/A+ return 1

10139N/A+ else

10139N/A+ verbose "Running without vnc"

10139N/A+ return 0

10139N/A+ fi

10139N/A+}

10139N/A+

10139N/A+

17528N/A # Check which card is present and add the right

10139N/A # environment variables

10139N/A set_env_variables ()

10139N/A@@ -142,6 +157,11 @@

10139N/A abort_with_metacity

10139N/A fi

10139N/A

10139N/A+check_vnc

10139N/A+if [ $? -eq 1 ] ; then

10139N/A+ abort_with_metacity

10139N/A+fi

20184N/A+

20184N/A set_env_variables

20184N/A

20184N/A # get number of screens

20184N/A