Merge lp:~bregma/libertine/list-app-desktop-file into lp:libertine

[Stephen M. Webb]

libertine-container-manager: added .desktop file name when listing contained app launchers

Added the actual .desktop file to the information returned when listin app launchers from libertine-container-manager.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:154
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/84/
Executed test runs:
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/981/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/84/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Seems reasonable.

review: Approve

=== modified file 'python/libertine/AppDiscovery.py'
--- python/libertine/AppDiscovery.py	2015-12-22 04:20:05 +0000
+++ python/libertine/AppDiscovery.py	2016-01-04 17:43:32 +0000
@@ -126,7 +126,8 @@
 
 class AppInfo(object):
 
-    def __init__(self, config_entry, icon_cache):
+    def __init__(self, desktop_file_name, config_entry, icon_cache):
+        self.desktop_file_name = desktop_file_name
         self.name = config_entry.get('Name')
         if not self.name:
             raise RuntimeError("required Name attribute is missing")
@@ -141,6 +142,7 @@
     def __str__(self):
         with io.StringIO() as ostr:
             print(self.name, file=ostr)
+            print("  desktop_file={}".format(self.desktop_file_name), file=ostr)
             print("  no-display={}".format(self.no_display), file=ostr)
             print("  exec='{}'".format(self.exec_line), file=ostr)
             for icon in self.icons:
@@ -184,7 +186,7 @@
             desktop_file.read(desktop_file_name)
             desktop_entry = desktop_file['Desktop Entry']
             if desktop_file_is_showable(desktop_entry):
-                    yield AppInfo(desktop_entry, icon_cache)
+                    yield AppInfo(desktop_file_name, desktop_entry, icon_cache)
         except Exception as ex:
             print("error processing {}: {}".format(desktop_file_name, ex), file=sys.stderr)