Merge lp:~mhr3/unity/fix-missing-category-icons into lp:unity

[Michal Hruby]

Fixes a regression that caused the category icons to use default icons

Fixes a regression that caused the category icons to use default icons.

[Mirco Müller (macslow)]

good catch... approved

review: Approve

=== modified file 'plugins/unityshell/src/IconTexture.cpp'
--- plugins/unityshell/src/IconTexture.cpp	2012-03-31 23:41:30 +0000
+++ plugins/unityshell/src/IconTexture.cpp	2012-04-06 09:40:29 +0000
@@ -66,7 +66,7 @@
     _loading(false),
     _opacity(1.0f)
 {
-  if (!defer_icon_loading)
+  if (!icon_name.empty () && !defer_icon_loading)
     LoadIcon();
 }