Merge lp:~unity-team/unity/see-you-later-flow into lp:unity

[Michal Hruby]

Disable the flow renderer

Disables the flow renderer for now.

[John Lea (johnlea)]

review: Approve (design)

[Andrea Azzarone (azzar1)]

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1285/console reported an error when processing this lp:~unity-team/unity/see-you-later-flow branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1286/console reported an error when processing this lp:~unity-team/unity/see-you-later-flow branch.
Not merging it.

[Brandon Schaefer (brandontschaefer)]

one more time...as this should be fixed...(merging wise)

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1287/console reported an error when processing this lp:~unity-team/unity/see-you-later-flow branch.
Not merging it.

[Michal Hruby (mhr3)]

And one last time...

[Brandon Schaefer (brandontschaefer)]

It seems to be using the wrong compiz version...
Unpacking compiz-core (from .../compiz-core_0.9.8.2+bzr3371ubuntu0+3295_amd64.deb) ...

the fix is in 3373.. :(

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1288/console reported an error when processing this lp:~unity-team/unity/see-you-later-flow branch.
Not merging it.

=== modified file 'dash/LensView.cpp'
--- dash/LensView.cpp	2012-08-31 15:46:18 +0000
+++ dash/LensView.cpp	2012-09-13 13:32:31 +0000
@@ -313,12 +313,15 @@
     static_cast<ResultViewGrid*> (grid)->horizontal_spacing = CARD_VIEW_GAP_HORIZ;
     static_cast<ResultViewGrid*> (grid)->vertical_spacing = CARD_VIEW_GAP_VERT;
   }
+  /*
+   * The flow renderer is disabled for now, expecting return later
   else if (renderer_name == "flow" && nux::GetWindowThread()->GetGraphicsEngine().UsingGLSLCodePath())
   {
     grid = new CoverflowResultView(NUX_TRACKER_LOCATION);
     grid->SetModelRenderer(new ResultRendererTile(NUX_TRACKER_LOCATION));
     group->SetHeaderCountVisible(false);
   }
+  */
   else
   {
     grid = new ResultViewGrid(NUX_TRACKER_LOCATION);