Merge lp:~unity-team/unity-lens-applications/x-sru1 into lp:unity-lens-applications/xenial

[Marco Trevisan (Treviño)]

Releasing SRU1 for Xenial

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-17 15:31:32 +0000
+++ debian/changelog	2016-06-29 16:02:02 +0000
@@ -1,3 +1,10 @@
+unity-lens-applications (7.1.0+16.04.20160217.2-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Fallback from pkginfo.application_name in case app is NULL. (LP:
+    #1582433)
+
+ -- Andrea Azzarone <[e-mail]>  Wed, 29 Jun 2016 18:01:37 +0200
+
 unity-lens-applications (7.1.0+16.04.20160217.2-0ubuntu1) xenial; urgency=medium
 
   [ Marco Trevisan (Treviño), Matthias Klose ]

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-09-27 12:37:24 +0000
+++ src/daemon.vala	2016-06-29 16:02:02 +0000
@@ -1306,8 +1306,16 @@
           case Category.INSTALLED:
           case Category.APPLICATIONS:
             installed_uris.add (uri);
-            res.title =  app.get_display_name ();
-            res.comment = sanitize_binary_name (app.get_executable ());
+            if (app != null)
+            {
+              res.title =  app.get_display_name ();
+              res.comment = sanitize_binary_name (app.get_executable ());
+            }
+            else
+            {
+              res.title = pkginfo.application_name;
+            }
+
             break;
           case Category.AVAILABLE:
             available_uris.add (uri);