Unity

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

  1. lp1052582.remove-source-manager
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 2845
Proposed branch: lp:~nick-dedekind/unity/lp1052582.remove-source-manager
Merge into: lp:unity
Diff against target: 35 lines (+2/-4)
2 files modified
launcher/SoftwareCenterLauncherIcon.cpp (+2/-2)
launcher/SoftwareCenterLauncherIcon.h (+0/-2)
To merge this branch: bzr merge lp:~nick-dedekind/unity/lp1052582.remove-source-manager
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+129943@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks a lot ;)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
130 finished_ = true;130 finished_ = true;
131 needs_urgent_ = true;131 needs_urgent_ = true;
132132
133 sources_.AddIdle([this]()133 _source_manager.AddIdle([this]()
134 {134 {
135 ShowTooltip();135 ShowTooltip();
136 sources_.AddTimeout(INSTALL_TIP_DURATION, [this]()136 _source_manager.AddTimeout(INSTALL_TIP_DURATION, [this]()
137 {137 {
138 HideTooltip();138 HideTooltip();
139 return false;139 return false;
140140
=== 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 @@
2323
24#include <string>24#include <string>
25#include <UnityCore/GLibDBusProxy.h>25#include <UnityCore/GLibDBusProxy.h>
26#include <UnityCore/GLibSource.h>
27#include "ApplicationLauncherIcon.h"26#include "ApplicationLauncherIcon.h"
28#include "LauncherDragWindow.h"27#include "LauncherDragWindow.h"
2928
@@ -60,7 +59,6 @@
60 nux::ObjectPtr<nux::IOpenGLBaseTexture> icon_texture_;59 nux::ObjectPtr<nux::IOpenGLBaseTexture> icon_texture_;
61 nux::ObjectPtr<LauncherDragWindow> drag_window_;60 nux::ObjectPtr<LauncherDragWindow> drag_window_;
62 nux::ObjectPtr<Launcher> launcher_;61 nux::ObjectPtr<Launcher> launcher_;
63 glib::SourceManager sources_;
64 bool finished_;62 bool finished_;
65 bool needs_urgent_;63 bool needs_urgent_;
6664