Merge lp:~tiagosh/unity-2d/fix-activatefirstresult into lp:unity-2d

[Tiago Salem Herrmann]

[dash] applications are not launched when searching for a string on the home lens and then pressing return key.

[Gerry Boland (gerboland)]

We discussed this over IRC, and we agreed that Tiago investigate more into his comment:

/* for an unknown reason the firstCategoryModel isn't updated properly
   only for the HomeLens if any search is performed */

Unmerged revisions

917. By Tiago Salem Herrmann on 2012-02-14

update firstCategoryModel properly. For some reason when any search is performed
on the Home Lens, firstCategoryModel isn't updated and launching the app/doc by pressing
return fails.

=== modified file 'shell/dash/Home.qml'
--- shell/dash/Home.qml	2012-02-01 23:52:38 +0000
+++ shell/dash/Home.qml	2012-02-14 14:42:19 +0000
@@ -25,7 +25,9 @@
         /* model.searchQuery is copied over to all lenses globalSearchQuery property */
         onSearchQueryChanged: {
             for (var i = 0; i < dash.lenses.rowCount(); i++) {
-                dash.lenses.get(i).globalSearchQuery = searchQuery
+                if (dash.lenses.get(i).id != "home.lens") {
+                    dash.lenses.get(i).globalSearchQuery = searchQuery
+                }
             }
         }
     }

=== modified file 'shell/dash/LensView.qml'
--- shell/dash/LensView.qml	2012-02-10 20:25:00 +0000
+++ shell/dash/LensView.qml	2012-02-14 14:42:19 +0000
@@ -27,6 +27,10 @@
     property variant model
 
     function activateFirstResult() {
+        /* for an unknown reason the firstCategoryModel isn't updated properly
+           only for the HomeLens if any search is performed */
+        firstCategoryModel.model = lensView.model.results
+
         /* Going through the list of categories and selecting the first one
            that has results for the search. A SortFilterProxyModel
            ('firstCategoryModel') is used to filter the search results per category.