Merge lp:~brandontschaefer/unity/default-icon-for-launcher-5.0 into lp:unity/5.0

[Brandon Schaefer]

If no icon is found then use the default one. This will cause all blank icons to be a '?' icon.

If no icon is found then use the default one. This will cause all blank icons to be a '?' icon.

[Marco Trevisan (Treviño) (3v1n0)]

Fine!

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1423/console reported an error when processing this lp:~brandontschaefer/unity/default-icon-for-launcher-5.0 branch.
Not merging it.

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2012-05-24 17:14:18 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2012-09-25 17:40:51 +0000
@@ -43,6 +43,11 @@
 namespace launcher
 {
 
+namespace
+{
+  const std::string DEFAULT_ICON = "application-default-icon";
+}
+
 NUX_IMPLEMENT_OBJECT_TYPE(BamfLauncherIcon);
 
 BamfLauncherIcon::BamfLauncherIcon(BamfApplication* app)
@@ -61,7 +66,7 @@
   glib::String icon(bamf_view_get_icon(bamf_view));
 
   tooltip_text = BamfName();
-  icon_name = icon.Str();
+  icon_name = (icon ? icon.Str() : DEFAULT_ICON);
   SetIconType(TYPE_APPLICATION);
 
   if (IsSticky())