Merge lp:~unity-team/compiz/compiz.no_fallback into lp:~compiz/compiz/ubuntu

[Sam Spilsbury]

Don't leave the user without a shell if they didn't install a decorator - instead just warn about the fact that they have no compiz-gnome or compiz-kde installed.

[Jay Taoko (jaytaoko)]

Approved

review: Approve

=== modified file 'debian/compiz-decorator'
--- debian/compiz-decorator	2011-03-23 07:35:34 +0000
+++ debian/compiz-decorator	2011-04-09 03:11:34 +0000
@@ -21,8 +21,6 @@
 # Contributions by: crdlb
 #
 COMPIZ_BIN_PATH=/usr/bin/
-KWIN=`which kwin`
-METACITY="/usr/bin/metacity"
 
 #
 # Default to gtk/kde4-window-decorator
@@ -30,14 +28,6 @@
 USE_EMERALD="no"
 DECORATOR=""
 
-#Do not leave users without decoration if decorator fails
-if [ "$DESKTOP_SESSION" = "kde" ]; then
-    FALLBACKWM="${KWIN}"
-else
-    FALLBACKWM="${METACITY}"
-fi
-FALLBACKWM_OPTIONS=" --replace"
-
 #
 # Set to yes to enable verbose
 #
@@ -92,6 +82,6 @@
     exec ${COMPIZ_BIN_PATH}$DECORATOR "$@"
 else
     verbose "Found no decorator to start\n"
-    exec $FALLBACKWM $FALLBACKWM_OPTIONS
+    verbose "This usually means no decorator is installed - please install one of either compiz-gnome or compiz-kde"
 fi