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

Proposed by Gary Lasker
Status: Merged
Merged at revision: 2648
Proposed branch: lp:~gary-lasker/software-center/fix-lp913756
Merge into: lp:software-center
Diff against target: 46 lines (+12/-5)
2 files modified
debian/changelog (+7/-1)
softwarecenter/ui/gtk3/panes/availablepane.py (+5/-4)
To merge this branch: bzr merge lp:~gary-lasker/software-center/fix-lp913756
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+88118@code.launchpad.net

Description of the change

This branch fixes bug 913756, where an icon is added to the Unity launcher for 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 add to Unity launcher is skipped for that package. This seems the correct behavior.

Thanks!

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

* lp:~gary-lasker/software-center/fix-lp913756:
  - do not 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-09 17:39:59 +0000
3+++ debian/changelog 2012-01-10 21:03:24 +0000
4@@ -9,7 +9,13 @@
5 * utils/submit_review_gtk3.py:
6 - fix crash when submitting a review (LP: #912855)
7
8- -- Gary Lasker <gary.lasker@canonical.com> Mon, 09 Jan 2012 12:34:12 -0500
9+ [ Gary Lasker ]
10+ * lp:~gary-lasker/software-center/fix-lp913756:
11+ - do not add an icon to the Unity launcher for packages that do
12+ not have an Exec entry in their corresponding desktop file,
13+ e.g. ubuntu-restricted-extras, wine (LP: #913756)
14+
15+ -- Gary Lasker <gary.lasker@canonical.com> Tue, 10 Jan 2012 15:56:44 -0500
16
17 software-center (5.1.5.1) precise; urgency=low
18
19
20=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
21--- softwarecenter/ui/gtk3/panes/availablepane.py 2012-01-09 21:34:32 +0000
22+++ softwarecenter/ui/gtk3/panes/availablepane.py 2012-01-10 21:03:24 +0000
23@@ -36,7 +36,7 @@
24 TransactionTypes)
25 from softwarecenter.paths import APP_INSTALL_PATH
26 from softwarecenter.utils import (wait_for_apt_cache_ready,
27- is_no_display_desktop_file,
28+ get_exec_line_from_desktop,
29 convert_desktop_file_to_installed_location,
30 get_file_path_from_iconname)
31 from softwarecenter.db.appfilter import AppFilter
32@@ -373,10 +373,11 @@
33 # we only add items to the launcher that have a desktop file
34 if not appdetails.desktop_file:
35 return
36- # do not add apps that have NoDisplay=true in their desktop file
37- # (e.g. wine, see #848437)
38+ # do not add apps that have no Exec entry in their desktop file
39+ # (e.g. wine, see LP: #848437 or ubuntu-restricted-extras,
40+ # see LP: #913756)
41 if (os.path.exists(appdetails.desktop_file) and
42- is_no_display_desktop_file(appdetails.desktop_file)):
43+ not get_exec_line_from_desktop(appdetails.desktop_file)):
44 return
45
46 (icon_size, icon_x, icon_y) = self._get_onscreen_icon_details_for_launcher_service(app)

Subscribers

People subscribed via source and target branches