Merge lp:~gary-lasker/software-center/fix-lp913756-for-5.0 into lp:software-center/5.0

Proposed by Gary Lasker
Status: Merged
Merged at revision: 2485
Proposed branch: lp:~gary-lasker/software-center/fix-lp913756-for-5.0
Merge into: lp:software-center/5.0
Diff against target: 56 lines (+17/-6)
2 files modified
debian/changelog (+9/-0)
softwarecenter/ui/gtk3/panes/softwarepane.py (+8/-6)
To merge this branch: bzr merge lp:~gary-lasker/software-center/fix-lp913756-for-5.0
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+88119@code.launchpad.net

Description of the change

This branch cherry-picks the corresponding fix in Precise.

It fixes bug 913756, where in the case of Oneric, an offer to add the icon to the Unity launcher is incorrectly displayed when installing the ubuntu-restricted-extras package. The change just reverts to again check for an Exec line in the corresponding desktop file (we did this previously). If there is no Exec line, then the offer to add to Unity launcher is skipped for that package.

Thanks!

To post a comment you must log in.
2486. By Gary Lasker on 2012-01-10

* lp:~gary-lasker/software-center/fix-lp913756-for-5.0:
  - do not offer to add an icon to the Unity launcher for packages
    that do not have an Exec entry in their corresponding desktop
    file, e.g. ubuntu-restricted-extras, wine (LP: #913756)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-01-10 09:33:53 +0000
3+++ debian/changelog 2012-01-10 21:06:25 +0000
4@@ -1,3 +1,12 @@
5+software-center (5.0.5) UNRELEASED; urgency=low
6+
7+ * lp:~gary-lasker/software-center/fix-lp913756-for-5.0:
8+ - do not offer to add an icon to the Unity launcher for packages
9+ that do not have an Exec entry in their corresponding desktop
10+ file, e.g. ubuntu-restricted-extras, wine (LP: #913756)
11+
12+ -- Gary Lasker <gary.lasker@canonical.com> Tue, 10 Jan 2012 16:00:46 -0500
13+
14 software-center (5.0.4) oneiric-proposed; urgency=low
15
16 [ Gary Lasker ]
17
18=== modified file 'softwarecenter/ui/gtk3/panes/softwarepane.py'
19--- softwarecenter/ui/gtk3/panes/softwarepane.py 2011-10-25 18:38:08 +0000
20+++ softwarecenter/ui/gtk3/panes/softwarepane.py 2012-01-10 21:06:25 +0000
21@@ -42,7 +42,8 @@
22 convert_desktop_file_to_installed_location,
23 get_file_path_from_iconname,
24 wait_for_apt_cache_ready,
25- utf8
26+ utf8,
27+ get_exec_line_from_desktop
28 )
29
30 from softwarecenter.ui.gtk3.session.viewmanager import get_viewmanager
31@@ -55,8 +56,6 @@
32 AppDetailsViewGtk as
33 AppDetailsView)
34
35-from softwarecenter.utils import is_no_display_desktop_file
36-
37 from basepane import BasePane
38
39 LOG = logging.getLogger(__name__)
40@@ -393,10 +392,13 @@
41 # we only show the prompt for apps with a desktop file
42 if not appdetails.desktop_file:
43 return
44- # do not add apps without a exec line (like wine, see #848437)
45+ # do not add apps that have no Exec entry in their desktop file
46+ # (e.g. wine, see LP: #848437 or ubuntu-restricted-extras,
47+ # see LP: #913756)
48 if (os.path.exists(appdetails.desktop_file) and
49- is_no_display_desktop_file(appdetails.desktop_file)):
50- return
51+ not get_exec_line_from_desktop(appdetails.desktop_file)):
52+ return
53+
54 self.action_bar.add_button(ActionButtons.CANCEL_ADD_TO_LAUNCHER,
55 _("Not Now"),
56 self.on_cancel_add_to_launcher,

Subscribers

People subscribed via source and target branches