Merge lp:~dobey/unity-scope-click/finite-search into lp:unity-scope-click

[dobey]

Only invalidate the results in the timeout, to avoid constant refreshing of the search.

[lp:~dobey/unity-scope-click/finite-search]

63. By dobey on 2013-10-08

[ Alejandro J. Cura ]
* Pass the publisher field if available to the app preview. (LP:
  #1226265)
* Include the framework in the search query. (LP: #1234255)
* Catch more download errors, and ask for credentials on 401. (LP:
  #1234742)
[ Ubuntu daily release ]
* Automatic snapshot from revision 70
[ Alejandro J. Cura ]
* Do not show suggested apps when internet search is off. (LP:
  #1231378)
* Don't show Uninstall button if manifest has _removable:0, and remove
  pin-to-launcher. (LP: #1233641, #1233653)
* Show download manager failures. (LP: #1226021)
* Ask for confirmation before uninstall . (LP: #1233643)
[ Rodney Dawes ]
* Remove the fake ratings and reviews data from the app previews. (LP:
  #1209213)
* Remove the noauth=1 appendage to the URL.
* Refactor the error handling, to separate credentials errors from
  other errors. Show a "Go to Accounts" button in the credentials
  error preview. (LP: #1231517)
* Don't add the Install button, if there was an error. (LP: #1233169)
[ Ubuntu daily release ]
* Automatic snapshot from revision 66

[dobey (dobey)]

review: Abstain

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:63
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dobey/unity-scope-click/finite-search/+merge/189963/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/95/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-saucy-armhf-ci/89

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

review: Needs Fixing (continuous-integration)

[Michal Hruby (mhr3)]

9 + parent_scope.results_invalidated(Unity.SearchType.GLOBAL);

The click store apps are not supposed to be shown in home(/global) searches, so there's no need to invalidate it.

review: Needs Fixing

[lp:~dobey/unity-scope-click/finite-search]

64. By dobey on 2013-10-09

Don't invalidate the global search type, as we don't appear there anyway.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

26 return false;

Pls add app_search_id = 0; before the return.

[lp:~dobey/unity-scope-click/finite-search]

65. By dobey on 2013-10-09

sigh.

[Michal Hruby (mhr3)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/click-scope.vala'
--- src/click-scope.vala	2013-10-08 01:37:39 +0000
+++ src/click-scope.vala	2013-10-09 14:05:17 +0000
@@ -388,7 +388,8 @@
         GLib.Source.remove (app_search_id);
     }
     app_search_id = GLib.Timeout.add_seconds (10, () => {
-        find_available_apps.begin (search_query);
+        parent_scope.results_invalidated(Unity.SearchType.DEFAULT);
+        app_search_id = 0;
         return false;
     });
   }
@@ -408,8 +409,6 @@
                 add_app (app, CATEGORY_SUGGESTIONS);
             }
         }
-        parent_scope.results_invalidated(Unity.SearchType.GLOBAL);
-        parent_scope.results_invalidated(Unity.SearchType.DEFAULT);
     } catch (WebserviceError e) {
         debug ("Error calling webservice: %s", e.message);
         setup_find_apps_timeout (search_query);