Merge lp://staging/~shippo/plank/fix-1251625 into lp://staging/plank

Overall this looks good, besides some minor code-style issues.

I would prefer if the special left-click menu would *only* contain the window-listing.

Also making it *2* commits is sufficient:
 * the menuitem-style change
 * the new menu including its requirements

- don't be lazy with variable names like "lbl" -> "label"
- prefix connectors in if-conditions in case of line-breaks

Hm, I don't know how to merge several commits.
Should I just revert the branch and make new commits, or is there some clever way to achieve that?

You are right concerning the menu, I will try and exclude the other entries.
And I just realized that I will then need new commits anyway :-)

As for the coding style, I followed what was already there as closely as possible.
If you want me to break consistency I will, but I'd rather not.

Never mind about the coding style, I see what you mean.

So, I changed the implementation but now my local branch and the one on here have diverged, because I uncommitted the changed in my local branch before making the requested changes.
How do I fix this, should I just force push (by passing --override, I don't know if this will work anyway), or is there a smarter move?

Yes, you need to use "bzr push --overwrite lp:~shippo/plank/fix-1251625" to push your altered branch.

Ooh nice, launchpad already put my changed branch here :-)

So, I implemented the changes you requested:
* The menu shown when multiple windows are open only contains the windows. This is done by passing the button and modifiers to get_menu_items, which presumably breaks ABI compatibility.
* I double checked that I followed the coding style, I hope this time I really did ;-)

Do I need to resubmit?

Sorry, I still have not get around to take a closer look at this. So no need for action from your side yet.