r13310 - in /desktop/unstable/gnome-session/debian: changelog gnome-wm

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Oct 30 09:53:01 2007
New Revision: 13310

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13310
Log:
* gnome-wm:
  + Fix indentation.
  + Support for compiz. Closes: #448560, thanks Andreas Klöckner.
  + Also use compiz if metacity is unavailable.

Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/gnome-wm

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=13310&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Tue Oct 30 09:53:01 2007
@@ -1,3 +1,12 @@
+gnome-session (2.20.1-2) UNRELEASED; urgency=low
+
+  * gnome-wm:
+    + Fix indentation.
+    + Support for compiz. Closes: #448560, thanks Andreas Klöckner.
+    + Also use compiz if metacity is unavailable.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 30 Oct 2007 10:51:10 +0100
+
 gnome-session (2.20.1-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/unstable/gnome-session/debian/gnome-wm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/gnome-wm?rev=13310&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/gnome-wm (original)
+++ desktop/unstable/gnome-session/debian/gnome-wm Tue Oct 30 09:53:01 2007
@@ -17,21 +17,21 @@
 for n in "$@" ; do
   case "$GET" in
     smid)
-	  SMID=$n
-	  GET=
-	  ;;
+      SMID=$n
+      GET=
+      ;;
     defwm)
-	   DEFWM=$n
-	   GET=
-	   ;;
+      DEFWM=$n
+      GET=
+      ;;
     *)
       case "$n" in
-        --sm-client-id)
-			GET=smid
-			;;
-        --default-wm)
-		      GET=defwm
-		      ;;
+	--sm-client-id)
+	  GET=smid
+	  ;;
+	--default-wm)
+	  GET=defwm
+	  ;;
       esac
       ;;
   esac
@@ -52,6 +52,8 @@
   # if nothing is found, first use metacity
   elif [ -x /usr/bin/metacity ]; then
     WINDOW_MANAGER=/usr/bin/metacity
+  elif [ -x /usr/bin/compiz ]; then
+    WINDOW_MANAGER=/usr/bin/compiz
   elif [ -x /usr/bin/sawfish ]; then
     WINDOW_MANAGER=/usr/bin/sawfish
   else
@@ -77,18 +79,23 @@
 if [ ! -z "$SMID" ] ; then
   case `basename "$WINDOW_MANAGER"` in
     sawfish)
-	     OPT1=--sm-client-id=$SMID
-	     CURRENT=Sawfish
-	     ;;
+      OPT1=--sm-client-id=$SMID
+      CURRENT=Sawfish
+      ;;
+    compiz)
+      OPT1=--sm-client-id
+      OPT2=$SMID
+      CURRENT=compiz
+      ;;
     metacity)
-	      OPT1=--sm-client-id=$SMID
-	      CURRENT=metacity
-	      ;;
+      OPT1=--sm-client-id=$SMID
+      CURRENT=metacity
+      ;;
     enlightenment|twm)
-		       OPT1=-clientId
-		       OPT2=$SMID
-		       CURRENT=Enlightenment
-		       ;;
+      OPT1=-clientId
+      OPT2=$SMID
+      CURRENT=Enlightenment
+      ;;
     fvwm|fvwm2)
       OPT1=--clientid
       OPT2=$SMID