Unity

Merge lp://qastaging/~unity-team/unity/fixes-2011-04-04 into lp://qastaging/unity

fixes-2011-04-04
Merge into trunk

Proposed by Neil J. Patel on 2011-04-07

Status:

Merged

Approved by:

Gord Allott on 2011-04-07

Approved revision:

no longer in the source branch.

Merged at revision:

1084

Proposed branch:

lp://qastaging/~unity-team/unity/fixes-2011-04-04

Merge into:

lp://qastaging/unity

Diff against target:

614 lines (+118/-69)

23 files modified

src/IndicatorObjectFactoryRemote.cpp (+2/-2)
src/LauncherIcon.cpp (+5/-0)
src/LauncherIcon.h (+1/-1)
src/PanelController.cpp (+7/-0)
src/PanelHomeButton.cpp (+3/-1)
src/PanelHomeButton.h (+1/-0)
src/PanelMenuView.cpp (+1/-1)
src/PlaceFactoryFile.cpp (+34/-1)
src/PlaceFactoryFile.h (+4/-2)
src/PlaceLauncherSection.cpp (+4/-2)
src/PlaceLauncherSection.h (+2/-0)
src/PlaceRemote.cpp (+6/-0)
src/PlaceRemote.h (+1/-1)
src/PlacesController.cpp (+1/-1)
src/PlacesHorizontalTile.cpp (+13/-11)
src/PlacesSettings.cpp (+2/-2)
src/PlacesSimpleTile.cpp (+8/-7)
src/PlacesTile.cpp (+7/-32)
src/QuicklistMenuItemCheckmark.cpp (+1/-1)
src/QuicklistMenuItemLabel.cpp (+1/-1)
src/QuicklistMenuItemRadio.cpp (+1/-1)
src/StaticCairoText.cpp (+9/-1)
src/StaticCairoText.h (+4/-1)

To merge this branch:

bzr merge lp://qastaging/~unity-team/unity/fixes-2011-04-04

Related bugs:

Bug #737379: Dash: Applications should have higher preference	Medium	Fix Released
Bug #738864: compiz crashed with SIGSEGV in free()	Critical	Fix Released
Bug #739862: Empty Trash legend illegible	Medium	Fix Released
Bug #742859: panel superposition	High	Fix Released
Bug #747337: Horizontal renderer rendering issues	Medium	Fix Released
Bug #748033: compiz crashed with SIGSEGV in g_closure_invoke()	Critical	Fix Released
Bug #750365: Dash - Switch dash highlight to new highlight	Low	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Gord Allott		2011-04-07	Pending
Review via email: mp+56769@code.qastaging.launchpad.net

Description of the change

Bugs attached plus some misc fixes.

Revision history for this message

Tim Penhey (thumper) wrote on 2011-04-07:

On Fri, 08 Apr 2011 01:42:07 you wrote:
> +bool
> +PlaceFactoryFile::DoSortThemMister (Place *aa, Place *bb)
> +{
> +#define FIRST "/com/canonical/unity/applicationsplace"
> +#define SECOND "/com/canonical/unity/filesplace"
> +

For the love of clean code, what is wrong with:

static const char* const apps_place =
"/com/canonical/unity/applicationsplace";
static const char* const files_place = "/com/canonical/unity/filesplace";

#defines are brutal hammers that just aren't needed in places like this.