Merge lp:~bilalakhtar/unity-lens-applications/fix-750262 into lp:unity-lens-applications

Proposed by Bilal Akhtar on 2011-04-06
Status: Merged
Merged at revision: 201
Proposed branch: lp:~bilalakhtar/unity-lens-applications/fix-750262
Merge into: lp:unity-lens-applications
Diff against target: 29 lines (+14/-5)
1 file modified
src/daemon.vala (+14/-5)
To merge this branch: bzr merge lp:~bilalakhtar/unity-lens-applications/fix-750262
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) 2011-04-06 Approve on 2011-04-07
Review via email: mp+56526@code.launchpad.net

Description of the change

This branch fixes bug #750262 .

To post a comment you must log in.

There's something about this implementation I don't like too much. Right now you extract the package name and pass it to software-center. This only works by chance.

The "correct" way would be to pass the full "apt:package_name" string to AppInfo.launch_default_for_uri() because the apt: scheme is already registered with GNOME as you can verify by running "gnome-open apt:xterm" in a terminal.

review: Needs Fixing

(and note - the reason why the unity-install:// scheme doesn't work "by chance" in general is because we extract all the metadata directly from software-center's own index when constructing the URL)

202. By Bilal Akhtar on 2011-04-06

Make sure apturl runs in the case of an apt: url, and not software-center

Awesome Bilal! I saw your ping on IRC yesterday just when my laptop's battery died. I still think that AppInfo.launch_default_for_uri() is the right choice. The apt:foo thing is mainly for power users and I am not convinced they appreciate a full S-C launched.

And using the GNOME URI handling we give the platform team the option to install the software-center as apt: URI handler if they see that as better. Which hardcoding S-C doesn't make room for.

Your patch will be included in todays tarball.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/daemon.vala'
2--- src/daemon.vala 2011-03-31 10:48:54 +0000
3+++ src/daemon.vala 2011-04-06 15:06:36 +0000
4@@ -763,11 +763,20 @@
5 {
6 string orig;
7 orig = uri.offset (15);
8- exec_or_dir = Utils.subst_tilde (orig);
9- args = exec_or_dir.split (" ", 0);
10- for (int i = 0; i < args.length; i++)
11- args[i] = Utils.subst_tilde (args[i]);
12-
13+ if (orig.has_prefix ("apt:")) {
14+ try {
15+ AppInfo.launch_default_for_uri (orig, null);
16+ } catch (GLib.Error error) {
17+ warning ("failed to install package %s", orig.offset(4));
18+ return ActivationStatus.NOT_ACTIVATED;
19+ }
20+ return ActivationStatus.ACTIVATED_HIDE_DASH;
21+ } else {
22+ exec_or_dir = Utils.subst_tilde (orig);
23+ args = exec_or_dir.split (" ", 0);
24+ for (int i = 0; i < args.length; i++)
25+ args[i] = Utils.subst_tilde (args[i]);
26+ }
27 this.runner.add_history (orig);
28 }
29 else

Subscribers

People subscribed via source and target branches