Merge lp:~gordallott/unity/fix-music-lens-causing-crashers into lp:unity

[Gord Allott]

this should fix the music lens bug, what seems to have been happening is that tim added some code that resets the handle_counter_ in the IconLoader, but it was watching the wrong container to know when to reset the handle_counter_, which caused handles to get overridden, which caused the wrong slot to get disconnected when we call disconnectbyhandle in ResultRenderer

and figuring that out has stolen some of my soul.

[Mikkel Kamstrup Erlandsen (kamstrup)]

I can confirm that Unity no longer crashes (even with the slow-icon-loading-patch). Codewise I think it looks ok, but I also think we may need a second opinion as I don't feel I grok this 100%

review: Approve

=== modified file 'plugins/unityshell/src/IconLoader.cpp'
--- plugins/unityshell/src/IconLoader.cpp	2011-09-14 09:58:44 +0000
+++ plugins/unityshell/src/IconLoader.cpp	2011-09-23 15:12:36 +0000
@@ -479,7 +479,8 @@
   if (queue_empty)
   {
     idle_id_ = 0;
-    handle_counter_ = 0;
+    if (task_map_.empty())
+      handle_counter_ = 0;
   }
 
   return !queue_empty;

=== modified file 'plugins/unityshell/src/ResultRendererTile.cpp'
--- plugins/unityshell/src/ResultRendererTile.cpp	2011-09-21 11:25:04 +0000
+++ plugins/unityshell/src/ResultRendererTile.cpp	2011-09-23 15:12:36 +0000
@@ -343,7 +343,7 @@
     if (container)
       container->slot_handle = 0;
   }
-  else
+  else if (container)
   {
     // we need to load a missing icon
     IconLoader::IconLoaderCallback slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_name, row);