Compiz

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

  1. compiz.no_fallback
  2. Merge into ubuntu
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 592
Proposed branch: lp:~unity-team/compiz/compiz.no_fallback
Merge into: lp:~compiz/compiz/ubuntu
Diff against target: 34 lines (+1/-11)
1 file modified
debian/compiz-decorator (+1/-11)
To merge this branch: bzr merge lp:~unity-team/compiz/compiz.no_fallback
Reviewer Review Type Date Requested Status
Jay Taoko (community) Approve
compiz packagers Pending
Review via email: mp+57039@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Jay Taoko (jaytaoko) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/compiz-decorator'
2--- debian/compiz-decorator 2011-03-23 07:35:34 +0000
3+++ debian/compiz-decorator 2011-04-09 03:11:34 +0000
4@@ -21,8 +21,6 @@
5 # Contributions by: crdlb
6 #
7 COMPIZ_BIN_PATH=/usr/bin/
8-KWIN=`which kwin`
9-METACITY="/usr/bin/metacity"
10
11 #
12 # Default to gtk/kde4-window-decorator
13@@ -30,14 +28,6 @@
14 USE_EMERALD="no"
15 DECORATOR=""
16
17-#Do not leave users without decoration if decorator fails
18-if [ "$DESKTOP_SESSION" = "kde" ]; then
19- FALLBACKWM="${KWIN}"
20-else
21- FALLBACKWM="${METACITY}"
22-fi
23-FALLBACKWM_OPTIONS=" --replace"
24-
25 #
26 # Set to yes to enable verbose
27 #
28@@ -92,6 +82,6 @@
29 exec ${COMPIZ_BIN_PATH}$DECORATOR "$@"
30 else
31 verbose "Found no decorator to start\n"
32- exec $FALLBACKWM $FALLBACKWM_OPTIONS
33+ verbose "This usually means no decorator is installed - please install one of either compiz-gnome or compiz-kde"
34 fi
35

Subscribers

People subscribed via source and target branches

to all changes: