Merge lp:~nick-dedekind/unity/lp1052582.remove-source-manager into lp:unity

[Nick Dedekind]

Removed source manager instance from SoftwareCenterLauncherIcon in favour of LauncherIcon instance.

Removed source manager instance from SoftwareCenterLauncherIcon in favour of LauncherIcon instance.

[Marco Trevisan (Treviño) (3v1n0)]

Thanks a lot ;)

review: Approve

=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2012-10-10 16:38:42 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2012-10-16 16:47:20 +0000
@@ -130,10 +130,10 @@
       finished_ = true;
       needs_urgent_ = true;
 
-      sources_.AddIdle([this]()
+      _source_manager.AddIdle([this]()
       {
         ShowTooltip();
-        sources_.AddTimeout(INSTALL_TIP_DURATION, [this]()
+        _source_manager.AddTimeout(INSTALL_TIP_DURATION, [this]()
         {
           HideTooltip();
           return false;

=== modified file 'launcher/SoftwareCenterLauncherIcon.h'
--- launcher/SoftwareCenterLauncherIcon.h	2012-10-10 16:38:42 +0000
+++ launcher/SoftwareCenterLauncherIcon.h	2012-10-16 16:47:20 +0000
@@ -23,7 +23,6 @@
 
 #include <string>
 #include <UnityCore/GLibDBusProxy.h>
-#include <UnityCore/GLibSource.h>
 #include "ApplicationLauncherIcon.h"
 #include "LauncherDragWindow.h"
 
@@ -60,7 +59,6 @@
   nux::ObjectPtr<nux::IOpenGLBaseTexture> icon_texture_;
   nux::ObjectPtr<LauncherDragWindow> drag_window_;
   nux::ObjectPtr<Launcher> launcher_;
-  glib::SourceManager sources_;
   bool finished_;
   bool needs_urgent_;