Merge lp:~donadigo/appcenter/object-creation-on-end into lp:~elementary-apps/appcenter/appcenter

[Adam Bieńkowski]

* Fix object creation in get_icon ().

Fix lp:~donadigo/appcenter/prefer-stock object creation, initialize the variable with null and then create the object if there is no icon found.

=== modified file 'src/Core/Package.vala'
--- src/Core/Package.vala	2016-06-21 17:43:40 +0000
+++ src/Core/Package.vala	2016-06-21 18:21:02 +0000
@@ -142,7 +142,7 @@
     }
 
     public GLib.Icon get_icon (uint size = 32) {
-        GLib.Icon icon = new ThemedIcon ("application-default-icon");
+        GLib.Icon? icon = null;
         uint current_size = 0;
 
         bool is_stock = false;
@@ -179,6 +179,10 @@
             }
         });
 
+        if (icon == null) {
+            icon = new ThemedIcon ("application-default-icon");
+        }
+
         return icon;
     }