Unity

Merge lp://staging/~ruben-verweij/unity/fix-677594-workspaces into lp://staging/unity

fix-677594-workspaces
Merge into trunk

Proposed by Ruben Verweij on 2010-12-09

Status:

Merged

Merged at revision:

860

Proposed branch:

lp://staging/~ruben-verweij/unity/fix-677594-workspaces

Merge into:

lp://staging/unity

Diff against target:

137 lines (+63/-13)

4 files modified

src/LauncherController.cpp (+36/-13)
src/LauncherController.h (+4/-0)
src/unityshell.cpp (+18/-0)
src/unityshell.h (+5/-0)

To merge this branch:

bzr merge lp://staging/~ruben-verweij/unity/fix-677594-workspaces

Low

Fix Released

Link a bug report

Reviewer	Date Requested	Status
David Barth (community)		Approve on 2011-02-21
Jason Smith (community)		Approve on 2011-02-15
Ruben Verweij (community)		Needs Resubmitting on 2011-02-10
Alex Launi (community)		Needs Fixing on 2011-02-01
Neil J. Patel	2010-12-09	Pending
Review via email: mp+43280@code.staging.launchpad.net

This proposal supersedes a proposal from 2010-12-08.

Description of the change

Thanks for your quick reply and feedback!
I have updated the code as you have suggested, but I can't test it.
I am running Natty, how do I compile "my version" of Unity and run it to test whether it works?
Thanks again for your help!

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2010-12-09: Posted in a previous version of this proposal

Hi,

You don't need to use gconf to do this, you can just ask compiz directly for the number of workspaces with screen->vpSize ().width ();

Also if you want to be notified when this number changes you can implement a

bool
UnityScreen::setOptionForPlugin (const char *plugin, const char *name, CompOption::Value &v) and make sure that UnityScreen inherits ScreenInterface (and that we call ScreenInterface::setHandler (screen) in the UnityScreen construtor) and then check for plugin == "core" and name == "hsize" and react on that change.

See git.compiz.org/compiz/core/plugins/cube/src/cube.cpp:1622 for some ideas on this.

Remind me that this method is full of suck and I need to change it.

Revision history for this message

Neil J. Patel (njpatel) wrote on 2010-12-09: Posted in a previous version of this proposal

As per sams comment

review: Needs Fixing

Revision history for this message

Alex Launi (alexlauni) wrote on 2011-02-01:

Thanks for updating. You have conflicts in this branch though.
152 +>>>>>>> MERGE-SOURCE

That will cause the code to fail to compile.
There are instructions for building Unity from source available at https://wiki.ubuntu.com/Unity/InstallationGuideFromSource

review: Needs Fixing

Revision history for this message

Ruben Verweij (ruben-verweij) wrote on 2011-02-10:

Okay, I have resolved the conflicts and I hope it works now.

review: Needs Resubmitting

Revision history for this message

Alex Launi (alexlauni) wrote on 2011-02-11:

Looks good but before we merge it we need you to sign the Canonical contributer agreement. It's a quick, but necessary step to getting your code into the tree. Luckily you only need to sign it once and it will apply to all other Canonical project contributions you may make in the future. http://www.canonical.com/contributors Make sure to CC David Barth when you send it in.

Revision history for this message

Ruben Verweij (ruben-verweij) wrote on 2011-02-12:

Okay, it's done. Thanks for your help!

-----Original Message-----
From: Alex Launi <email address hidden>
Reply-to: <email address hidden>
To: <email address hidden>
Subject: Re: [Merge] lp:~ruben-verweij/unity/fix-677594-workspaces into
lp:unity
Date: Fri, 11 Feb 2011 19:01:24 -0000