Compiz

Merge lp://qastaging/~compiz-team/compiz/compiz.animation-cleanup-04092012 into lp://qastaging/compiz/0.9.8

compiz.animation-cleanup-04092012
Merge into 0.9.8

Proposed by Sam Spilsbury on 2012-09-04

Status:	Merged
Approved by:	Sam Spilsbury on 2012-09-05
Approved revision:	3337
Merged at revision:	3345
Proposed branch:	lp://qastaging/~compiz-team/compiz/compiz.animation-cleanup-04092012
Merge into:	lp://qastaging/compiz/0.9.8
Diff against target:	176 lines (+23/-21) 3 files modified plugins/animation/include/animation/animation.h (+2/-2) plugins/animation/src/animation.cpp (+14/-14) plugins/animation/src/options.cpp (+7/-5)
To merge this branch:	bzr merge lp://qastaging/~compiz-team/compiz/compiz.animation-cleanup-04092012
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
jenkins (community)	continuous-integration		Approve on 2012-09-05
Daniel van Vugt		2012-09-04	Approve on 2012-09-05
Review via email: mp+122646@code.qastaging.launchpad.net

Commit message

Move statements to do with unminimize closer to their minimize counterparts,
express a function better by using constants rather than a compound statement.

Description of the change

Move statements to do with unminimize closer to their minimize counterparts, express a function better by using constants rather than a compound statement.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2012-09-05:

Missed two spots I can see:

const char *eventNames[AnimEventNum] =
{"Open", "Close", "Minimize", "Shade", "Unminimize", "Focus"};
^^^^^^^^^^^^

int customOptionOptionIds[AnimEventNum] =
{
    AnimationOptions::OpenOptions,
    AnimationOptions::CloseOptions,
    AnimationOptions::MinimizeOptions,
    AnimationOptions::ShadeOptions,
    AnimationOptions::UnminimizeOptions, <---------
    AnimationOptions::FocusOptions
};

review: Needs Fixing

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-09-05:

fixed.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2012-09-05:

animation.cpp: Comment needs updating:

// Assumes events in the metadata are in
// [Open, Close, Minimize, Shade, Unminimize, Focus] order
// and effects among those are in alphabetical order
// but with "(Event) None" first and "(Event) Random" last.

review: Needs Fixing

Revision history for this message

Sam Spilsbury (smspillaz) wrote on 2012-09-05:

fixed.

Revision history for this message

Daniel van Vugt (vanvugt) wrote on 2012-09-05:

I'm a little nervous that the entire contents of the branch changed 5 minutes ago in r3336, but it looks the same as before.

review: Approve

Revision history for this message

Unity Merger (unity-merger) wrote on 2012-09-05:

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-compiz-core/156/console reported an error when processing this lp:~compiz-team/compiz/compiz.animation-cleanup-04092012 branch.
Not merging it.