Merge lp:~stolowski/unity-lens-applications/download-app-preview-on-lmb into lp:unity-lens-applications

[Paweł Stołowski]

Request preview on activation of unity-install:// uris.

Request preview on activation of unity-install:// uris.

[lp:~stolowski/unity-lens-applications/download-app-preview-on-lmb]

296. By Paweł Stołowski on 2012-09-05

Set prgname of unity-applications-daemon.

[Michal Hruby (mhr3)]

Looking good, but dash doesn't behave well with this - the preview navigation is broken if standard activation returns a preview. Should be fixed in unity first.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:296
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-raring-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-raring-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-raring-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[Michal Hruby (mhr3)]

Already fixed.

Unmerged revisions

296. By Paweł Stołowski on 2012-09-05

Set prgname of unity-applications-daemon.

295. By Paweł Stołowski on 2012-09-05

Request preview on activation of unity-install:// uris.

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-08-30 11:23:14 +0000
+++ src/daemon.vala	2012-09-05 10:32:19 +0000
@@ -1308,11 +1308,7 @@
       string exec_or_dir = null;
       if (uri.has_prefix ("unity-install://"))
       {
-        unowned string pkg = uri.offset (16); // strip off "unity-install://" prefix
-        debug ("Installing: %s", pkg);
-        args = new string[2];
-        args[0] = "software-center";
-        args[1] = pkg;
+        return new Unity.ActivationResponse(Unity.HandledType.SHOW_PREVIEW);
       }
       else if (uri.has_prefix ("unity-runner://"))
       {
 
=== modified file 'src/main.vala'
--- src/main.vala	2011-10-04 13:02:38 +0000
+++ src/main.vala	2012-09-05 10:32:19 +0000
@@ -51,6 +51,8 @@
 
   public static int main (string[] args)
   {
+    GLib.Environment.set_prgname ("unity-applications-daemon");
+
     /* Sort up locale to get translations but also sorting and
      * punctuation right */
     GLib.Intl.textdomain (Config.PACKAGE);