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

[Gary Lasker]

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!

[lp:~gary-lasker/software-center/fix-lp913756]

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)

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-09 17:39:59 +0000
+++ debian/changelog	2012-01-10 21:03:24 +0000
@@ -9,7 +9,13 @@
   * utils/submit_review_gtk3.py:
     - fix crash when submitting a review (LP: #912855)
 
- -- Gary Lasker <[e-mail]>  Mon, 09 Jan 2012 12:34:12 -0500
+  [ Gary Lasker ]
+  * 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)
+
+ -- Gary Lasker <[e-mail]>  Tue, 10 Jan 2012 15:56:44 -0500
 
 software-center (5.1.5.1) precise; urgency=low
 

=== modified file 'softwarecenter/ui/gtk3/panes/availablepane.py'
--- softwarecenter/ui/gtk3/panes/availablepane.py	2012-01-09 21:34:32 +0000
+++ softwarecenter/ui/gtk3/panes/availablepane.py	2012-01-10 21:03:24 +0000
@@ -36,7 +36,7 @@
                                   TransactionTypes)
 from softwarecenter.paths import APP_INSTALL_PATH
 from softwarecenter.utils import (wait_for_apt_cache_ready,
-                                  is_no_display_desktop_file,
+                                  get_exec_line_from_desktop,
                                   convert_desktop_file_to_installed_location,
                                   get_file_path_from_iconname)
 from softwarecenter.db.appfilter import AppFilter
@@ -373,10 +373,11 @@
         # we only add items to the launcher that have a desktop file
         if not appdetails.desktop_file:
             return
-        # do not add apps that have NoDisplay=true in their desktop file
-        # (e.g. wine, see #848437)
+        # do not add apps that have no Exec entry in their desktop file
+        # (e.g. wine, see LP: #848437 or ubuntu-restricted-extras,
+        # see LP: #913756)
         if (os.path.exists(appdetails.desktop_file) and
-            is_no_display_desktop_file(appdetails.desktop_file)):
+            not get_exec_line_from_desktop(appdetails.desktop_file)):
             return
 
         (icon_size, icon_x, icon_y) = self._get_onscreen_icon_details_for_launcher_service(app)