LauncherIcon: only care about to the last connected remote entry

(bzr r3844.9.1)

3 files changed, 7 insertions, 3 deletions

diff --git a/unity-shared/IconRenderer.cpp b/unity-shared/IconRenderer.cpp
index 2c8933888..1b684d82c 100644
--- a/unity-shared/IconRenderer.cpp
+++ b/unity-shared/IconRenderer.cpp
@@ -352,6 +352,7 @@ void IconRenderer::PreprocessIcons(std::list<RenderArg>& args, nux::Geometry con
 GetInverseScreenPerspectiveMatrix(ViewMatrix, ProjectionMatrix, geo.width, geo.height, 0.1f, 1000.0f, DEGTORAD(90));
 
 nux::Matrix4 const& PremultMatrix = ProjectionMatrix * ViewMatrix;
+ int monitor = this->monitor();
 
 std::list<RenderArg>::iterator it;
 int i;
diff --git a/unity-shared/IconTextureSource.cpp b/unity-shared/IconTextureSource.cpp
index 92056eaf9..8b6494e8d 100644
--- a/unity-shared/IconTextureSource.cpp
+++ b/unity-shared/IconTextureSource.cpp
@@ -91,5 +91,10 @@ bool IconTextureSource::HadEmblem(int monitor) const
 return had_emblem_[monitor];
 }
 
+nux::BaseTexture* IconTextureSource::Emblem() const
+{
+ return nullptr;
+}
+
 }
 } \ No newline at end of file
diff --git a/unity-shared/IconTextureSource.h b/unity-shared/IconTextureSource.h
index 2a81c0902..8e28bc646 100644
--- a/unity-shared/IconTextureSource.h
+++ b/unity-shared/IconTextureSource.h
@@ -63,12 +63,10 @@ public:
 bool HadEmblem(int monitor) const;
 
 virtual nux::Color BackgroundColor() const = 0;
-
 virtual nux::Color GlowColor() = 0;
-
 virtual nux::BaseTexture* TextureForSize(int size) = 0;
 
- virtual nux::BaseTexture* Emblem() = 0;
+ virtual nux::BaseTexture* Emblem() const;
 
 private:
 std::vector<bool> skip_;