Merge lp:~mhr3/unity-scope-click/update-nonclicks into lp:unity-scope-click

[Michal Hruby]

Update definition of non-click apps, so we don't waste time trying to find them.

Update definition of non-click apps, so we don't waste time trying to find them.

Also ignores Home search in the click scope, since unity overrides results for that category anyway.

[dobey (dobey)]

+ if (search_type != Unity.SearchType.DEFAULT) return;

Please put the return on a new line with proper indentation.

review: Needs Fixing

[lp:~mhr3/unity-scope-click/update-nonclicks]

80. By Michal Hruby on 2013-10-14

Return on new line

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-amd64-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-armhf-ci/93

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-scope-click-ci/99/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2013-10-10 17:37:35 +0000
+++ src/click-scope.vala	2013-10-14 16:14:41 +0000
@@ -423,7 +423,13 @@
     return Unity.PreferencesManager.get_default().remote_content_search != Unity.PreferencesManager.RemoteContent.NONE;
   }
 
-  async void find_apps (string search_query) {
+  async void find_apps (string search_query, Unity.SearchType search_type)
+  {
+    // we don't provide any results for Home searches for now
+    if (search_type != Unity.SearchType.DEFAULT) {
+        return;
+    }
+
     yield find_installed_apps (search_query);
     if (can_search_internet()) {
         yield find_available_apps (search_query);
@@ -440,7 +446,7 @@
 
   public override void run_async (Unity.ScopeSearchBaseCallback async_callback)
   {
-    find_apps.begin (search_context.search_query, (obj, res) => {
+    find_apps.begin (search_context.search_query, search_context.search_type, (obj, res) => {
         find_apps.end (res);
         async_callback(this);
         debug ("run_async: finished.");

=== modified file 'src/non-click-scope.vala'
--- src/non-click-scope.vala	2013-10-07 16:27:16 +0000
+++ src/non-click-scope.vala	2013-10-14 16:14:41 +0000
@@ -22,7 +22,6 @@
   const string[] NON_CLICK_DESKTOPS =
   {
     "address-book-app.desktop",
-    "calendar-app.desktop",
     "camera-app.desktop",
     "click-update-manager.desktop",
     "dialer-app.desktop",
@@ -31,14 +30,8 @@
     "mediaplayer-app.desktop",
     "messaging-app.desktop",
     "music-app.desktop",
-    "notes-app.desktop",
-    "rssreader-app.desktop",
-    "ubuntu-calculator-app.desktop",
-    "ubuntu-clock-app.desktop",
     "ubuntu-filemanager-app.desktop",
     "ubuntu-system-settings.desktop",
-    "ubuntu-terminal-app.desktop",
-    "ubuntu-weather-app.desktop",
     "webbrowser-app.desktop"
   };