Merge lp:~gordallott/unity/fix-missing-icons into lp:unity

[Gord Allott]

fix for lp:830887 hopefully

[Mikkel Kamstrup Erlandsen (kamstrup)]

Gord, afaics this introduces an new stat() call *every time* we load an icon - even if we've already cached it in the icon loader.

review: Needs Fixing

[Mikkel Kamstrup Erlandsen (kamstrup)]

I'd propose fixing the icon loader - also taking into account that the icon loader can cache the fact that a file doesn't exist. I've done similarly with .desktop files in libunity's Unity.AppInfoManager.

[Mikkel Kamstrup Erlandsen (kamstrup)]

r1529 discussed on irc

review: Approve

=== modified file 'plugins/unityshell/src/IconLoader.cpp'
--- plugins/unityshell/src/IconLoader.cpp	2011-09-05 00:46:13 +0000
+++ plugins/unityshell/src/IconLoader.cpp	2011-09-14 10:24:24 +0000
@@ -507,6 +507,7 @@
   {
     LOG_WARNING(logger) << "Unable to load contents of "
                         << task->data << ": " << error;
+    task->slot(task->data, task->size, nullptr);
   }
   task->self->task_map_.erase(task->handle);
   delete task;

=== modified file 'plugins/unityshell/src/ResultRendererTile.cpp'
--- plugins/unityshell/src/ResultRendererTile.cpp	2011-09-13 22:35:13 +0000
+++ plugins/unityshell/src/ResultRendererTile.cpp	2011-09-14 10:24:24 +0000
@@ -262,12 +262,13 @@
   }
   g_free(tmp5);
 
+
   GIcon*  icon = g_icon_new_for_string(icon_name.c_str(), NULL);
   TextureContainer* container = row.renderer<TextureContainer*>();
 
   IconLoader::IconLoaderCallback slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_hint, row);
 
-  if (g_str_has_prefix(icon_name.c_str(), "http://"))
+  if (g_strrstr(icon_name.c_str(), "://"))
   {
     container->slot_handle = IconLoader::GetDefault().LoadFromURI(icon_name.c_str(), 48, slot);
   }
@@ -335,10 +336,17 @@
     container->blurred_icon = texture_blurred;
 
     NeedsRedraw.emit();
-  }
-  // Whether there is a pixbuf or not, we need to clear the slot_handle.
-  if (container)
-    container->slot_handle = 0;
+
+    if (container)
+      container->slot_handle = 0;
+  }
+  else
+  {
+    // we need to load a missing icon
+    IconLoader::IconLoaderCallback slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_name, row);
+    container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(". GThemedIcon text-x-preview", 48, slot);
+  }
+
 }