18861N/A--- ../../compiz 2010-02-08 09:59:43.000000000 +0000

18861N/A+++ ../../../SUNWcompiz.hacked/compiz 2010-03-30 13:39:39.761614608 +0100

18861N/A@@ -1,6 +1,6 @@

18861N/A #!/bin/bash

18861N/A #

18861N/A-# Copyright (c) 2008, by Sun Microsystems, Inc.

18861N/A+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.

18861N/A #

18861N/A # Checks if compiz can run with the current Xserver

18861N/A # display settings. If this is not the case

18861N/A@@ -11,10 +11,12 @@

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

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

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

18861N/A+GCONFTOOL="/usr/bin/gconftool-2"

18861N/A

18861N/A COMPIZ_BIN="/usr/bin/compiz-bin"

18861N/A COMPIZ_OPTIONS="--indirect-rendering --fast-filter --replace"

18861N/A COMPIZ_PLUGINS="ccp"

18861N/A+GCONF_A11Y_KEY="/desktop/gnome/interface/accessibility"

18861N/A

18861N/A DECORATOR="/usr/bin/gtk-window-decorator"

18861N/A DECORATOR_OPTIONS="--replace"

18861N/A@@ -77,6 +79,20 @@

18861N/A fi

18861N/A }

18861N/A

18861N/A+# Check whether accessibility is turn on or not

18861N/A+check_accessibility()

18861N/A+{

18861N/A+ verbose "Checking for Acessibility: "

18861N/A+ a11y_value=`$GCONFTOOL --get $GCONF_A11Y_KEY`

18861N/A+ if [ "x$a11y_value" = "xtrue" ]; then

18861N/A+ verbose "Enabled. \n"

18861N/A+ return 1

18861N/A+ else

18861N/A+ verbose " Disabled. \n"

18861N/A+ return 0

18861N/A+ fi

18861N/A+}

18861N/A+

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

18861N/A # environment variables

18861N/A set_env_variables ()

18861N/A@@ -106,6 +122,11 @@

18861N/A #

18861N/A # Main routine of the script

18861N/A #

18861N/A+check_accessibility

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

18861N/A+ abort_with_metacity

18861N/A+fi

18861N/A+

18861N/A check_trusted_session

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

18861N/A abort_with_metacity