Merge lp:~nick-dedekind/unity/multi-instance-icon-loader into lp:unity

[Nick Dedekind]

Added multi-instance Icon Loaders with management.

Added multi-instance Icon Loaders with management.

Icon loaders can be created as requested and deleted when the last reference is removed. This allows better control of internal caching in areas such as dash previews.

All icon loading now asynchronous.
Refactored IconLoaderTask into class.
Refactored IconLoaderTask to remove "shadow tasks" (now adds a slot to existing tasks).
Added task thread-safe ref counting for loader instance deletion during IO scheduled job processing.

[Nick Dedekind (nick-dedekind)]

Needs unit test.

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

TODO:
o Refactoring to remove sync/async from single call.
o Refactor IconLoaderTask into class.
o Tasks need thread-safe ref counting for loader instance deletion during IO scheduled job processing.

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

All icon loading now asynchronous.
Refactored IconLoaderTask into class.
Refactored IconLoaderTask to remove "shadow tasks" (now adds a slot to existing tasks).
Added task thread-safe ref counting for loader instance deletion during IO scheduled job processing.

[Michal Hruby (mhr3)]

1136 + timer_.reset(new glib::Timeout(0, sigc::mem_fun(this, &IconLoaderImpl::Iteration), glib::Source::Priority::LOW));

Why the change to Timeout instead of Idle?

2138 + InvokeSlot();
2139 +
2140 + if (!impl_->coalesce_timeout_)
2141 + {

We want to dispatch the slots in the coalesce callback (as the dispatch will often cause a QueueDraw which has higher prio than finishing other loader tasks - ie causes "finish, redraw, finish, redraw, finish, redraw" vs "finish, finish, finish, redraw").

1103 + task_slot_map_[handle] = iter->second;

Am I right in thinking these elements in the map will "leak"?

review: Needs Fixing

[lp:~nick-dedekind/unity/multi-instance-icon-loader]

2827. By Nick Dedekind on 2013-01-30

Merge with trunk

2828. By Nick Dedekind on 2013-01-30

Invoke icon slot on coalesce.

2829. By Nick Dedekind on 2013-01-30

Fixed referencing issue.

[Nick Dedekind (nick-dedekind)]

> 1136 + timer_.reset(new glib::Timeout(0, sigc::mem_fun(this,
> &IconLoaderImpl::Iteration), glib::Source::Priority::LOW));
>
> Why the change to Timeout instead of Idle?
>
> 2138 + InvokeSlot();
> 2139 +
> 2140 + if (!impl_->coalesce_timeout_)
> 2141 + {
>
> We want to dispatch the slots in the coalesce callback (as the dispatch will
> often cause a QueueDraw which has higher prio than finishing other loader
> tasks - ie causes "finish, redraw, finish, redraw, finish, redraw" vs "finish,
> finish, finish, redraw").
>

Done. Reduced coalesce time to 200ms.

> 1103 + task_slot_map_[handle] = iter->second;
>
> Am I right in thinking these elements in the map will "leak"?

These should be released in IconLoaderImpl::DisconnectHandle when the slot is invoked.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2829
http://jenkins.qa.ubuntu.com/job/unity-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/11/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

2829. By Nick Dedekind on 2013-01-30

Fixed referencing issue.

2828. By Nick Dedekind on 2013-01-30

Invoke icon slot on coalesce.

2827. By Nick Dedekind on 2013-01-30

Merge with trunk

2826. By Nick Dedekind on 2012-10-22

IconLoader code refactor.

2825. By Nick Dedekind on 2012-10-17

Merge with trunk

2824. By Nick Dedekind on 2012-10-11

Added multi-instance icon loaders management.

2823. By Nick Dedekind on 2012-10-11

Fixed dash standalone seg-fault on close.

=== modified file 'dash/ResultRendererTile.cpp'
--- dash/ResultRendererTile.cpp	2012-12-13 14:26:56 +0000
+++ dash/ResultRendererTile.cpp	2013-01-30 14:41:22 +0000
@@ -262,7 +262,7 @@
   glib::Object<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);
+  icon_loader::IconLoaderCallback slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_hint, row);
 
   if (icon.IsType(G_TYPE_ICON))
   {
@@ -380,7 +380,7 @@
   else if (container)
   {
     // we need to load a missing icon
-    IconLoader::IconLoaderCallback slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_name, row);
+    icon_loader::IconLoaderCallback slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_name, row);
     container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(". GThemedIcon text-x-preview", max_width, max_height, slot);
   }
 }

=== modified file 'dash/StandaloneDash.cpp'
--- dash/StandaloneDash.cpp	2012-11-29 10:19:01 +0000
+++ dash/StandaloneDash.cpp	2013-01-30 14:41:22 +0000
@@ -83,7 +83,7 @@
 
 int main(int argc, char **argv)
 {
-  nux::WindowThread* wt = NULL;
+  std::unique_ptr<nux::WindowThread> wt;
 
   gtk_init (&argc, &argv);
 
@@ -99,16 +99,15 @@
   unity::panel::Style panel_style;
 
   TestRunner *test_runner = new TestRunner ();
-  wt = nux::CreateGUIThread(TEXT("Unity Dash"),
+  wt.reset(nux::CreateGUIThread(TEXT("Unity Dash"),
                             WIDTH, HEIGHT,
                             0,
                             &TestRunner::InitWindowThread,
-                            test_runner);
+                            test_runner));
 
   nux::NuxTimerTickSource tick_source;
   nux::animation::AnimationController animation_controller(tick_source);
 
   wt->Run (NULL);
-  delete wt;
   return 0;
 }

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2013-01-28 23:57:38 +0000
+++ unity-shared/CMakeLists.txt	2013-01-30 14:41:22 +0000
@@ -30,6 +30,7 @@
      GraphicsUtils.cpp
      IMTextEntry.cpp
      IconLoader.cpp
+     IconLoaderTask.cpp
      IconRenderer.cpp
      IconTexture.cpp
      IconTextureSource.cpp

=== modified file 'unity-shared/CoverArt.cpp'
--- unity-shared/CoverArt.cpp	2012-12-17 21:30:27 +0000
+++ unity-shared/CoverArt.cpp	2013-01-30 14:41:22 +0000
@@ -22,12 +22,11 @@
  */
 
 #include "CoverArt.h"
-#include "unity-shared/IntrospectableWrappers.h"
-#include "unity-shared/CairoTexture.h"
+#include "IntrospectableWrappers.h"
+#include "CairoTexture.h"
 #include <NuxCore/Logger.h>
 #include <Nux/VLayout.h>
 #include "DashStyle.h"
-#include "IconLoader.h"
 #include "PreviewStyle.h"
 
 namespace unity
@@ -54,6 +53,7 @@
   , stretch_image_(false)
   , waiting_(false)
   , rotation_(0.0)
+  , icon_loader_(IconLoader::Get("cover-art"))
 {
   SetupViews();
 }
@@ -63,9 +63,9 @@
   if (overlay_text_)
     overlay_text_->UnReference();
 
-  if (slot_handle_ > 0)
+  if (icon_loader_ && slot_handle_ > 0)
   {
-    IconLoader::GetDefault().DisconnectHandle(slot_handle_);
+    icon_loader_->DisconnectHandle(slot_handle_);
     slot_handle_ = 0;
   }
 
@@ -89,10 +89,15 @@
 void CoverArt::SetImage(std::string const& image_hint)
 { 
   StopWaiting();
+  if (!icon_loader_)
+  {
+    SetNoImageAvailable();
+    return;    
+  }
 
   if (slot_handle_ > 0)
   {
-    IconLoader::GetDefault().DisconnectHandle(slot_handle_);
+    icon_loader_->DisconnectHandle(slot_handle_);
     slot_handle_ = 0;
   }
 
@@ -107,7 +112,7 @@
   if (bLoadTexture)
   {
     StartWaiting();
-    slot_handle_ = IconLoader::GetDefault().LoadFromGIconString(image_hint, -1, -1, sigc::mem_fun(this, &CoverArt::TextureLoaded));
+    slot_handle_ = icon_loader_->LoadFromGIconString(image_hint, -1, -1, sigc::mem_fun(this, &CoverArt::TextureLoaded));
   }
   else if (!image_hint.empty())
   {
@@ -115,12 +120,12 @@
     if (icon.IsType(G_TYPE_ICON))
     {
       StartWaiting();
-      slot_handle_ = IconLoader::GetDefault().LoadFromGIconString(image_hint, ICON_SIZE, ICON_SIZE, sigc::mem_fun(this, &CoverArt::IconLoaded));
+      slot_handle_ = icon_loader_->LoadFromGIconString(image_hint, ICON_SIZE, ICON_SIZE, sigc::mem_fun(this, &CoverArt::IconLoaded));
     }
     else
     {
       StartWaiting();
-      slot_handle_ = IconLoader::GetDefault().LoadFromIconName(image_hint, ICON_SIZE, ICON_SIZE, sigc::mem_fun(this, &CoverArt::IconLoaded));
+      slot_handle_ = icon_loader_->LoadFromIconName(image_hint, ICON_SIZE, ICON_SIZE, sigc::mem_fun(this, &CoverArt::IconLoaded));
     }
   }
   else

=== modified file 'unity-shared/CoverArt.h'
--- unity-shared/CoverArt.h	2012-12-14 12:14:34 +0000
+++ unity-shared/CoverArt.h	2013-01-30 14:41:22 +0000
@@ -29,8 +29,9 @@
 #include <UnityCore/ApplicationPreview.h>
 #include <UnityCore/GLibSource.h>
 #include <NuxCore/ObjectPtr.h>
-#include "unity-shared/StaticCairoText.h"
-#include "unity-shared/Introspectable.h"
+#include "StaticCairoText.h"
+#include "Introspectable.h"
+#include "IconLoader.h"
 #include "ThumbnailGenerator.h"
 
 namespace unity
@@ -99,6 +100,7 @@
 
   typedef std::unique_ptr<nux::AbstractPaintLayer> LayerPtr;
   LayerPtr bg_layer_;
+  IconLoader::Ptr icon_loader_;
 };
 
 }

=== modified file 'unity-shared/IconLoader.cpp'
--- unity-shared/IconLoader.cpp	2013-01-17 16:11:14 +0000
+++ unity-shared/IconLoader.cpp	2013-01-30 14:41:22 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
-* Copyright (C) 2010, 2011 Canonical Ltd
+* Copyright (C) 2010-2012 Canonical Ltd
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 3 as
@@ -15,767 +15,45 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 * Authored by: Neil Jagdish Patel <[e-mail]>
+               Nick Dedekind <[e-mail]>
 */
 
 #include "IconLoader.h"
+#include "IconLoaderImpl.h"
+#include "IconLoaderTask.h"
 #include "config.h"
 
 #include <queue>
 #include <sstream>
-#include <boost/algorithm/string.hpp>
-#include <unity-protocol.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
 
 #include <Nux/Nux.h>
 #include <NuxCore/Logger.h>
-#include <NuxGraphics/CairoGraphics.h>
 #include <UnityCore/GLibSource.h>
 #include <UnityCore/GLibSignal.h>
 
 #include "unity-shared/Timer.h"
 
+using namespace unity::icon_loader;
+
 namespace unity
 {
 DECLARE_LOGGER(logger, "unity.iconloader");
 namespace
 {
 const int MIN_ICON_SIZE = 2;
-const int RIBBON_PADDING = 2;
+
+std::map<std::string, IconLoader*> icon_loaders;
 }
 
-class IconLoader::Impl
+namespace icon_loader
 {
-public:
-  // The Handle typedef is used to explicitly indicate which integers are
-  // infact our opaque handles.
-  typedef int Handle;
-  static const int FONT_SIZE = 8;
-  static const int MIN_FONT_SIZE = 5;
-
-  Impl();
-
-  Handle LoadFromIconName(std::string const& icon_name,
-                          int max_width,
-                          int max_height,
-                          IconLoaderCallback slot);
-
-  Handle LoadFromGIconString(std::string const& gicon_string,
-                             int max_width,
-                             int max_height,
-                             IconLoaderCallback slot);
-
-  Handle LoadFromFilename(std::string const& filename,
-                          int max_width,
-                          int max_height,
-                          IconLoaderCallback slot);
-
-  Handle LoadFromURI(std::string const& uri,
-                     int max_width,
-                     int max_height,
-                     IconLoaderCallback slot);
-
-  void DisconnectHandle(Handle handle);
-
-  static void CalculateTextHeight(int* width, int* height);
-
-private:
-
-  enum IconLoaderRequestType
-  {
-    REQUEST_TYPE_ICON_NAME = 0,
-    REQUEST_TYPE_GICON_STRING,
-    REQUEST_TYPE_URI,
-  };
-
-  struct IconLoaderTask
-  {
-    typedef std::shared_ptr<IconLoaderTask> Ptr;
-
-    IconLoaderRequestType type;
-    std::string data;
-    int max_width;
-    int max_height;
-    std::string key;
-    IconLoaderCallback slot;
-    Handle handle;
-    Impl* impl;
-    GtkIconInfo* icon_info;
-    bool no_cache;
-    int helper_handle;
-    glib::Object<GdkPixbuf> result;
-    glib::Error error;
-    std::list<IconLoaderTask::Ptr> shadow_tasks;
-    unsigned idle_id;
-
-    IconLoaderTask(IconLoaderRequestType type_,
-                   std::string const& data_,
-                   int max_width_,
-                   int max_height_,
-                   std::string const& key_,
-                   IconLoaderCallback slot_,
-                   Handle handle_,
-                   Impl* self_)
-      : type(type_), data(data_), max_width(max_width_)
-      , max_height(max_height_), key(key_)
-      , slot(slot_), handle(handle_), impl(self_)
-      , icon_info(nullptr), no_cache(false), helper_handle(0), idle_id(0)
-      {}
-
-    ~IconLoaderTask()
-    {
-      if (icon_info)
-        ::gtk_icon_info_free(icon_info);
-      if (helper_handle != 0)
-        impl->DisconnectHandle(helper_handle);
-      if (idle_id != 0)
-        g_source_remove(idle_id);
-    }
-
-    void InvokeSlot()
-    {
-      if (slot)
-        slot(data, max_width, max_height, result);
-
-      // notify shadow tasks
-      for (auto shadow_task : shadow_tasks)
-      {
-        if (shadow_task->slot)
-          shadow_task->slot(shadow_task->data,
-                            shadow_task->max_width,
-                            shadow_task->max_height,
-                            result);
-
-        impl->task_map_.erase(shadow_task->handle);
-      }
-
-      shadow_tasks.clear();
-    }
-
-    bool Process()
-    {
-      // Check the cache again, as previous tasks might have wanted the same
-      if (impl->CacheLookup(key, data, max_width, max_height, slot))
-        return true;
-
-      LOG_DEBUG(logger) << "Processing  " << data << " at size " << max_height;
-
-      // Rely on the compiler to tell us if we miss a new type
-      switch (type)
-      {
-        case REQUEST_TYPE_ICON_NAME:
-          return ProcessIconNameTask();
-        case REQUEST_TYPE_GICON_STRING:
-          return ProcessGIconTask();
-        case REQUEST_TYPE_URI:
-          return ProcessURITask();
-      }
-
-      LOG_WARNING(logger) << "Request type " << type
-                          << " is not supported (" << data
-                          << " " << max_width << "x" << max_height << ")";
-      result = nullptr;
-      InvokeSlot();
-
-      return true;
-    }
-
-    bool ProcessIconNameTask()
-    {
-      int size = max_height < 0 ? max_width : (max_width < 0 ? max_height : MIN(max_height, max_width));
-      GtkIconInfo* info = ::gtk_icon_theme_lookup_icon(impl->theme_, data.c_str(),
-                                                       size, static_cast<GtkIconLookupFlags>(0));
-      if (info)
-      {
-        icon_info = info;
-        PushSchedulerJob();
-
-        return false;
-      }
-      else
-      {
-        LOG_WARNING(logger) << "Unable to load icon " << data
-                            << " at size " << size;
-      }
-
-      result = nullptr;
-      InvokeSlot();
-
-      return true;
-    }
-
-    bool ProcessGIconTask()
-    {
-      glib::Error error;
-      glib::Object<GIcon> icon(::g_icon_new_for_string(data.c_str(), &error));
-      int size = max_height < 0 ? max_width : (max_width < 0 ? max_height : MIN(max_height, max_width));
-
-      if (icon.IsType(UNITY_PROTOCOL_TYPE_ANNOTATED_ICON))
-      {
-        glib::Object<UnityProtocolAnnotatedIcon> anno(glib::object_cast<UnityProtocolAnnotatedIcon>(icon));
-        GIcon* base_icon = unity_protocol_annotated_icon_get_icon(anno);
-        glib::String gicon_string(g_icon_to_string(base_icon));
-
-        // ensure that annotated icons aren't cached by the IconLoader
-        no_cache = true;
-
-        auto helper_slot = sigc::bind(sigc::mem_fun(this, &IconLoaderTask::BaseIconLoaded), anno);
-        int base_icon_width, base_icon_height;
-        if (unity_protocol_annotated_icon_get_use_small_icon(anno))
-        {
-          // FIXME: although this pretends to be generic, we're just making
-          // sure that icons requested to have 96px will be 64
-          base_icon_width = max_width > 0 ? max_width * 2 / 3 : max_width;
-          base_icon_height = max_height > 0 ? max_height * 2 / 3 : max_height;
-        }
-        else
-        {
-          base_icon_width = max_width > 0 ? max_width - RIBBON_PADDING * 2 : -1;
-          base_icon_height = base_icon_width < 0 ? max_height - RIBBON_PADDING *2 : max_height;
-        }
-        helper_handle = impl->LoadFromGIconString(gicon_string.Str(),
-                                                  base_icon_width,
-                                                  base_icon_height,
-                                                  helper_slot);
-
-        return false;
-      }
-      else if (icon.IsType(G_TYPE_FILE_ICON))
-      {
-        // [trasfer none]
-        GFile* file = ::g_file_icon_get_file(G_FILE_ICON(icon.RawPtr()));
-        glib::String uri(::g_file_get_uri(file));
-
-        type = REQUEST_TYPE_URI;
-        data = uri.Str();
-
-        return ProcessURITask();
-      }
-      else if (icon.IsType(G_TYPE_ICON))
-      {
-        GtkIconInfo* info = ::gtk_icon_theme_lookup_by_gicon(impl->theme_, icon, size,
-                                                             static_cast<GtkIconLookupFlags>(0));
-        if (info)
-        {
-          icon_info = info;
-          PushSchedulerJob();
-
-          return false;
-        }
-        else
-        {
-          // There is some funkiness in some programs where they install
-          // their icon to /usr/share/icons/hicolor/apps/, but they
-          // name the Icon= key as `foo.$extension` which breaks loading
-          // So we can try and work around that here.
-
-          if (boost::iends_with(data, ".png") ||
-              boost::iends_with(data, ".xpm") ||
-              boost::iends_with(data, ".gif") ||
-              boost::iends_with(data, ".jpg"))
-          {
-            data = data.substr(0, data.size() - 4);
-            return ProcessIconNameTask();
-          }
-          else
-          {
-            LOG_WARNING(logger) << "Unable to load icon " << data
-                                << " at size " << size;
-          }
-        }
-      }
-      else
-      {
-        LOG_WARNING(logger) << "Unable to load icon " << data
-                            << " at size " << size << ": " << error;
-      }
-
-      InvokeSlot();
-      return true;
-    }
-
-    bool ProcessURITask()
-    {
-      PushSchedulerJob();
-
-      return false;
-    }
-
-    void CategoryIconLoaded(std::string const& base_icon_string,
-                            int max_width, int max_height,
-                            glib::Object<GdkPixbuf> const& category_pixbuf,
-                            glib::Object<UnityProtocolAnnotatedIcon> const& anno_icon)
-    {
-      helper_handle = 0;
-      bool has_emblem = category_pixbuf;
-
-      const gchar* detail_text = unity_protocol_annotated_icon_get_ribbon(anno_icon);
-      if (detail_text)
-      {
-        const int SHADOW_BOTTOM_PADDING = 2;
-        const int SHADOW_SIDE_PADDING = 1;
-        const int EMBLEM_PADDING = 2;
-        int icon_w = gdk_pixbuf_get_width(result);
-        int icon_h = gdk_pixbuf_get_height(result);
-
-        int max_font_height;
-        CalculateTextHeight(nullptr, &max_font_height);
-
-        // FIXME: design wants the tags 2px wider than the original icon
-        int pixbuf_width = icon_w;
-        int pixbuf_height = max_font_height * 5 / 4 + SHADOW_BOTTOM_PADDING;
-        if (pixbuf_height > icon_h) pixbuf_height = icon_h;
-
-        nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32,
-                                          pixbuf_width, pixbuf_height);
-        std::shared_ptr<cairo_t> cr(cairo_graphics.GetContext(), cairo_destroy);
-
-        glib::Object<PangoLayout> layout;
-        PangoContext* pango_context = NULL;
-        GdkScreen* screen = gdk_screen_get_default(); // not ref'ed
-        glib::String font;
-        int dpi = -1;
-
-        g_object_get(gtk_settings_get_default(), "gtk-font-name", &font, NULL);
-        g_object_get(gtk_settings_get_default(), "gtk-xft-dpi", &dpi, NULL);
-        cairo_set_font_options(cr.get(), gdk_screen_get_font_options(screen));
-        layout = pango_cairo_create_layout(cr.get());
-        std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font), pango_font_description_free);
-        pango_font_description_set_weight(desc.get(), PANGO_WEIGHT_BOLD);
-        int font_size = FONT_SIZE;
-        pango_font_description_set_size (desc.get(), font_size * PANGO_SCALE);
-
-        pango_layout_set_font_description(layout, desc.get());
-        pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-
-        double belt_w = static_cast<double>(pixbuf_width - SHADOW_SIDE_PADDING * 2);
-        double belt_h = static_cast<double>(pixbuf_height - SHADOW_BOTTOM_PADDING);
-
-        double max_text_width = belt_w;
-        if (has_emblem)
-        {
-          const double CURVE_MID_X = 0.4 * (belt_h / 20.0 * 24.0);
-          const int category_pb_w = gdk_pixbuf_get_width(category_pixbuf);
-          max_text_width = belt_w - CURVE_MID_X - category_pb_w - EMBLEM_PADDING;
-        }
-
-        pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
-        pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
-
-        glib::String escaped_text(g_markup_escape_text(detail_text, -1));
-        pango_layout_set_markup(layout, escaped_text, -1);
-
-        pango_context = pango_layout_get_context(layout);  // is not ref'ed
-        pango_cairo_context_set_font_options(pango_context,
-                                             gdk_screen_get_font_options(screen));
-        pango_cairo_context_set_resolution(pango_context,
-                                           dpi == -1 ? 96.0f : dpi/(float) PANGO_SCALE);
-        pango_layout_context_changed(layout);
-
-        // find proper font size
-        int text_width, text_height;
-        pango_layout_get_pixel_size(layout, &text_width, nullptr);
-        while (text_width > max_text_width && font_size > MIN_FONT_SIZE)
-        {
-          font_size--;
-          pango_font_description_set_size (desc.get(), font_size * PANGO_SCALE);
-          pango_layout_set_font_description(layout, desc.get());
-          pango_layout_get_pixel_size(layout, &text_width, nullptr);
-        }
-        pango_layout_set_width(layout, static_cast<int>(max_text_width * PANGO_SCALE));
-
-        cairo_set_operator(cr.get(), CAIRO_OPERATOR_CLEAR);
-        cairo_paint(cr.get());
-
-        cairo_set_operator(cr.get(), CAIRO_OPERATOR_OVER);
-
-        // this should be #dd4814
-        const double ORANGE_R = 0.86666;
-        const double ORANGE_G = 0.28235;
-        const double ORANGE_B = 0.07843;
-
-        // translate to make space for the shadow
-        cairo_save(cr.get());
-        cairo_translate(cr.get(), 1.0, 1.0);
-
-        cairo_set_source_rgba(cr.get(), ORANGE_R, ORANGE_G, ORANGE_B, 1.0);
-
-        // base ribbon
-        cairo_rectangle(cr.get(), 0.0, 0.0, belt_w, belt_h);
-        cairo_fill_preserve(cr.get());
-
-        // hightlight on left edge
-        std::shared_ptr<cairo_pattern_t> pattern(
-            cairo_pattern_create_linear(0.0, 0.0, belt_w, 0.0),
-            cairo_pattern_destroy);
-        cairo_pattern_add_color_stop_rgba(pattern.get(), 0.0, 1.0, 1.0, 1.0, 0.235294);
-        cairo_pattern_add_color_stop_rgba(pattern.get(), 0.02, 1.0, 1.0, 1.0, 0.0);
-        // and on right one
-        if (!has_emblem)
-        {
-          cairo_pattern_add_color_stop_rgba(pattern.get(), 0.98, 1.0, 1.0, 1.0, 0.0);
-          cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 1.0, 1.0, 1.0, 0.235294);
-        }
-        cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 1.0, 1.0, 1.0, 0.0);
-
-        cairo_set_source(cr.get(), pattern.get());
-        cairo_fill(cr.get());
-
-        if (has_emblem)
-        {
-          // size of the emblem
-          const int category_pb_w = gdk_pixbuf_get_width(category_pixbuf);
-          const int category_pb_h = gdk_pixbuf_get_height(category_pixbuf);
-
-          // control and end points for the two bezier curves
-          const double CURVE_X_MULT = belt_h / 20.0 * 24.0;
-          const double CURVE_CP1_X = 0.25 * CURVE_X_MULT;
-          const double CURVE_CP2_X = 0.2521 * CURVE_X_MULT;
-          const double CURVE_CP3_X = 0.36875 * CURVE_X_MULT;
-          const double CURVE_CP4_X = 0.57875 * CURVE_X_MULT;
-          const double CURVE_CP5_X = 0.705417 * CURVE_X_MULT;
-          const double CURVE_CP6_X = 0.723333 * CURVE_X_MULT;
-          const double CURVE_CP7_X = 0.952375 * CURVE_X_MULT;
-
-          const double CURVE_Y1 = 0.9825;
-          const double CURVE_Y2 = 0.72725;
-          const double CURVE_Y3 = 0.27275;
-
-          const double CURVE_START_X = belt_w - category_pb_w - CURVE_CP5_X - EMBLEM_PADDING;
-          //const double CURVE_END_X = CURVE_START_X + CURVE_X_MULT;
-
-          cairo_set_source_rgba(cr.get(), 1.0, 1.0, 1.0, 1.0);
-
-          // paint the curved area
-          cairo_move_to(cr.get(), CURVE_START_X, belt_h);
-          cairo_curve_to(cr.get(), CURVE_START_X + CURVE_CP1_X, belt_h,
-                                   CURVE_START_X + CURVE_CP2_X, CURVE_Y1 * belt_h,
-                                   CURVE_START_X + CURVE_CP3_X, CURVE_Y2 * belt_h);
-          cairo_line_to(cr.get(), CURVE_START_X + CURVE_CP4_X, CURVE_Y3 * belt_h);
-          cairo_curve_to(cr.get(), CURVE_START_X + CURVE_CP5_X, 0.0,
-                                   CURVE_START_X + CURVE_CP6_X, 0.0,
-                                   CURVE_START_X + CURVE_CP7_X, 0.0);
-          cairo_line_to(cr.get(), belt_w, 0.0);
-          cairo_line_to(cr.get(), belt_w, belt_h);
-          cairo_close_path(cr.get());
-          cairo_fill(cr.get());
-
-          // and the highlight
-          pattern.reset(cairo_pattern_create_linear(CURVE_START_X, 0.0, belt_w, 0.0),
-                        cairo_pattern_destroy);
-          cairo_pattern_add_color_stop_rgba(pattern.get(), 0.0, 1.0, 1.0, 1.0, 0.0);
-          cairo_pattern_add_color_stop_rgba(pattern.get(), 0.95, 1.0, 1.0, 1.0, 0.0);
-          cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 0.0, 0.0, 0.0, 0.235294);
-          cairo_set_source(cr.get(), pattern.get());
-          cairo_rectangle(cr.get(), CURVE_START_X, 0.0, belt_w - CURVE_START_X, belt_h);
-          cairo_fill(cr.get());
-
-          // paint the emblem
-          double category_pb_x = belt_w - category_pb_w - EMBLEM_PADDING - 1;
-          gdk_cairo_set_source_pixbuf(cr.get(), category_pixbuf,
-                                      category_pb_x, (belt_h - category_pb_h) / 2);
-          cairo_paint(cr.get());
-        }
-
-        // paint the text
-        cairo_set_source_rgba(cr.get(), 1.0, 1.0, 1.0, 1.0);
-        cairo_move_to(cr.get(), 0.0, belt_h / 2);
-        pango_layout_get_pixel_size(layout, nullptr, &text_height);
-        // current point is now in the middle of the stripe, need to translate
-        // it, so that the text is centered
-        cairo_rel_move_to(cr.get(), 0.0, text_height / -2.0);
-        pango_cairo_show_layout(cr.get(), layout);
-
-        // paint the shadow
-        cairo_restore(cr.get());
-
-        pattern.reset(cairo_pattern_create_linear(0.0, belt_h, 0.0, belt_h + SHADOW_BOTTOM_PADDING),
-                      cairo_pattern_destroy);
-        cairo_pattern_add_color_stop_rgba(pattern.get(), 0.0, 0.0, 0.0, 0.0, 0.235294);
-        cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 0.0, 0.0, 0.0, 0.0);
-
-        cairo_set_source(cr.get(), pattern.get());
-
-        cairo_rectangle(cr.get(), 0.0, belt_h, belt_w, SHADOW_BOTTOM_PADDING);
-        cairo_fill(cr.get());
-
-        cairo_set_source_rgba(cr.get(), 0.0, 0.0, 0.0, 0.1);
-        cairo_rectangle(cr.get(), 0.0, 1.0, 1.0, belt_h);
-        cairo_fill(cr.get());
-
-        cairo_rectangle(cr.get(), belt_w, 1.0, 1.0, belt_h);
-        cairo_fill(cr.get());
-
-        // FIXME: going from image_surface to pixbuf, and then to texture :(
-        glib::Object<GdkPixbuf> detail_pb(
-            gdk_pixbuf_get_from_surface(cairo_graphics.GetSurface(),
-                                        0, 0,
-                                        cairo_graphics.GetWidth(),
-                                        cairo_graphics.GetHeight()));
-
-        int y_pos = icon_h - pixbuf_height - max_font_height / 2;
-        gdk_pixbuf_composite(detail_pb, result, // src, dest
-                             0, // dest_x
-                             y_pos, // dest_y
-                             pixbuf_width, // dest_w
-                             pixbuf_height, // dest_h
-                             0, // offset_x
-                             y_pos, // offset_y
-                             1.0, 1.0, // scale_x, scale_y
-                             GDK_INTERP_NEAREST, // interpolation
-                             255); // src_alpha
-      }
-
-      idle_id = g_idle_add(LoadIconComplete, this);
-    }
-
-    void BaseIconLoaded(std::string const& base_icon_string,
-                        int base_max_width, int base_max_height,
-                        glib::Object<GdkPixbuf> const& base_pixbuf,
-                        glib::Object<UnityProtocolAnnotatedIcon> const& anno_icon)
-    {
-      helper_handle = 0;
-      if (base_pixbuf)
-      {
-        LOG_DEBUG(logger) << "Base icon loaded: '" << base_icon_string << 
-          "' size: " << gdk_pixbuf_get_width(base_pixbuf) << 'x' <<
-                        gdk_pixbuf_get_height(base_pixbuf);
-
-        int result_width, result_height, dest_x, dest_y;
-        if (unity_protocol_annotated_icon_get_use_small_icon(anno_icon))
-        {
-          result_width = max_width > 0 ? max_width : MAX(max_height, gdk_pixbuf_get_width(base_pixbuf));
-          result_height = max_height > 0 ? max_height : MAX(max_width, gdk_pixbuf_get_height(base_pixbuf));
-
-          dest_x = (result_width - gdk_pixbuf_get_width(base_pixbuf)) / 2;
-          dest_y = (result_height - gdk_pixbuf_get_height(base_pixbuf)) / 2;
-        }
-        else
-        {
-          result_width = gdk_pixbuf_get_width(base_pixbuf) + RIBBON_PADDING * 2;
-          result_height = gdk_pixbuf_get_height(base_pixbuf);
-
-          dest_x = RIBBON_PADDING;
-          dest_y = 0;
-        }
-        // we need extra space for the ribbon
-        result = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
-                                result_width, result_height);
-        gdk_pixbuf_fill(result, 0x0);
-        gdk_pixbuf_copy_area(base_pixbuf, 0, 0,
-                             gdk_pixbuf_get_width(base_pixbuf),
-                             gdk_pixbuf_get_height(base_pixbuf),
-                             result,
-                             dest_x, dest_y);
-        // FIXME: can we composite the pixbuf in helper thread?
-        UnityProtocolCategoryType category = unity_protocol_annotated_icon_get_category(anno_icon);
-        auto helper_slot = sigc::bind(sigc::mem_fun(this, &IconLoaderTask::CategoryIconLoaded), anno_icon);
-        int max_font_height;
-        CalculateTextHeight(nullptr, &max_font_height);
-        unsigned cat_size = max_font_height * 9 / 8;
-        switch (category)
-        {
-          case UNITY_PROTOCOL_CATEGORY_TYPE_NONE:
-            // rest of the processing is the CategoryIconLoaded, lets invoke it
-            helper_slot("", -1, cat_size, glib::Object<GdkPixbuf>());
-            break;
-          case UNITY_PROTOCOL_CATEGORY_TYPE_APPLICATION:
-            helper_handle =
-              impl->LoadFromFilename(PKGDATADIR"/emblem_apps.svg", -1, cat_size, helper_slot);
-            break;
-          case UNITY_PROTOCOL_CATEGORY_TYPE_BOOK:
-            helper_handle =
-              impl->LoadFromFilename(PKGDATADIR"/emblem_books.svg", -1, cat_size, helper_slot);
-            break;
-          case UNITY_PROTOCOL_CATEGORY_TYPE_MUSIC:
-            helper_handle =
-              impl->LoadFromFilename(PKGDATADIR"/emblem_music.svg", -1, cat_size, helper_slot);
-            break;
-          case UNITY_PROTOCOL_CATEGORY_TYPE_MOVIE:
-            helper_handle =
-              impl->LoadFromFilename(PKGDATADIR"/emblem_video.svg", -1, cat_size, helper_slot);
-            break;
-          case UNITY_PROTOCOL_CATEGORY_TYPE_CLOTHES:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_SHOES:
-            helper_handle =
-              impl->LoadFromFilename(PKGDATADIR"/emblem_clothes.svg", -1, cat_size, helper_slot);
-            break;
-          case UNITY_PROTOCOL_CATEGORY_TYPE_GAMES:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_ELECTRONICS:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_COMPUTERS:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_OFFICE:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_HOME:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_GARDEN:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_PETS:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_TOYS:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_CHILDREN:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_BABY:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_WATCHES:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_SPORTS:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_OUTDOORS:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_GROCERY:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_HEALTH:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_BEAUTY:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_DIY:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_TOOLS:
-          case UNITY_PROTOCOL_CATEGORY_TYPE_CAR:
-          default:
-            helper_handle =
-              impl->LoadFromFilename(PKGDATADIR"/emblem_others.svg", -1, cat_size, helper_slot);
-            break;
-        }
-      }
-      else
-      {
-        result = nullptr;
-        idle_id = g_idle_add(LoadIconComplete, this);
-      }
-    }
-
-    void PushSchedulerJob()
-    {
-#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
-      g_io_scheduler_push_job (LoaderJobFunc, this, nullptr, G_PRIORITY_HIGH_IDLE, nullptr);
-#else
-      glib::Object<GTask> task(g_task_new(nullptr, nullptr, [] (GObject*, GAsyncResult*, gpointer data) {
-        auto self = static_cast<IconLoaderTask*>(data);
-        self->LoadIconComplete(data);
-      }, this));
-
-      g_task_set_priority(task, G_PRIORITY_HIGH_IDLE);
-      g_task_set_task_data(task, this, nullptr);
-
-      g_task_run_in_thread(task, LoaderJobFunc);
-#endif
-    }
-
-    // Loading/rendering of pixbufs is done in a separate thread
-#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
-    static gboolean LoaderJobFunc(GIOSchedulerJob* job, GCancellable *canc, gpointer data)
-#else
-    static void LoaderJobFunc(GTask* job, gpointer source_object, gpointer data, GCancellable* canc)
-#endif
-    {
-      auto task = static_cast<IconLoaderTask*>(data);
-
-      // careful here this is running in non-main thread
-      if (task->icon_info)
-      {
-        task->result = ::gtk_icon_info_load_icon(task->icon_info, &task->error);
-      }
-      else if (task->type == REQUEST_TYPE_URI)
-      {
-        glib::Object<GFile> file(::g_file_new_for_uri(task->data.c_str()));
-        glib::String contents;
-        gsize length = 0;
-
-        if (g_file_load_contents(file, canc, &contents, &length,
-                                 nullptr, &task->error))
-        {
-          glib::Object<GInputStream> stream(
-              g_memory_input_stream_new_from_data(contents.Value(), length, nullptr));
-
-          task->result = gdk_pixbuf_new_from_stream_at_scale(stream,
-                                                             task->max_width,
-                                                             task->max_height,
-                                                             TRUE,
-                                                             canc,
-                                                             &task->error);
-          g_input_stream_close(stream, canc, nullptr);
-        }
-      }
-
-#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
-      g_io_scheduler_job_send_to_mainloop_async (job, LoadIconComplete, task, nullptr);
-      return FALSE;
-#endif
-    }
-
-    // this will be invoked back in the thread from which push_job was called
-    static gboolean LoadIconComplete(gpointer data)
-    {
-      auto task = static_cast<IconLoaderTask*>(data);
-      auto impl = task->impl;
-
-      if (task->result.IsType(GDK_TYPE_PIXBUF))
-      {
-        if (!task->no_cache) impl->cache_[task->key] = task->result;
-      }
-      else
-      {
-        if (task->result)
-          task->result = nullptr;
-
-        LOG_WARNING(logger) << "Unable to load icon " << task->data
-                            << " at size "
-                            << task->max_width << "x" << task->max_height
-                            << ": " << task->error;
-      }
-
-      impl->finished_tasks_.push_back(task);
-
-      if (!impl->coalesce_timeout_)
-      {
-        // we're using lower priority than the GIOSchedulerJob uses to deliver
-        // results to the mainloop
-        auto prio = static_cast<glib::Source::Priority>(glib::Source::Priority::DEFAULT_IDLE + 40);
-        impl->coalesce_timeout_.reset(new glib::Timeout(40, prio));
-        impl->coalesce_timeout_->Run(sigc::mem_fun(impl, &Impl::CoalesceTasksCb));
-      }
-
-      return FALSE;
-    }
-  };
-
-  Handle ReturnCachedOrQueue(std::string const& data,
-                             int max_width,
-                             int max_height,
-                             IconLoaderCallback slot,
-                             IconLoaderRequestType type);
-
-  Handle QueueTask(std::string const& key,
-                   std::string const& data,
-                   int max_width,
-                   int max_height,
-                   IconLoaderCallback slot,
-                   IconLoaderRequestType type);
-
-  std::string Hash(std::string const& data, int max_width, int max_height);
-
-  bool CacheLookup(std::string const& key,
-                   std::string const& data,
-                   int max_width,
-                   int max_height,
-                   IconLoaderCallback slot);
-
-  // Looping idle callback function
-  bool Iteration();
-  bool CoalesceTasksCb();
-
-private:
-  std::map<std::string, glib::Object<GdkPixbuf>> cache_;
-  /* FIXME: the reference counting of IconLoaderTasks with shared pointers
-   * is currently somewhat broken, and the queued_tasks_ member is what keeps
-   * it from crashing randomly.
-   * The IconLoader instance is assuming that it is the only owner of the loader
-   * tasks, but when they are being completed in a worker thread, the thread
-   * should own them as well (yet it doesn't), this could cause trouble
-   * in the future... You've been warned! */
-  std::map<std::string, IconLoaderTask::Ptr> queued_tasks_;
-  std::queue<IconLoaderTask::Ptr> tasks_;
-  std::map<Handle, IconLoaderTask::Ptr> task_map_;
-  std::vector<IconLoaderTask*> finished_tasks_;
-
-  bool no_load_;
-  GtkIconTheme* theme_; // Not owned.
-  Handle handle_counter_;
-  glib::Source::UniquePtr idle_;
-  glib::Source::UniquePtr coalesce_timeout_;
-  glib::Signal<void, GtkIconTheme*> theme_changed_signal_;
-};
-
-
-IconLoader::Impl::Impl()
+
+NUX_IMPLEMENT_OBJECT_TYPE(IconLoader);
+
+
+IconLoaderImpl::IconLoaderImpl()
   : // Option to disable loading, if you're testing performance of other things
     no_load_(::getenv("UNITY_ICON_LOADER_DISABLE"))
   , theme_(::gtk_icon_theme_get_default())
@@ -802,7 +80,11 @@
 #endif
 }
 
-int IconLoader::Impl::LoadFromIconName(std::string const& icon_name,
+IconLoaderImpl::~IconLoaderImpl()
+{
+}
+
+int IconLoaderImpl::LoadFromIconName(std::string const& icon_name,
                                        int max_width,
                                        int max_height,
                                        IconLoaderCallback slot)
@@ -818,11 +100,12 @@
     return LoadFromFilename(icon_name, max_width, max_height, slot);
   }
 
-  return ReturnCachedOrQueue(icon_name, max_width, max_height, slot,
+  std::string key(Hash(icon_name, max_width, max_height));
+  return QueueTask(key, icon_name, max_width, max_height, slot,
                              REQUEST_TYPE_ICON_NAME);
 }
 
-int IconLoader::Impl::LoadFromGIconString(std::string const& gicon_string,
+int IconLoaderImpl::LoadFromGIconString(std::string const& gicon_string,
                                           int max_width,
                                           int max_height,
                                           IconLoaderCallback slot)
@@ -832,11 +115,12 @@
        (max_height >= 0 && max_height < MIN_ICON_SIZE)))
     return 0;
 
-  return ReturnCachedOrQueue(gicon_string, max_width, max_height, slot,
+  std::string key(Hash(gicon_string, max_width, max_height));
+  return QueueTask(key, gicon_string, max_width, max_height, slot,
                              REQUEST_TYPE_GICON_STRING);
 }
 
-int IconLoader::Impl::LoadFromFilename(std::string const& filename,
+int IconLoaderImpl::LoadFromFilename(std::string const& filename,
                                        int max_width,
                                        int max_height,
                                        IconLoaderCallback slot)
@@ -852,7 +136,7 @@
   return LoadFromURI(uri.Str(), max_width, max_height, slot);
 }
 
-int IconLoader::Impl::LoadFromURI(std::string const& uri,
+int IconLoaderImpl::LoadFromURI(std::string const& uri,
                                   int max_width,
                                   int max_height,
                                   IconLoaderCallback slot)
@@ -862,61 +146,27 @@
        (max_height >= 0 && max_height < MIN_ICON_SIZE)))
     return 0;
 
-  return ReturnCachedOrQueue(uri, max_width, max_height, slot,
+  std::string key(Hash(uri, max_width, max_height));
+  return QueueTask(key, uri, max_width, max_height, slot,
                              REQUEST_TYPE_URI);
 }
 
-void IconLoader::Impl::DisconnectHandle(Handle handle)
+void IconLoaderImpl::DisconnectHandle(Handle handle)
 {
-  auto iter = task_map_.find(handle);
+  auto iter = task_slot_map_.find(handle);
 
-  if (iter != task_map_.end())
+  if (iter != task_slot_map_.end())
   {
-    iter->second->slot = nullptr;
+    iter->second->slots_[handle] = nullptr;
+    task_slot_map_.erase(iter);
   }
 }
 
-void IconLoader::Impl::CalculateTextHeight(int* width, int* height)
-{
-  // FIXME: what about CJK?
-  const char* const SAMPLE_MAX_TEXT = "Chromium Web Browser";
-  GtkSettings* settings = gtk_settings_get_default();
-
-  nux::CairoGraphics util_cg(CAIRO_FORMAT_ARGB32, 1, 1);
-  cairo_t* cr = util_cg.GetInternalContext();
-
-  glib::String font;
-  int dpi = 0;
-  g_object_get(settings,
-                 "gtk-font-name", &font,
-                 "gtk-xft-dpi", &dpi,
-                 NULL);
-  std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font), pango_font_description_free);
-  pango_font_description_set_weight(desc.get(), PANGO_WEIGHT_BOLD);
-  pango_font_description_set_size(desc.get(), FONT_SIZE * PANGO_SCALE);
-
-  glib::Object<PangoLayout> layout(pango_cairo_create_layout(cr));
-  pango_layout_set_font_description(layout, desc.get());
-  pango_layout_set_text(layout, SAMPLE_MAX_TEXT, -1);
-
-  PangoContext* cxt = pango_layout_get_context(layout);
-  GdkScreen* screen = gdk_screen_get_default();
-  pango_cairo_context_set_font_options(cxt, gdk_screen_get_font_options(screen));
-  pango_cairo_context_set_resolution(cxt, dpi / (double) PANGO_SCALE);
-  pango_layout_context_changed(layout);
-
-  PangoRectangle log_rect;
-  pango_layout_get_extents(layout, NULL, &log_rect);
-
-  if (width) *width = log_rect.width / PANGO_SCALE;
-  if (height) *height = log_rect.height / PANGO_SCALE;
-}
-
 //
 // Private Methods
 //
 
-int IconLoader::Impl::ReturnCachedOrQueue(std::string const& data,
+int IconLoaderImpl::ReturnCachedOrQueue(std::string const& data,
                                           int max_width,
                                           int max_height,
                                           IconLoaderCallback slot,
@@ -932,60 +182,59 @@
   return result;
 }
 
-
-int IconLoader::Impl::QueueTask(std::string const& key,
+int IconLoaderImpl::QueueTask(std::string const& key,
                                 std::string const& data,
                                 int max_width,
                                 int max_height,
                                 IconLoaderCallback slot,
                                 IconLoaderRequestType type)
 {
-  auto task = std::make_shared<IconLoaderTask>(type, data,
-                                               max_width, max_height,
-                                               key, slot,
-                                               ++handle_counter_, this);
+  int handle = ++handle_counter_;
+
   auto iter = queued_tasks_.find(key);
 
   if (iter != queued_tasks_.end())
   {
-    IconLoaderTask::Ptr const& running_task = iter->second;
-    running_task->shadow_tasks.push_back(task);
-    // do NOT push the task into the tasks queue,
-    // the parent task (which is in the queue) will handle it
-    task_map_[task->handle] = task;
+    iter->second->AddSlot(handle, slot);
 
-    LOG_DEBUG(logger) << "Appending shadow task  " << data
+    LOG_DEBUG(logger) << "Appending slot for task task  " << data
                       << ", queue size now at " << tasks_.size();
 
-    return task->handle;
+    task_slot_map_[handle] = iter->second;
   }
   else
   {
+    IconLoaderTask::Ptr task(new IconLoaderTask(type, data,
+                                                 max_width, max_height,
+                                                 key,
+                                                 this));
+    task->AddSlot(handle, slot);
+
     queued_tasks_[key] = task;
-  }
-
-  tasks_.push(task);
-  task_map_[task->handle] = task;
-
-  LOG_DEBUG(logger) << "Pushing task  " << data << " at size " 
-                    << max_width << "x" << max_height
-                    << ", queue size now at " << tasks_.size();
-
-  if (!idle_)
-  {
-    idle_.reset(new glib::Idle(sigc::mem_fun(this, &Impl::Iteration), glib::Source::Priority::LOW));
-  }
-  return task->handle;
+    tasks_.push(task);
+
+    LOG_DEBUG(logger) << "Pushing task  " << data << " at size " 
+                      << max_width << "x" << max_height
+                      << ", queue size now at " << tasks_.size();
+
+    if (!timer_)
+    {
+      timer_.reset(new glib::Timeout(0, sigc::mem_fun(this, &IconLoaderImpl::Iteration), glib::Source::Priority::LOW));
+    }
+    task_slot_map_[handle] = task;
+  }
+
+  return handle;
 }
 
-std::string IconLoader::Impl::Hash(std::string const& data, int max_width, int max_height)
+std::string IconLoaderImpl::Hash(std::string const& data, int max_width, int max_height)
 {
   std::ostringstream sout;
   sout << data << ":" << max_width << "x" << max_height;
   return sout.str();
 }
 
-bool IconLoader::Impl::CacheLookup(std::string const& key,
+bool IconLoaderImpl::CacheLookup(std::string const& key,
                                    std::string const& data,
                                    int max_width,
                                    int max_height,
@@ -1003,24 +252,21 @@
   return found;
 }
 
-bool IconLoader::Impl::CoalesceTasksCb()
+bool IconLoaderImpl::CoalesceTasksCb()
 {
   for (auto task : finished_tasks_)
   {
     task->InvokeSlot();
-
-    // this was all async, we need to erase the task from the task_map
-    task_map_.erase(task->handle);
-    queued_tasks_.erase(task->key);
+    
+    queued_tasks_.erase(task->key_);
   }
-
   finished_tasks_.clear();
   coalesce_timeout_.reset();
 
   return false;
 }
 
-bool IconLoader::Impl::Iteration()
+bool IconLoaderImpl::Iteration()
 {
   static const int MAX_MICRO_SECS = 1000;
   util::Timer timer;
@@ -1032,10 +278,18 @@
   {
     IconLoaderTask::Ptr const& task = tasks_.front();
 
-    if (task->Process())
-    {
-      task_map_.erase(task->handle);
-      queued_tasks_.erase(task->key);
+    // Check cache first.
+    auto cache_iter = cache_.find(task->key_);
+    if (cache_iter != cache_.end())
+    {
+      task->result_ = cache_iter->second;
+      task->InvokeSlot();
+      queued_tasks_.erase(task->key_);
+    }
+    // Not in cache. process.
+    else if (task->Process())
+    {
+      queued_tasks_.erase(task->key_);      
     }
 
     tasks_.pop();
@@ -1048,17 +302,17 @@
 
   if (queue_empty)
   {
-    if (task_map_.empty())
+    if (task_slot_map_.empty())
       handle_counter_ = 0;
 
-    idle_.reset();
+    timer_.reset();
   }
 
   return !queue_empty;
 }
 
 IconLoader::IconLoader()
-  : pimpl(new Impl())
+  : pimpl(new IconLoaderImpl())
 {
 }
 
@@ -1109,5 +363,35 @@
   pimpl->DisconnectHandle(handle);
 }
 
-
+IconLoader::Ptr IconLoader::Get(std::string const& name)
+{
+  auto iter = icon_loaders.find(name);
+  if (iter == icon_loaders.end())
+  {
+    IconLoader* icon_loader = new IconLoader();
+    // Store as a raw pointer, so as not to add a reference
+    icon_loaders[name] = icon_loader;
+
+    icon_loader->object_destroyed.connect([icon_loader](Object*)
+    {
+      auto iter_delete = icon_loaders.begin();
+      for (; iter_delete != icon_loaders.end(); ++iter_delete)
+      {
+        if (iter_delete->second == icon_loader)
+        {
+          icon_loaders.erase(iter_delete);
+          break;
+        }
+      }
+    });
+
+    IconLoader::Ptr ptr;
+    // Adopt so we don't add the reference.
+    ptr.Adopt(icon_loader);
+    return ptr;
+  }
+  return IconLoader::Ptr(iter->second);
+}
+
+}
 }

=== modified file 'unity-shared/IconLoader.h'
--- unity-shared/IconLoader.h	2012-09-12 15:07:07 +0000
+++ unity-shared/IconLoader.h	2013-01-30 14:41:22 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
-* Copyright (C) 2010, 2011 Canonical Ltd
+* Copyright (C) 2010-2012 Canonical Ltd
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 3 as
@@ -15,6 +15,7 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 * Authored by: Neil Jagdish Patel <[e-mail]>
+               Nick Dedekind <[e-mail]>
 */
 
 #ifndef UNITY_ICON_LOADER_H
@@ -25,19 +26,27 @@
 #include <memory>
 #include <gtk/gtk.h>
 #include <UnityCore/GLibWrapper.h>
+#include <Nux/Nux.h>
+#include <NuxCore/Object.h>
 
 namespace unity
 {
+namespace icon_loader
+{
+class IconLoaderImpl;
+typedef std::function<void(std::string const&, int, int, glib::Object<GdkPixbuf> const&)> IconLoaderCallback;
 
-class IconLoader : public boost::noncopyable
+class IconLoader : public nux::Object
 {
 public:
-  typedef std::function<void(std::string const&, int, int, glib::Object<GdkPixbuf> const&)> IconLoaderCallback;
+  typedef nux::ObjectPtr<IconLoader> Ptr;
+  NUX_DECLARE_OBJECT_TYPE(IconLoader, Object);
 
   IconLoader();
   ~IconLoader();
 
   static IconLoader& GetDefault();
+  static IconLoader::Ptr Get(std::string const& name);
 
   /**
    * Each of the Load functions return an opaque handle.  The sole use for
@@ -67,10 +76,12 @@
   void DisconnectHandle(int handle);
 
 private:
-  class Impl;
-  std::unique_ptr<Impl> pimpl;
+  std::unique_ptr<IconLoaderImpl> pimpl;
 };
 
 }
 
+typedef icon_loader::IconLoader IconLoader;
+}
+
 #endif // UNITY_ICON_LOADER_H

=== added file 'unity-shared/IconLoaderImpl.h'
--- unity-shared/IconLoaderImpl.h	1970-01-01 00:00:00 +0000
+++ unity-shared/IconLoaderImpl.h	2013-01-30 14:41:22 +0000
@@ -0,0 +1,119 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+* Copyright (C) 2010-2012 Canonical Ltd
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 3 as
+* published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Authored by: Neil Jagdish Patel <[e-mail]>
+               Nick Dedekind <[e-mail]>
+*/
+
+#ifndef UNITY_ICON_LOADER_IMPL_H
+#define UNITY_ICON_LOADER_IMPL_H
+
+#include "IconLoader.h"
+#include "IconLoaderTask.h"
+#include <UnityCore/GLibSource.h>
+#include <UnityCore/GLibSignal.h>
+
+namespace unity
+{
+namespace icon_loader
+{
+
+class IconLoaderImpl
+{
+public:
+  // The Handle typedef is used to explicitly indicate which integers are
+  // infact our opaque handles.
+
+  IconLoaderImpl();
+  ~IconLoaderImpl();
+
+  Handle LoadFromIconName(std::string const& icon_name,
+                          int max_width,
+                          int max_height,
+                          IconLoaderCallback slot);
+
+  Handle LoadFromGIconString(std::string const& gicon_string,
+                             int max_width,
+                             int max_height,
+                             IconLoaderCallback slot);
+
+  Handle LoadFromFilename(std::string const& filename,
+                          int max_width,
+                          int max_height,
+                          IconLoaderCallback slot);
+
+  Handle LoadFromURI(std::string const& uri,
+                     int max_width,
+                     int max_height,
+                     IconLoaderCallback slot);
+
+  void DisconnectHandle(Handle handle);
+
+private:
+
+  Handle ReturnCachedOrQueue(std::string const& data,
+                             int max_width,
+                             int max_height,
+                             IconLoaderCallback slot,
+                             IconLoaderRequestType type);
+
+  Handle QueueTask(std::string const& key,
+                   std::string const& data,
+                   int max_width,
+                   int max_height,
+                   IconLoaderCallback slot,
+                   IconLoaderRequestType type);
+
+  std::string Hash(std::string const& data, int max_width, int max_height);
+
+  bool CacheLookup(std::string const& key,
+                   std::string const& data,
+                   int max_width,
+                   int max_height,
+                   IconLoaderCallback slot);
+
+  // Looping idle callback function
+  bool Iteration();
+  bool CoalesceTasksCb();
+
+private:
+  std::map<std::string, glib::Object<GdkPixbuf>> cache_;
+  /* FIXME: the reference counting of IconLoaderTasks with shared pointers
+   * is currently somewhat broken, and the queued_tasks_ member is what keeps
+   * it from crashing randomly.
+   * The IconLoader instance is assuming that it is the only owner of the loader
+   * tasks, but when they are being completed in a worker thread, the thread
+   * should own them as well (yet it doesn't), this could cause trouble
+   * in the future... You've been warned! */
+  std::map<std::string, IconLoaderTask::Ptr> queued_tasks_;
+  std::queue<IconLoaderTask::Ptr> tasks_;
+  std::map<Handle, IconLoaderTask::Ptr> task_slot_map_;
+  std::vector<IconLoaderTask::Ptr> finished_tasks_;
+
+  bool no_load_;
+  GtkIconTheme* theme_; // Not owned.
+  Handle handle_counter_;
+  glib::Source::UniquePtr timer_;
+  glib::Source::UniquePtr coalesce_timeout_;
+  glib::Signal<void, GtkIconTheme*> theme_changed_signal_;
+
+  friend class IconLoaderTask;
+};
+
+}
+}
+
+#endif // UNITY_ICON_LOADER_IMPL_H

=== added file 'unity-shared/IconLoaderTask.cpp'
--- unity-shared/IconLoaderTask.cpp	1970-01-01 00:00:00 +0000
+++ unity-shared/IconLoaderTask.cpp	2013-01-30 14:41:22 +0000
@@ -0,0 +1,756 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+* Copyright (C) 2010-2012 Canonical Ltd
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 3 as
+* published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Authored by: Neil Jagdish Patel <[e-mail]>
+               Nick Dedekind <[e-mail]>
+*/
+
+#include "IconLoaderTask.h"
+#include "IconLoaderImpl.h"
+
+#include <Nux/Nux.h>
+#include <NuxCore/Logger.h>
+#include <NuxGraphics/CairoGraphics.h>
+
+#include <boost/algorithm/string.hpp>
+#include "config.h"
+
+namespace unity
+{
+DECLARE_LOGGER(logger, "unity.iconloader.task");
+
+namespace
+{
+const int RIBBON_PADDING = 2;
+const int FONT_SIZE = 8;
+const int MIN_FONT_SIZE = 5;
+
+const int COALESCE_TIMEOUT = 200;
+}
+
+namespace icon_loader
+{
+
+NUX_IMPLEMENT_OBJECT_TYPE(IconLoaderTask);
+
+IconLoaderTask::IconLoaderTask(IconLoaderRequestType type_,
+               std::string const& data_,
+               int max_width_,
+               int max_height_,
+               std::string const& key_,
+               IconLoaderImpl* self_)
+: Object(false)
+, type_(type_)
+, data_(data_)
+, max_width_(max_width_)
+, max_height_(max_height_)
+, key_(key_)
+, impl_(self_)
+, icon_info_(nullptr)
+, no_cache_(false)
+, helper_handle_(0)
+, finished_(false)
+{
+}
+
+IconLoaderTask::~IconLoaderTask()
+{
+  if (icon_info_)
+    ::gtk_icon_info_free(icon_info_);
+  if (helper_handle_ != 0)
+    impl_->DisconnectHandle(helper_handle_);
+}
+
+void IconLoaderTask::AddSlot(Handle handle, IconLoaderCallback slot)
+{
+  slots_[handle] = slot;
+  if (finished_)
+  {
+    // if the icon fetching is finished, call LoadIconComplete.
+    if (!timer_complete_)
+      timer_complete_.reset(new glib::Timeout(0, sigc::mem_fun(this, &IconLoaderTask::LoadIconComplete)));
+  }
+}
+
+
+void IconLoaderTask::InvokeSlot()
+{
+  for(std::pair<Handle, IconLoaderCallback> slot : slots_)
+  {
+    if (slot.second)
+      slot.second(data_, max_width_, max_height_, result_);
+    impl_->DisconnectHandle(slot.first);
+  }
+  // For task caching, we clear slots so next call will not call again.
+  slots_.clear();
+}
+
+bool IconLoaderTask::Process()
+{
+  LOG_DEBUG(logger) << "Processing  " << data_ << " at size " << max_height_;
+
+  // Rely on the compiler to tell us if we miss a new type
+  switch (type_)
+  {
+    case REQUEST_TYPE_ICON_NAME:
+      return ProcessIconNameTask();
+    case REQUEST_TYPE_GICON_STRING:
+      return ProcessGIconTask();
+    case REQUEST_TYPE_URI:
+      return ProcessURITask();
+  }
+
+  LOG_WARNING(logger) << "Request type " << type_
+                      << " is not supported (" << data_
+                      << " " << max_width_ << "x" << max_height_ << ")";
+  result_ = nullptr;
+  InvokeSlot();
+
+  return true;
+}
+
+bool IconLoaderTask::ProcessIconNameTask()
+{
+  int size = max_height_ < 0 ? max_width_ : (max_width_ < 0 ? max_height_ : MIN(max_height_, max_width_));
+  GtkIconInfo* info = ::gtk_icon_theme_lookup_icon(impl_->theme_, data_.c_str(),
+                                                   size, static_cast<GtkIconLookupFlags>(0));
+  if (info)
+  {
+    icon_info_ = info;
+    PushSchedulerJob();
+
+    return false;
+  }
+  else
+  {
+    LOG_WARNING(logger) << "Unable to load icon " << data_
+                        << " at size " << size;
+  }
+
+  result_ = nullptr;
+  InvokeSlot();
+
+  return true;
+}
+
+bool IconLoaderTask::ProcessGIconTask()
+{
+  glib::Error error;
+  glib::Object<GIcon> icon(::g_icon_new_for_string(data_.c_str(), &error));
+  int size = max_height_ < 0 ? max_width_ : (max_width_ < 0 ? max_height_ : MIN(max_height_, max_width_));
+
+  if (icon.IsType(UNITY_PROTOCOL_TYPE_ANNOTATED_ICON))
+  {
+    glib::Object<UnityProtocolAnnotatedIcon> anno(glib::object_cast<UnityProtocolAnnotatedIcon>(icon));
+    GIcon* base_icon = unity_protocol_annotated_icon_get_icon(anno);
+    glib::String gicon_string(g_icon_to_string(base_icon));
+
+    // ensure that annotated icons aren't cached by the IconLoader
+    no_cache_ = true;
+
+    auto helper_slot = sigc::bind(sigc::mem_fun(this, &IconLoaderTask::BaseIconLoaded), anno);
+    int base_icon_width, base_icon_height;
+    if (unity_protocol_annotated_icon_get_use_small_icon(anno))
+    {
+      // FIXME: although this pretends to be generic, we're just making
+      // sure that icons requested to have 96px will be 64
+      base_icon_width = max_width_ > 0 ? max_width_ * 2 / 3 : max_width_;
+      base_icon_height = max_height_ > 0 ? max_height_ * 2 / 3 : max_height_;
+    }
+    else
+    {
+      base_icon_width = max_width_ > 0 ? max_width_ - RIBBON_PADDING * 2 : -1;
+      base_icon_height = base_icon_width < 0 ? max_height_ - RIBBON_PADDING *2 : max_height_;
+    }
+
+    // If we create a child task, we dont want to delete this task until the child is finished.
+    Reference();
+    helper_handle_ = impl_->LoadFromGIconString(gicon_string.Str(),
+                                              base_icon_width,
+                                              base_icon_height,
+                                              helper_slot);
+    // no child?
+    if (helper_handle_ == 0)
+    {
+      UnReference();
+      LOG_WARNING(logger) << "Invalid anotated icon '" << gicon_string.Str() << "'";
+      return true;
+    }
+    return false;
+  }
+  else if (icon.IsType(G_TYPE_FILE_ICON))
+  {
+    // [trasfer none]
+    GFile* file = ::g_file_icon_get_file(G_FILE_ICON(icon.RawPtr()));
+    glib::String uri(::g_file_get_uri(file));
+
+    type_ = REQUEST_TYPE_URI;
+    data_ = uri.Str();
+
+    return ProcessURITask();
+  }
+  else if (icon.IsType(G_TYPE_ICON))
+  {
+    GtkIconInfo* info = ::gtk_icon_theme_lookup_by_gicon(impl_->theme_, icon, size,
+                                                         static_cast<GtkIconLookupFlags>(0));
+    if (info)
+    {
+      icon_info_ = info;
+      PushSchedulerJob();
+
+      return false;
+    }
+    else
+    {
+      // There is some funkiness in some programs where they install
+      // their icon to /usr/share/icons/hicolor/apps/, but they
+      // name the Icon= key as `foo.$extension` which breaks loading
+      // So we can try and work around that here.
+
+      if (boost::iends_with(data_, ".png") ||
+          boost::iends_with(data_, ".xpm") ||
+          boost::iends_with(data_, ".gif") ||
+          boost::iends_with(data_, ".jpg"))
+      {
+        data_ = data_.substr(0, data_.size() - 4);
+        return ProcessIconNameTask();
+      }
+      else
+      {
+        LOG_WARNING(logger) << "Unable to load icon " << data_
+                            << " at size " << size;
+      }
+    }
+  }
+  else
+  {
+    LOG_WARNING(logger) << "Unable to load icon " << data_
+                        << " at size " << size << ": " << error;
+  }
+
+  InvokeSlot();
+  return true;
+}
+
+bool IconLoaderTask::ProcessURITask()
+{
+  PushSchedulerJob();
+
+  return false;
+}
+
+void IconLoaderTask::CategoryIconLoaded(std::string const& base_icon_string,
+                        int max_width, int max_height,
+                        glib::Object<GdkPixbuf> const& category_pixbuf,
+                        glib::Object<UnityProtocolAnnotatedIcon> const& anno_icon)
+{
+  // Called reference before we added this slot to ensure we didnt delete this.
+  if (UnReference()) { return; }
+
+  helper_handle_ = 0;
+  bool has_emblem = category_pixbuf;
+
+  const gchar* detail_text = unity_protocol_annotated_icon_get_ribbon(anno_icon);
+  if (detail_text)
+  {
+    const int SHADOW_BOTTOM_PADDING = 2;
+    const int SHADOW_SIDE_PADDING = 1;
+    const int EMBLEM_PADDING = 2;
+    int icon_w = gdk_pixbuf_get_width(result_);
+    int icon_h = gdk_pixbuf_get_height(result_);
+
+    int max_font_height;
+    CalculateTextHeight(nullptr, &max_font_height);
+
+    // FIXME: design wants the tags 2px wider than the original icon
+    int pixbuf_width = icon_w;
+    int pixbuf_height = max_font_height * 5 / 4 + SHADOW_BOTTOM_PADDING;
+    if (pixbuf_height > icon_h) pixbuf_height = icon_h;
+
+    nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32,
+                                      pixbuf_width, pixbuf_height);
+    std::shared_ptr<cairo_t> cr(cairo_graphics.GetContext(), cairo_destroy);
+
+    glib::Object<PangoLayout> layout;
+    PangoContext* pango_context = NULL;
+    GdkScreen* screen = gdk_screen_get_default(); // not ref'ed
+    glib::String font;
+    int dpi = -1;
+
+    g_object_get(gtk_settings_get_default(), "gtk-font-name", &font, NULL);
+    g_object_get(gtk_settings_get_default(), "gtk-xft-dpi", &dpi, NULL);
+    cairo_set_font_options(cr.get(), gdk_screen_get_font_options(screen));
+    layout = pango_cairo_create_layout(cr.get());
+    std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font), pango_font_description_free);
+    pango_font_description_set_weight(desc.get(), PANGO_WEIGHT_BOLD);
+    int font_size = FONT_SIZE;
+    pango_font_description_set_size (desc.get(), font_size * PANGO_SCALE);
+
+    pango_layout_set_font_description(layout, desc.get());
+    pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
+
+    double belt_w = static_cast<double>(pixbuf_width - SHADOW_SIDE_PADDING * 2);
+    double belt_h = static_cast<double>(pixbuf_height - SHADOW_BOTTOM_PADDING);
+
+    double max_text_width = belt_w;
+    if (has_emblem)
+    {
+      const double CURVE_MID_X = 0.4 * (belt_h / 20.0 * 24.0);
+      const int category_pb_w = gdk_pixbuf_get_width(category_pixbuf);
+      max_text_width = belt_w - CURVE_MID_X - category_pb_w - EMBLEM_PADDING;
+    }
+
+    pango_layout_set_wrap(layout, PANGO_WRAP_WORD_CHAR);
+    pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);
+
+    glib::String escaped_text(g_markup_escape_text(detail_text, -1));
+    pango_layout_set_markup(layout, escaped_text, -1);
+
+    pango_context = pango_layout_get_context(layout);  // is not ref'ed
+    pango_cairo_context_set_font_options(pango_context,
+                                         gdk_screen_get_font_options(screen));
+    pango_cairo_context_set_resolution(pango_context,
+                                       dpi == -1 ? 96.0f : dpi/(float) PANGO_SCALE);
+    pango_layout_context_changed(layout);
+
+    // find proper font size
+    int text_width, text_height;
+    pango_layout_get_pixel_size(layout, &text_width, nullptr);
+    while (text_width > max_text_width && font_size > MIN_FONT_SIZE)
+    {
+      font_size--;
+      pango_font_description_set_size (desc.get(), font_size * PANGO_SCALE);
+      pango_layout_set_font_description(layout, desc.get());
+      pango_layout_get_pixel_size(layout, &text_width, nullptr);
+    }
+    pango_layout_set_width(layout, static_cast<int>(max_text_width * PANGO_SCALE));
+
+    cairo_set_operator(cr.get(), CAIRO_OPERATOR_CLEAR);
+    cairo_paint(cr.get());
+
+    cairo_set_operator(cr.get(), CAIRO_OPERATOR_OVER);
+
+    // this should be #dd4814
+    const double ORANGE_R = 0.86666;
+    const double ORANGE_G = 0.28235;
+    const double ORANGE_B = 0.07843;
+
+    // translate to make space for the shadow
+    cairo_save(cr.get());
+    cairo_translate(cr.get(), 1.0, 1.0);
+
+    cairo_set_source_rgba(cr.get(), ORANGE_R, ORANGE_G, ORANGE_B, 1.0);
+
+    // base ribbon
+    cairo_rectangle(cr.get(), 0.0, 0.0, belt_w, belt_h);
+    cairo_fill_preserve(cr.get());
+
+    // hightlight on left edge
+    std::shared_ptr<cairo_pattern_t> pattern(
+        cairo_pattern_create_linear(0.0, 0.0, belt_w, 0.0),
+        cairo_pattern_destroy);
+    cairo_pattern_add_color_stop_rgba(pattern.get(), 0.0, 1.0, 1.0, 1.0, 0.235294);
+    cairo_pattern_add_color_stop_rgba(pattern.get(), 0.02, 1.0, 1.0, 1.0, 0.0);
+    // and on right one
+    if (!has_emblem)
+    {
+      cairo_pattern_add_color_stop_rgba(pattern.get(), 0.98, 1.0, 1.0, 1.0, 0.0);
+      cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 1.0, 1.0, 1.0, 0.235294);
+    }
+    cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 1.0, 1.0, 1.0, 0.0);
+
+    cairo_set_source(cr.get(), pattern.get());
+    cairo_fill(cr.get());
+
+    if (has_emblem)
+    {
+      // size of the emblem
+      const int category_pb_w = gdk_pixbuf_get_width(category_pixbuf);
+      const int category_pb_h = gdk_pixbuf_get_height(category_pixbuf);
+
+      // control and end points for the two bezier curves
+      const double CURVE_X_MULT = belt_h / 20.0 * 24.0;
+      const double CURVE_CP1_X = 0.25 * CURVE_X_MULT;
+      const double CURVE_CP2_X = 0.2521 * CURVE_X_MULT;
+      const double CURVE_CP3_X = 0.36875 * CURVE_X_MULT;
+      const double CURVE_CP4_X = 0.57875 * CURVE_X_MULT;
+      const double CURVE_CP5_X = 0.705417 * CURVE_X_MULT;
+      const double CURVE_CP6_X = 0.723333 * CURVE_X_MULT;
+      const double CURVE_CP7_X = 0.952375 * CURVE_X_MULT;
+
+      const double CURVE_Y1 = 0.9825;
+      const double CURVE_Y2 = 0.72725;
+      const double CURVE_Y3 = 0.27275;
+
+      const double CURVE_START_X = belt_w - category_pb_w - CURVE_CP5_X - EMBLEM_PADDING;
+      //const double CURVE_END_X = CURVE_START_X + CURVE_X_MULT;
+
+      cairo_set_source_rgba(cr.get(), 1.0, 1.0, 1.0, 1.0);
+
+      // paint the curved area
+      cairo_move_to(cr.get(), CURVE_START_X, belt_h);
+      cairo_curve_to(cr.get(), CURVE_START_X + CURVE_CP1_X, belt_h,
+                               CURVE_START_X + CURVE_CP2_X, CURVE_Y1 * belt_h,
+                               CURVE_START_X + CURVE_CP3_X, CURVE_Y2 * belt_h);
+      cairo_line_to(cr.get(), CURVE_START_X + CURVE_CP4_X, CURVE_Y3 * belt_h);
+      cairo_curve_to(cr.get(), CURVE_START_X + CURVE_CP5_X, 0.0,
+                               CURVE_START_X + CURVE_CP6_X, 0.0,
+                               CURVE_START_X + CURVE_CP7_X, 0.0);
+      cairo_line_to(cr.get(), belt_w, 0.0);
+      cairo_line_to(cr.get(), belt_w, belt_h);
+      cairo_close_path(cr.get());
+      cairo_fill(cr.get());
+
+      // and the highlight
+      pattern.reset(cairo_pattern_create_linear(CURVE_START_X, 0.0, belt_w, 0.0),
+                    cairo_pattern_destroy);
+      cairo_pattern_add_color_stop_rgba(pattern.get(), 0.0, 1.0, 1.0, 1.0, 0.0);
+      cairo_pattern_add_color_stop_rgba(pattern.get(), 0.95, 1.0, 1.0, 1.0, 0.0);
+      cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 0.0, 0.0, 0.0, 0.235294);
+      cairo_set_source(cr.get(), pattern.get());
+      cairo_rectangle(cr.get(), CURVE_START_X, 0.0, belt_w - CURVE_START_X, belt_h);
+      cairo_fill(cr.get());
+
+      // paint the emblem
+      double category_pb_x = belt_w - category_pb_w - EMBLEM_PADDING - 1;
+      gdk_cairo_set_source_pixbuf(cr.get(), category_pixbuf,
+                                  category_pb_x, (belt_h - category_pb_h) / 2);
+      cairo_paint(cr.get());
+    }
+
+    // paint the text
+    cairo_set_source_rgba(cr.get(), 1.0, 1.0, 1.0, 1.0);
+    cairo_move_to(cr.get(), 0.0, belt_h / 2);
+    pango_layout_get_pixel_size(layout, nullptr, &text_height);
+    // current point is now in the middle of the stripe, need to translate
+    // it, so that the text is centered
+    cairo_rel_move_to(cr.get(), 0.0, text_height / -2.0);
+    pango_cairo_show_layout(cr.get(), layout);
+
+    // paint the shadow
+    cairo_restore(cr.get());
+
+    pattern.reset(cairo_pattern_create_linear(0.0, belt_h, 0.0, belt_h + SHADOW_BOTTOM_PADDING),
+                  cairo_pattern_destroy);
+    cairo_pattern_add_color_stop_rgba(pattern.get(), 0.0, 0.0, 0.0, 0.0, 0.235294);
+    cairo_pattern_add_color_stop_rgba(pattern.get(), 1.0, 0.0, 0.0, 0.0, 0.0);
+
+    cairo_set_source(cr.get(), pattern.get());
+
+    cairo_rectangle(cr.get(), 0.0, belt_h, belt_w, SHADOW_BOTTOM_PADDING);
+    cairo_fill(cr.get());
+
+    cairo_set_source_rgba(cr.get(), 0.0, 0.0, 0.0, 0.1);
+    cairo_rectangle(cr.get(), 0.0, 1.0, 1.0, belt_h);
+    cairo_fill(cr.get());
+
+    cairo_rectangle(cr.get(), belt_w, 1.0, 1.0, belt_h);
+    cairo_fill(cr.get());
+
+    // FIXME: going from image_surface to pixbuf, and then to texture :(
+    glib::Object<GdkPixbuf> detail_pb(
+        gdk_pixbuf_get_from_surface(cairo_graphics.GetSurface(),
+                                    0, 0,
+                                    cairo_graphics.GetWidth(),
+                                    cairo_graphics.GetHeight()));
+
+    int y_pos = icon_h - pixbuf_height - max_font_height / 2;
+    gdk_pixbuf_composite(detail_pb, result_, // src, dest
+                         0, // dest_x
+                         y_pos, // dest_y
+                         pixbuf_width, // dest_w
+                         pixbuf_height, // dest_h
+                         0, // offset_x
+                         y_pos, // offset_y
+                         1.0, 1.0, // scale_x, scale_y
+                         GDK_INTERP_NEAREST, // interpolation
+                         255); // src_alpha
+  }
+
+  timer_complete_.reset(new glib::Timeout(0, sigc::mem_fun(this, &IconLoaderTask::LoadIconComplete)));
+}
+
+void IconLoaderTask::BaseIconLoaded(std::string const& base_icon_string,
+                    int base_max_width, int base_max_height,
+                    glib::Object<GdkPixbuf> const& base_pixbuf,
+                    glib::Object<UnityProtocolAnnotatedIcon> const& anno_icon)
+{
+  // Called reference before we called this slot to ensure we didnt delete the task.
+  if (UnReference()) { return; }
+
+  helper_handle_ = 0;
+  if (base_pixbuf)
+  {
+    LOG_DEBUG(logger) << "Base icon loaded: '" << base_icon_string << 
+      "' size: " << gdk_pixbuf_get_width(base_pixbuf) << 'x' <<
+                    gdk_pixbuf_get_height(base_pixbuf);
+
+    int result_width, result_height, dest_x, dest_y;
+    if (unity_protocol_annotated_icon_get_use_small_icon(anno_icon))
+    {
+      result_width = max_width_ > 0 ? max_width_ : MAX(max_height_, gdk_pixbuf_get_width(base_pixbuf));
+      result_height = max_height_ > 0 ? max_height_ : MAX(max_width_, gdk_pixbuf_get_height(base_pixbuf));
+
+      dest_x = (result_width - gdk_pixbuf_get_width(base_pixbuf)) / 2;
+      dest_y = (result_height - gdk_pixbuf_get_height(base_pixbuf)) / 2;
+    }
+    else
+    {
+      result_width = gdk_pixbuf_get_width(base_pixbuf) + RIBBON_PADDING * 2;
+      result_height = gdk_pixbuf_get_height(base_pixbuf);
+
+      dest_x = RIBBON_PADDING;
+      dest_y = 0;
+    }
+    // we need extra space for the ribbon
+    result_ = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
+                            result_width, result_height);
+    gdk_pixbuf_fill(result_, 0x0);
+    gdk_pixbuf_copy_area(base_pixbuf, 0, 0,
+                         gdk_pixbuf_get_width(base_pixbuf),
+                         gdk_pixbuf_get_height(base_pixbuf),
+                         result_,
+                         dest_x, dest_y);
+    // FIXME: can we composite the pixbuf in helper thread?
+    UnityProtocolCategoryType category = unity_protocol_annotated_icon_get_category(anno_icon);
+    auto helper_slot = sigc::bind(sigc::mem_fun(this, &IconLoaderTask::CategoryIconLoaded), anno_icon);
+    int max_font_height;
+    CalculateTextHeight(nullptr, &max_font_height);
+    unsigned cat_size = max_font_height * 9 / 8;
+
+    // If we create a child task, we dont want to delete this task until the child is finished.
+    Reference();
+    helper_handle_ = 0;
+
+    switch (category)
+    {
+      case UNITY_PROTOCOL_CATEGORY_TYPE_NONE:
+        // rest of the processing is the CategoryIconLoaded, lets invoke it
+        helper_slot("", -1, cat_size, glib::Object<GdkPixbuf>());
+        return;
+
+      case UNITY_PROTOCOL_CATEGORY_TYPE_APPLICATION:
+        helper_handle_ =
+          impl_->LoadFromFilename(PKGDATADIR"/emblem_apps.svg", -1, cat_size, helper_slot);
+        break;
+      case UNITY_PROTOCOL_CATEGORY_TYPE_BOOK:
+        helper_handle_ =
+          impl_->LoadFromFilename(PKGDATADIR"/emblem_books.svg", -1, cat_size, helper_slot);
+        break;
+      case UNITY_PROTOCOL_CATEGORY_TYPE_MUSIC:
+        helper_handle_ =
+          impl_->LoadFromFilename(PKGDATADIR"/emblem_music.svg", -1, cat_size, helper_slot);
+        break;
+      case UNITY_PROTOCOL_CATEGORY_TYPE_MOVIE:
+        helper_handle_ =
+          impl_->LoadFromFilename(PKGDATADIR"/emblem_video.svg", -1, cat_size, helper_slot);
+        break;
+      case UNITY_PROTOCOL_CATEGORY_TYPE_CLOTHES:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_SHOES:
+        helper_handle_ =
+          impl_->LoadFromFilename(PKGDATADIR"/emblem_clothes.svg", -1, cat_size, helper_slot);
+        break;
+      case UNITY_PROTOCOL_CATEGORY_TYPE_GAMES:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_ELECTRONICS:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_COMPUTERS:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_OFFICE:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_HOME:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_GARDEN:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_PETS:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_TOYS:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_CHILDREN:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_BABY:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_WATCHES:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_SPORTS:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_OUTDOORS:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_GROCERY:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_HEALTH:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_BEAUTY:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_DIY:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_TOOLS:
+      case UNITY_PROTOCOL_CATEGORY_TYPE_CAR:
+      default:
+        helper_handle_ =
+          impl_->LoadFromFilename(PKGDATADIR"/emblem_others.svg", -1, cat_size, helper_slot);
+        break;
+    }
+
+    // no child?
+    if (helper_handle_ == 0) { UnReference(); }
+  }
+  else
+  {
+    result_ = nullptr;
+    timer_complete_.reset(new glib::Timeout(0, sigc::mem_fun(this, &IconLoaderTask::LoadIconComplete)));
+  }
+}
+
+static gboolean ThreadLoadIconComplete(gpointer data)
+{
+  auto icon_task = static_cast<IconLoaderTask*>(data);
+  // IO thread finished. Can decrement reference.
+  if (icon_task->UnReference())
+  {
+    // Task deleted. this mean that the IconLoader has been deleted while the thread was active.
+    return FALSE;
+  }
+
+  return icon_task->LoadIconComplete();
+}
+
+// Loading/rendering of pixbufs is done in a separate thread
+#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
+    static gboolean LoaderJobFunc(GIOSchedulerJob* job, GCancellable *canc, gpointer data)
+#else
+    static void LoaderJobFunc(GTask* job, gpointer source_object, gpointer data, GCancellable* canc)
+#endif
+{
+  auto icon_task = static_cast<IconLoaderTask*>(data);
+
+  // careful here this is running in non-main thread
+  if (icon_task->icon_info_)
+  {
+    icon_task->result_ = ::gtk_icon_info_load_icon(icon_task->icon_info_, &icon_task->error_);
+  }
+  else if (icon_task->type_ == REQUEST_TYPE_URI)
+  {
+    glib::Object<GFile> file(::g_file_new_for_uri(icon_task->data_.c_str()));
+    glib::String contents;
+    gsize length = 0;
+
+    if (g_file_load_contents(file, canc, &contents, &length,
+                             nullptr, &icon_task->error_))
+    {
+      glib::Object<GInputStream> stream(
+          g_memory_input_stream_new_from_data(contents.Value(), length, nullptr));
+
+      icon_task->result_ = gdk_pixbuf_new_from_stream_at_scale(stream,
+                                                         icon_task->max_width_,
+                                                         icon_task->max_height_,
+                                                         TRUE,
+                                                         canc,
+                                                         &icon_task->error_);
+      g_input_stream_close(stream, canc, nullptr);
+    }
+  }
+
+#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
+      // Back to main loop.
+      g_io_scheduler_job_send_to_mainloop_async (job, ThreadLoadIconComplete, icon_task, nullptr);
+      return FALSE;
+#endif
+}
+
+void IconLoaderTask::PushSchedulerJob()
+{
+  // Increment reference so we dont delete the object while io thread runs.
+  Reference();
+
+  #if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
+      g_io_scheduler_push_job (LoaderJobFunc, this, nullptr, G_PRIORITY_HIGH_IDLE, nullptr);
+#else
+      glib::Object<GTask> task(g_task_new(nullptr, nullptr, [] (GObject*, GAsyncResult*, gpointer data) {
+        auto self = static_cast<IconLoaderTask*>(data);
+        // IO thread finished. Can decrement reference.
+        if (icon_task->UnReference())
+        {
+          // Task deleted. this mean that the IconLoader has been deleted while the thread was active.
+          return;
+        }
+        self->LoadIconComplete(data);
+      }, this));
+
+      g_task_set_priority(task, G_PRIORITY_HIGH_IDLE);
+      g_task_set_task_data(task, this, nullptr);
+
+      g_task_run_in_thread(task, LoaderJobFunc);
+#endif
+}
+
+
+bool IconLoaderTask::LoadIconComplete()
+{
+  timer_complete_.reset();
+  if (!finished_)
+  {
+    if (result_.IsType(GDK_TYPE_PIXBUF))
+    {
+      if (!no_cache_)
+        impl_->cache_[key_] = result_;
+    }
+    else
+    {
+      if (result_)
+        result_ = nullptr;
+
+      LOG_WARNING(logger) << "Unable to load icon " << data_
+                          << " at size "
+                          << max_width_ << "x" << max_height_
+                          << ": " << error_;
+    }
+    impl_->finished_tasks_.push_back(IconLoaderTask::Ptr(this));
+    finished_ = true;
+  }
+
+  if (!impl_->coalesce_timeout_)
+  {
+    // Slow coalesce for task cache.
+    auto prio = static_cast<glib::Source::Priority>(glib::Source::Priority::DEFAULT_IDLE + 40);
+    impl_->coalesce_timeout_.reset(new glib::Timeout(COALESCE_TIMEOUT, sigc::mem_fun(impl_, &IconLoaderImpl::CoalesceTasksCb), prio));
+  }
+
+  return FALSE;
+}
+
+
+void IconLoaderTask::CalculateTextHeight(int* width, int* height)
+{
+  // FIXME: what about CJK?
+  const char* const SAMPLE_MAX_TEXT = "Chromium Web Browser";
+  GtkSettings* settings = gtk_settings_get_default();
+
+  nux::CairoGraphics util_cg(CAIRO_FORMAT_ARGB32, 1, 1);
+  cairo_t* cr = util_cg.GetInternalContext();
+
+  glib::String font;
+  int dpi = 0;
+  g_object_get(settings,
+                 "gtk-font-name", &font,
+                 "gtk-xft-dpi", &dpi,
+                 NULL);
+  std::shared_ptr<PangoFontDescription> desc(pango_font_description_from_string(font), pango_font_description_free);
+  pango_font_description_set_weight(desc.get(), PANGO_WEIGHT_BOLD);
+  pango_font_description_set_size(desc.get(), FONT_SIZE * PANGO_SCALE);
+
+  glib::Object<PangoLayout> layout(pango_cairo_create_layout(cr));
+  pango_layout_set_font_description(layout, desc.get());
+  pango_layout_set_text(layout, SAMPLE_MAX_TEXT, -1);
+
+  PangoContext* cxt = pango_layout_get_context(layout);
+  GdkScreen* screen = gdk_screen_get_default();
+  pango_cairo_context_set_font_options(cxt, gdk_screen_get_font_options(screen));
+  pango_cairo_context_set_resolution(cxt, dpi / (double) PANGO_SCALE);
+  pango_layout_context_changed(layout);
+
+  PangoRectangle log_rect;
+  pango_layout_get_extents(layout, NULL, &log_rect);
+
+  if (width) *width = log_rect.width / PANGO_SCALE;
+  if (height) *height = log_rect.height / PANGO_SCALE;
+}
+
+}
+}
\ No newline at end of file

=== added file 'unity-shared/IconLoaderTask.h'
--- unity-shared/IconLoaderTask.h	1970-01-01 00:00:00 +0000
+++ unity-shared/IconLoaderTask.h	2013-01-30 14:41:22 +0000
@@ -0,0 +1,111 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+* Copyright (C) 2010-2012 Canonical Ltd
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 3 as
+* published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* Authored by: Neil Jagdish Patel <[e-mail]>
+               Nick Dedekind <[e-mail]>
+*/
+
+#ifndef UNITY_ICON_LOADER_TASK_H
+#define UNITY_ICON_LOADER_TASK_H
+
+#include "IconLoader.h"
+#include <unity-protocol.h>
+#include <NuxCore/Object.h>
+#include <UnityCore/GLibSource.h>
+
+namespace unity
+{
+namespace icon_loader
+{
+
+class IconLoaderImpl;
+
+enum IconLoaderRequestType
+{
+  REQUEST_TYPE_ICON_NAME = 0,
+  REQUEST_TYPE_GICON_STRING,
+  REQUEST_TYPE_URI,
+};
+typedef int Handle;
+
+// We use a nux::Object so we get threadsafe reference counting for cross thread destruction safety.
+class IconLoaderTask : public nux::Object
+{
+public:
+  typedef nux::ObjectPtr<IconLoaderTask> Ptr;
+  NUX_DECLARE_OBJECT_TYPE(IconLoader, Object);
+
+  IconLoaderTask(IconLoaderRequestType type_,
+                 std::string const& data_,
+                 int max_width_,
+                 int max_height_,
+                 std::string const& key_,
+                 IconLoaderImpl* self_);
+
+  ~IconLoaderTask();
+
+  void InvokeSlot();
+
+  bool Process();
+
+  void AddSlot(Handle handle, IconLoaderCallback slot);
+
+  bool LoadIconComplete();
+
+private:
+
+  bool ProcessIconNameTask();
+
+  bool ProcessGIconTask();
+
+  bool ProcessURITask();
+  
+  void PushSchedulerJob();
+
+  void CategoryIconLoaded(std::string const& base_icon_string,
+                          int max_width, int max_height,
+                          glib::Object<GdkPixbuf> const& category_pixbuf,
+                          glib::Object<UnityProtocolAnnotatedIcon> const& anno_icon);
+
+  void BaseIconLoaded(std::string const& base_icon_string,
+                      int base_max_width, int base_max_height,
+                      glib::Object<GdkPixbuf> const& base_pixbuf,
+                      glib::Object<UnityProtocolAnnotatedIcon> const& anno_icon);
+
+  static void CalculateTextHeight(int* width, int* height);
+
+public:
+  IconLoaderRequestType type_;
+  std::string data_;
+  int max_width_;
+  int max_height_;
+  std::string key_;
+  std::map<Handle, IconLoaderCallback> slots_;
+  IconLoaderImpl* impl_;
+  GtkIconInfo* icon_info_;
+  bool no_cache_;
+  int helper_handle_;
+  glib::Object<GdkPixbuf> result_;
+  glib::Error error_;
+  std::list<IconLoaderTask::Ptr> shadow_tasks_;
+  glib::Source::UniquePtr timer_complete_;
+  bool finished_;
+};
+
+}
+}
+
+#endif // UNITY_ICON_LOADER_TASK_H