Merge lp:~nick-dedekind/unity/lp1054219.home-lens-search into lp:unity

[Nick Dedekind]

Fixed re-ordering of shopping lens category in home lens. (LP#1054219)

Fixed re-ordering of shopping lens category in home lens. (LP#1054219)

[Michal Hruby (mhr3)]

Silly me... +1

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1428/console reported an error when processing this lp:~nick-dedekind/unity/lp1054219.home-lens-search branch.
Not merging it.

[Daniel van Vugt (vanvugt)]

Well, it's already landed in lp:unity/6.0 so we better make sure it's in lp:unity too.

review: Approve

=== modified file 'UnityCore/HomeLens.cpp'
--- UnityCore/HomeLens.cpp	2012-08-31 14:36:57 +0000
+++ UnityCore/HomeLens.cpp	2012-10-01 13:35:31 +0000
@@ -986,7 +986,7 @@
   {
     unsigned shopping_cat_num = order_vector.at(shopping_index);
     order_vector.erase(order_vector.begin() + shopping_index);
-    order_vector.insert(order_vector.begin() + 2, shopping_cat_num);
+    order_vector.insert(order_vector.size() > 2 ? order_vector.begin() + 2 : order_vector.end(), shopping_cat_num);
   }
 
   if (cached_categories_order_ != order_vector)