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

[Andrew Starr-Bochicchio]

[Andrew Starr-Bochicchio (andrewsomething)]

I have upload rights for this package, but I'd appreciate a code review.

[Didier Roche-Tolomelli (didrocks)]

Looks good! Thanks for your work here :)

If I were you, I would try that code to make something a little bit more beautiful:
backlist_plugins = ['core']
if os.getenv('DESKTOP_SESSION') == "ubuntu":
    backlist_plugin.append('unityshell')

if plugin.Name not in backlist_plugins:
  … keep there the other code.

That would end in a way smaller diff, wdyt?
Oh btw, the packaging branch for ccsm is https://code.launchpad.net/~compiz/compizconfig-settings-manager/ubuntu as pointed by vcs-bzr, can you please propose a merge here and subscribe me?

Thanks a lot :)

review: Needs Fixing

[Andrew Starr-Bochicchio (andrewsomething)]

On Mon, Feb 13, 2012 at 10:47 AM, Didier Roche <email address hidden> wrote:
> Review: Needs Fixing
>
> Looks good! Thanks for your work here :)
>
> If I were you, I would try that code to make something a little bit more beautiful:
> backlist_plugins = ['core']
> if os.getenv('DESKTOP_SESSION') == "ubuntu":
>    backlist_plugin.append('unityshell')
>
> if plugin.Name not in backlist_plugins:
>  … keep there the other code.
>
> That would end in a way smaller diff, wdyt?

That is much nicer. =)

> Oh btw, the packaging branch for ccsm is https://code.launchpad.net/~compiz/compizconfig-settings-manager/ubuntu as pointed by vcs-bzr, can you please propose a merge here and subscribe me?

Re-targeting both merge proposals.

Thanks,

-- Andrew Starr-Bochicchio

   Ubuntu Developer <https://launchpad.net/~andrewsomething>
   Debian Maintainer
<http://qa.debian.org/developer.php?login=a.starr.b%40gmail.com>
   PGP/GPG Key ID: D53FDCB1

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-01 12:50:42 +0000
+++ debian/changelog	2012-02-03 00:13:25 +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-03 00:13:25 +0000
@@ -0,0 +1,40 @@
+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'
+--- ccm/Widgets.py	2011-02-24 17:39:03 +0000
++++ ccm/Widgets.py	2012-02-03 00:00:30 +0000
+@@ -1401,14 +1401,24 @@
+         button.set_tooltip_text (plugin.LongDesc)
+         button.add (box)
+ 
+-        if plugin.Name != 'core':
+-            enable = gtk.CheckButton ()
+-            enable.set_tooltip_text(_("Enable %s") % plugin.ShortDesc)
+-            enable.set_active (plugin.Enabled)
+-            enable.set_sensitive (plugin.Context.AutoSort)
+-            self._toggled_handler = enable.connect ("toggled", self.enable_plugin)
+-            PluginSetting (plugin, enable, self._toggled_handler)
+-            self.pack_start (enable, False, False)
++        if os.getenv('DESKTOP_SESSION') == "ubuntu":
++            if plugin.Name != 'core' and plugin.Name != 'unityshell':
++                enable = gtk.CheckButton ()
++                enable.set_tooltip_text(_("Enable %s") % plugin.ShortDesc)
++                enable.set_active (plugin.Enabled)
++                enable.set_sensitive (plugin.Context.AutoSort)
++                self._toggled_handler = enable.connect ("toggled", self.enable_plugin)
++                PluginSetting (plugin, enable, self._toggled_handler)
++                self.pack_start (enable, False, False)
++        else:
++            if plugin.Name != 'core':
++                enable = gtk.CheckButton ()
++                enable.set_tooltip_text(_("Enable %s") % plugin.ShortDesc)
++                enable.set_active (plugin.Enabled)
++                enable.set_sensitive (plugin.Context.AutoSort)
++                self._toggled_handler = enable.connect ("toggled", self.enable_plugin)
++                PluginSetting (plugin, enable, self._toggled_handler)
++                self.pack_start (enable, False, False)
+         self.pack_start (button, False, False)
+ 
+         self.set_size_request (220, -1)
+