Unity

Merge lp://qastaging/~macslow/unity/unity.fix-841902 into lp://qastaging/unity

unity.fix-841902
Merge into trunk

Proposed by Mirco Müller on 2012-01-10

Status:

Rejected

Rejected by:

Michal Hruby on 2012-01-18

Proposed branch:

lp://qastaging/~macslow/unity/unity.fix-841902

Merge into:

lp://qastaging/unity

Diff against target:

96 lines (+22/-8)

4 files modified

UnityCore/Filter.cpp (+2/-0)
plugins/unityshell/src/FilterFactory.cpp (+9/-4)
plugins/unityshell/src/FilterGenreWidget.cpp (+10/-3)
plugins/unityshell/src/FilterGenreWidget.h (+1/-1)

To merge this branch:

bzr merge lp://qastaging/~macslow/unity/unity.fix-841902

Low

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Mirco Müller (community)		Disapprove on 2012-01-18
Michal Hruby (community)		Approve on 2012-01-18
Mikkel Kamstrup Erlandsen (community)	2012-01-10	Needs Fixing on 2012-01-12
Review via email: mp+88034@code.qastaging.launchpad.net

Description of the change

The actual unity-part of the fix for LP: #841902. It needs lp:~macslow/libunity/libunity.fix-841902 and lp:~macslow/unity-lens-music/unity-lens-music.fix-841902 to be merged first.

Revision history for this message

Mikkel Kamstrup Erlandsen (kamstrup) wrote on 2012-01-12:

73 + if (cols == 2)
74 + {
75 + genre_layout_->SetChildrenSize (dash::Style::Instance().GetTileWidth() - 12, 32);
76 + }
77 + else if (cols == 3)
78 + {
79 + genre_layout_->SetChildrenSize (92, 33);
80 + }

Can you add a catch-all else{} branch to this construction, maybe printing a warning? Or if it's unneeded please add a comment that the off-chance is taken care of.

Otherwise looking good.

review: Needs Fixing

Revision history for this message

Mirco Müller (macslow) wrote on 2012-01-12:

I swear I did push the correct version... doh. Well fixed it again now in this one.

Revision history for this message

Michal Hruby (mhr3) wrote on 2012-01-18:

Seems to be good to go.

review: Approve

Revision history for this message

Unity Merger (unity-merger) wrote on 2012-01-18:

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unityshell/src/FilterFactory.cpp
text conflict in plugins/unityshell/src/FilterGenreWidget.cpp
text conflict in plugins/unityshell/src/FilterGenreWidget.h

Revision history for this message

Mirco Müller (macslow) wrote on 2012-01-18:

> Attempt to merge into lp:unity failed due to conflicts:
>
> text conflict in plugins/unityshell/src/FilterFactory.cpp
> text conflict in plugins/unityshell/src/FilterGenreWidget.cpp
> text conflict in plugins/unityshell/src/FilterGenreWidget.h

Seriously... WTF?!?!

Revision history for this message

Mirco Müller (macslow) wrote on 2012-01-18:

Moved this to https://code.launchpad.net/~macslow/unity/unity.fix-841902-2/+merge/89004

Revision history for this message

Mirco Müller (macslow) wrote on 2012-01-18:

See above comment

review: Disapprove

Unmerged revisions

1821. By Mirco Müller on 2012-01-12: Made the else-branch catch-all
1820. By Mirco Müller on 2012-01-10: Use the new/correct name for CheckOption renderer
1819. By Mirco Müller on 2012-01-10: Merge with trunk
1818. By Mirco Müller on 2012-01-06: Got rid of debug-output
1817. By Mirco Müller on 2012-01-06: Make sure the correct filter is selected based on the renderer-name
1816. By Mirco Müller on 2012-01-06: Trying to support a 3-column layout for the genre-filter (only applying to the music-lens) attempt to fix LP: #841902