Merge lp:~andrewsomething/compizconfig-settings-manager/disable_unity_checkbox into lp:~compiz/compizconfig-settings-manager/ubuntu

[Andrew Starr-Bochicchio]

[Didier Roche-Tolomelli (didrocks)]

nice work! Thanks a lot for taking my advice into account, merging it as well :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-01 11:50:50 +0000
+++ debian/changelog	2012-02-13 23:50:24 +0000
@@ -1,3 +1,11 @@
+compizconfig-settings-manager (0.9.5.92-0ubuntu3) precise; urgency=low
+
+  * debian/patches/03_disable_unity_checkbox.patch:
+   - If in a Unity session, don't allow the user to disable
+     Unity from main view.
+
+ -- Andrew Starr-Bochicchio <[e-mail]>  Thu, 02 Feb 2012 19:07:59 -0500
+
 compizconfig-settings-manager (0.9.5.92-0ubuntu2) precise; urgency=low
 
   [Alan Bell]

=== added file 'debian/patches/03_disable_unity_checkbox.patch'
--- debian/patches/03_disable_unity_checkbox.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/03_disable_unity_checkbox.patch	2012-02-13 23:50:24 +0000
@@ -0,0 +1,20 @@
+Description: If in a Unity session, don't allow the user to disable Unity from main view.
+Author: Andrew Starr-Bochicchio <[e-mail]>
+
+=== modified file 'ccm/Widgets.py'
+diff -Nur -x '*.orig' -x '*~' ccsm-checkbox//ccm/Widgets.py ccsm-checkbox.new//ccm/Widgets.py
+--- ccsm-checkbox//ccm/Widgets.py	2012-02-02 19:05:53.690931000 -0500
++++ ccsm-checkbox.new//ccm/Widgets.py	2012-02-13 18:42:47.612544975 -0500
+@@ -1401,7 +1401,11 @@
+         button.set_tooltip_text (plugin.LongDesc)
+         button.add (box)
+ 
+-        if plugin.Name != 'core':
++        blacklist_plugins = ['core']
++        if os.getenv('DESKTOP_SESSION') == 'ubuntu':
++            blacklist_plugins.append('unityshell')
++
++        if plugin.Name not in blacklist_plugins:
+             enable = gtk.CheckButton ()
+             enable.set_tooltip_text(_("Enable %s") % plugin.ShortDesc)
+             enable.set_active (plugin.Enabled)