Merge lp:~gordallott/unity/unity.fix-814619 into lp:unity

[Gord Allott]

adds a check on null pointers in SetIconName
hopefully fixes lp:814619

[Neil J. Patel (njpatel)]

review: Approve

=== modified file 'plugins/unityshell/src/SimpleLauncherIcon.cpp'
--- plugins/unityshell/src/SimpleLauncherIcon.cpp	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/SimpleLauncherIcon.cpp	2011-07-26 12:58:06 +0000
@@ -17,6 +17,7 @@
  * Authored by: Jason Smith <[e-mail]>
  */
 
+#include <NuxCore/Logger.h>
 #include "Nux/Nux.h"
 #include "Nux/BaseWindow.h"
 
@@ -24,6 +25,11 @@
 #include "Launcher.h"
 #include "PluginAdapter.h"
 
+namespace
+{
+  nux::logging::Logger logger("unity.dash.CategoryViewGrid");
+}
+
 SimpleLauncherIcon::SimpleLauncherIcon(Launcher* IconManager)
   : LauncherIcon(IconManager)
   , icon_(0)
@@ -96,7 +102,16 @@
 
 void SimpleLauncherIcon::SetIconName(const char* name)
 {
-  icon_name_ = name;
+  if (name == NULL)
+  {
+    LOG_WARNING(logger) << "attempted to set NULL as IconName";
+    icon_name_.clear();
+  }
+  else
+  {
+    icon_name_ = name;
+  }
+
   ReloadIcon();
 }