Merge lp:~azzar1/unity/custom-bg-color-icon into lp:unity

[Andrea Azzarone]

Adds support for X-Unity-IconBackgroundColor in the .desktop file.

This branch adds the ability to force the background color of a launcher icon using the X-Unity-IconBackgroundColor in the desktop file. So you can do something like:

X-Unity-IconBackgroundColor=#aabbcc

The hex string may be in one of these formats:
#rgb
#rrggbb
rgb
rrggbb

== Test ==
Unit tests added.

== Notes ==
Depends on lp:~andyrock/nux/color-html-notation

[Thomi Richards (thomir-deactivatedaccount)]

Hi Andy,

A few things need fixing (I bet you never saw that coming!)

std::string DesktopUtilities::GetBackgroundColor(std::string const& desktop_path)

THis ^^ needs to be made const.

nux::Color BamfLauncherIcon::BackgroundColor()

This too.

Do we need better testing? Perhaps something in autopilot?

review: Needs Fixing

[Andrea Azzarone (azzar1)]

> Hi Andy,
>
>
> A few things need fixing (I bet you never saw that coming!)
>
> std::string DesktopUtilities::GetBackgroundColor(std::string const&
> desktop_path)
>

GetBackgroundColor is a static member. We'll never call GetBackgroundColor on a
const instance of DesktopUtilities. But it will be done.

>
> THis ^^ needs to be made const.
>
> nux::Color BamfLauncherIcon::BackgroundColor()
>
> This too.
>

This is a virtual member so I have to change all the BackgroundColor methods (SimpleLauncherIcon::Back...)

>
> Do we need better testing? Perhaps something in autopilot?

First of all we need to add a local .desktop file to the launcher (because we cannot edit a .desktop file in /usr/share/applications without being root)... It will be done.

[Andrea Azzarone (azzar1)]

> Hi Andy,
>
>
> A few things need fixing (I bet you never saw that coming!)
>
> std::string DesktopUtilities::GetBackgroundColor(std::string const&
> desktop_path)

A static function/method cannot be const.

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

Unity code looks good to me.

review: Approve

[Andrea Azzarone (azzar1)]

AP test added.

[Thomi Richards (thomir-deactivatedaccount)]

186 -// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
187 +// -*- Mode: C++; indent-tamos-mode: nil; tab-width: 2 -*-

Ummm.... ??

422 +
423 +
424 +
425 +
426 +
427 +

Extra blank lines don't need to be there.

439 + def test_custom_background_color(self):
440 + """Tests X-Unity-IconBackgroundColor."""

Please change this docstring. I suggest the following:
"""THe X-Unity-IconBackgroundColor property must change the launcher icon's background color."""

441 + path = os.getenv("PYTHONPATH")
442 + if path == None:
443 + self.skipTest("Cannot run this test if PYTHONPATH has not been set.")

Don't do this. For a start, PYTHONPATH can be multiple directories, or it can be empty. Your test shouldn't rely on a specific configuration in order to run.
444 +
445 + desktop_file = os.path.join(path, "unity/tests/unity-test.desktop")
446 + desktop_file = os.path.realpath(desktop_file)

Again, this won't work if PYTHONPATH is empty or is set to multiple directories. If you *really* need to get the path of this file you can do:

os.path.dirname(__file__)

... which will give you something like '/home/thomi/code/canonical/unity/reviews/branchname/tests/autopilot/unity/tests/'.

447 +
448 + old_value = self.call_gsettings_cmd('get', 'com.canonical.Unity.Launcher', 'favorites')
449 + value = eval(old_value)

Can you please explain what's going on here? Generally speaking, calling 'eval' is a bad idea, and is especially bad when passing it a string that comes from elsewhere. What happens when I set that config option to 'import subprocess;subprocess.call("rm -rf".split())' ?

450 + value.append(desktop_file)
451 + self.addCleanup(self.call_gsettings_cmd, 'set', 'com.canonical.Unity.Launcher', 'favorites', old_value)
452 + self.call_gsettings_cmd('set', 'com.canonical.Unity.Launcher', 'favorites', str(value))

Again, I'm not sure what this is supposed to do. I'm sure that we can find a better way to do it though. The launcher emulator already has a method that allows you to add a custom .desktop file to the launcher - can you use that? If not, let me know what you need and I'll try and come up with a solution for you.

453 +
454 + icon = self.launcher.model.get_icon_by_desktop_id(desktop_file)
455 + self.assertThat(icon, NotEquals(None))
456 + self.assertThat(icon.bg_color_red, Eventually(Equals(0xaa)))
457 + self.assertThat(icon.bg_color_green, Eventually(Equals(0xbb)))
458 + self.assertThat(icon.bg_color_blue, Eventually(Equals(0xcc)))
459 + self.assertThat(icon.bg_color_alpha, Eventually(Equals(0xff)))
460 +

This part is fine however :)

review: Needs Fixing

[Thomi Richards (thomir-deactivatedaccount)]

...also, I notice in several places you've done this:

36 - std::vector<std::string> const& data_dirs = GetDataDirectories();
37 + std::vector<std::string> const data_dirs(GetDataDirectories());

i.e.-= changed it from returning a const ref of T to a const copy of T.

I can't see what the point if making the T const is. You're returning a copy, so why do you care what the caller does it with? I'd suggest either returning a straight copy, or, if you think it's performance critical, return a const ref like it was.

Cheers,

[Tim Penhey (thumper)]

launcher/TrashLauncherIcon.h has a lot of blank lines at the start :)

[Andrea Azzarone (azzar1)]

> 186 -// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
> 187 +// -*- Mode: C++; indent-tamos-mode: nil; tab-width: 2 -*-
>
> Ummm.... ??
>
> 422 +
> 423 +
> 424 +
> 425 +
> 426 +
> 427 +
>
>
> Extra blank lines don't need to be there.
>

Oos.

> 439 + def test_custom_background_color(self):
> 440 + """Tests X-Unity-IconBackgroundColor."""
>
> Please change this docstring. I suggest the following:
> """THe X-Unity-IconBackgroundColor property must change the launcher icon's
> background color."""
>
> 441 + path = os.getenv("PYTHONPATH")
> 442 + if path == None:
> 443 + self.skipTest("Cannot run this test if PYTHONPATH has not been
> set.")
>
> Don't do this. For a start, PYTHONPATH can be multiple directories, or it can
> be empty. Your test shouldn't rely on a specific configuration in order to
> run.
> 444 +
> 445 + desktop_file = os.path.join(path, "unity/tests/unity-test.desktop")
> 446 + desktop_file = os.path.realpath(desktop_file)
>
> Again, this won't work if PYTHONPATH is empty or is set to multiple
> directories. If you *really* need to get the path of this file you can do:
>
> os.path.dirname(__file__)
>
> ... which will give you something like '/home/thomi/code/canonical/unity/revie
> ws/branchname/tests/autopilot/unity/tests/'.
>
> 447 +
> 448 + old_value = self.call_gsettings_cmd('get',
> 'com.canonical.Unity.Launcher', 'favorites')
> 449 + value = eval(old_value)
>
> Can you please explain what's going on here? Generally speaking, calling
> 'eval' is a bad idea, and is especially bad when passing it a string that
> comes from elsewhere. What happens when I set that config option to 'import
> subprocess;subprocess.call("rm -rf".split())' ?
>
> 450 + value.append(desktop_file)
> 451 + self.addCleanup(self.call_gsettings_cmd, 'set',
> 'com.canonical.Unity.Launcher', 'favorites', old_value)
> 452 + self.call_gsettings_cmd('set', 'com.canonical.Unity.Launcher',
> 'favorites', str(value))
>
> Again, I'm not sure what this is supposed to do. I'm sure that we can find a
> better way to do it though. The launcher emulator already has a method that
> allows you to add a custom .desktop file to the launcher - can you use that?

No because we need a local .desktop file with a X-Unity-IconBackroundColor key
and we cannot edit a .desktop file in /usr/share/applications.

> If not, let me know what you need and I'll try and come up with a solution for
> you.
>

If you can find another way to test it (with AP) let me know :)

>
> 453 +
> 454 + icon = self.launcher.model.get_icon_by_desktop_id(desktop_file)
> 455 + self.assertThat(icon, NotEquals(None))
> 456 + self.assertThat(icon.bg_color_red, Eventually(Equals(0xaa)))
> 457 + self.assertThat(icon.bg_color_green, Eventually(Equals(0xbb)))
> 458 + self.assertThat(icon.bg_color_blue, Eventually(Equals(0xcc)))
> 459 + self.assertThat(icon.bg_color_alpha, Eventually(Equals(0xff)))
> 460 +
>
> This part is fine however :)

[Andrea Azzarone (azzar1)]

So what we have to do in the AP is:
#. Get a dekstop .file with X-Unity-IconBackroundColor key
#. Start the app
#. Get the icon app
#. Make sure the bg color icon is correct.

Any idea? Otherwise I'll try to write an unit test for this.

[Andrea Azzarone (azzar1)]

Ok I replaced the AP test with a unit one.

review: Needs Resubmitting

[Thomi Richards (thomir-deactivatedaccount)]

Hi Andy,

Sorry, I didn't see your replies. For future reference, I'd rather you kept data file data in a python string (provided that it's very small, as a desktop file is), and inside the test write that data to a temporary file.

The unit test looks good to me.

review: Approve

[Adolfo Jayme Barrientos (fitojb)]

Linked to bug #962120

=== modified file 'UnityCore/DesktopUtilities.cpp'
--- UnityCore/DesktopUtilities.cpp	2012-03-30 16:56:05 +0000
+++ UnityCore/DesktopUtilities.cpp	2012-06-06 16:00:26 +0000
@@ -15,12 +15,15 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 * Authored by: Marco Trevisan (Treviño) <[e-mail]>
+*              Andrea Azzarone <[e-mail]>
 */
 
+#include <algorithm>
+
 #include <glib.h>
-#include <algorithm>
 
 #include "DesktopUtilities.h"
+#include "GLibWrapper.h"
 
 namespace unity
 {
@@ -64,7 +67,7 @@
 std::vector<std::string> DesktopUtilities::GetDataDirectories()
 {
   std::vector<std::string> dirs = GetSystemDataDirectories();
-  std::string const& user_directory = GetUserDataDirectory();  
+  std::string const& user_directory = GetUserDataDirectory();
 
   dirs.push_back(user_directory);
 
@@ -116,4 +119,24 @@
   return GetDesktopID(data_dirs, desktop_path);
 }
 
+
+std::string DesktopUtilities::GetBackgroundColor(std::string const& desktop_path)
+{
+  GKeyFile* key_file = g_key_file_new();
+
+  glib::Error error;
+  g_key_file_load_from_file(key_file, desktop_path.c_str(), static_cast<GKeyFileFlags>(0), &error);
+
+  if (error)
+  {
+    g_key_file_free(key_file);
+    return "";
+  }
+
+  glib::String value(g_key_file_get_string(key_file, "Desktop Entry", "X-Unity-IconBackgroundColor", &error));
+
+  g_key_file_free(key_file);
+  return value.Str();
+}
+
 } // namespace unity

=== modified file 'UnityCore/DesktopUtilities.h'
--- UnityCore/DesktopUtilities.h	2012-03-30 16:56:05 +0000
+++ UnityCore/DesktopUtilities.h	2012-06-06 16:00:26 +0000
@@ -36,6 +36,8 @@
   static std::string GetDesktopID(std::string const& desktop_path);
   static std::string GetDesktopID(std::vector<std::string> const& default_paths,
                                   std::string const& desktop_path);
+
+  static std::string GetBackgroundColor(std::string const& desktop_path);
 };
 
 } // namespace

=== modified file 'hud/HudIconTextureSource.cpp'
--- hud/HudIconTextureSource.cpp	2012-05-07 00:49:31 +0000
+++ hud/HudIconTextureSource.cpp	2012-06-06 16:00:26 +0000
@@ -98,7 +98,7 @@
   }
 }
 
-nux::Color HudIconTextureSource::BackgroundColor()
+nux::Color HudIconTextureSource::BackgroundColor() const
 {
   return bg_color;
 }

=== modified file 'hud/HudIconTextureSource.h'
--- hud/HudIconTextureSource.h	2012-05-07 00:49:31 +0000
+++ hud/HudIconTextureSource.h	2012-06-06 16:00:26 +0000
@@ -34,7 +34,7 @@
   HudIconTextureSource(nux::ObjectPtr<nux::BaseTexture> texture);
   ~HudIconTextureSource();
   
-  virtual nux::Color BackgroundColor();
+  virtual nux::Color BackgroundColor() const;
   virtual nux::BaseTexture* TextureForSize(int size);
   virtual nux::Color GlowColor();
   virtual nux::BaseTexture* Emblem();

=== modified file 'launcher/BFBLauncherIcon.cpp'
--- launcher/BFBLauncherIcon.cpp	2012-05-15 19:33:20 +0000
+++ launcher/BFBLauncherIcon.cpp	2012-06-06 16:00:26 +0000
@@ -80,7 +80,7 @@
   }
 }
 
-nux::Color BFBLauncherIcon::BackgroundColor()
+nux::Color BFBLauncherIcon::BackgroundColor() const
 {
   return background_color_;
 }

=== modified file 'launcher/BFBLauncherIcon.h'
--- launcher/BFBLauncherIcon.h	2012-05-07 19:52:54 +0000
+++ launcher/BFBLauncherIcon.h	2012-06-06 16:00:26 +0000
@@ -38,7 +38,7 @@
 public:
   BFBLauncherIcon(LauncherHideMode hide_mode);
 
-  virtual nux::Color BackgroundColor();
+  virtual nux::Color BackgroundColor() const;
   virtual nux::Color GlowColor();
 
   void ActivateLauncherIcon(ActionArg arg);

=== modified file 'launcher/BamfLauncherIcon.cpp'
--- launcher/BamfLauncherIcon.cpp	2012-05-23 17:34:11 +0000
+++ launcher/BamfLauncherIcon.cpp	2012-06-06 16:00:26 +0000
@@ -53,6 +53,8 @@
   , _supported_types_filled(false)
   , _fill_supported_types_id(0)
   , _window_moved_id(0)
+  , use_custom_bg_color_(false)
+  , bg_color_(nux::color::White)
 {
   g_object_set_qdata(G_OBJECT(app), g_quark_from_static_string("unity-seen"),
                      GUINT_TO_POINTER(1));
@@ -154,6 +156,7 @@
   EnsureWindowState();
   UpdateMenus();
   UpdateDesktopFile();
+  UpdateBackgroundColor();
 
   // hack
   SetProgress(0.0f);
@@ -508,6 +511,7 @@
                                       break;
                                     case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
                                       UpdateDesktopQuickList();
+                                      UpdateBackgroundColor();
                                       break;
                                     default:
                                       break;
@@ -778,6 +782,23 @@
   }
 }
 
+void BamfLauncherIcon::UpdateBackgroundColor()
+{
+  bool last_use_custom_bg_color = use_custom_bg_color_;
+  nux::Color last_bg_color(bg_color_);
+
+  std::string const& color = DesktopUtilities::GetBackgroundColor(DesktopFile());
+
+  use_custom_bg_color_ = !color.empty();
+
+  if (use_custom_bg_color_)
+    bg_color_ = nux::Color(color);
+
+  if (last_use_custom_bg_color != use_custom_bg_color_ ||
+      last_bg_color != bg_color_)
+    EmitNeedsRedraw();
+}
+
 void BamfLauncherIcon::UpdateMenus()
 {
   GList* children, *l;
@@ -1253,6 +1274,14 @@
   return result;
 }
 
+nux::Color BamfLauncherIcon::BackgroundColor() const
+{
+  if (use_custom_bg_color_)
+    return bg_color_;
+
+  return SimpleLauncherIcon::BackgroundColor();
+}
+
 const std::set<std::string>& BamfLauncherIcon::GetSupportedTypes()
 {
   if (!_supported_types_filled)

=== modified file 'launcher/BamfLauncherIcon.h'
--- launcher/BamfLauncherIcon.h	2012-05-15 18:52:54 +0000
+++ launcher/BamfLauncherIcon.h	2012-06-06 16:00:26 +0000
@@ -60,6 +60,8 @@
   virtual bool ShowInSwitcher(bool current);
   virtual unsigned long long SwitcherPriority();
 
+  virtual nux::Color BackgroundColor() const;
+
   std::vector<Window> Windows();
   std::vector<Window> WindowsOnViewport();
   std::vector<Window> WindowsForMonitor(int monitor);
@@ -101,6 +103,7 @@
 
   void EnsureWindowState();
   void EnsureMenuItemsReady();
+  void UpdateBackgroundColor();
   void UpdateDesktopFile();
   void UpdateMenus();
   void UpdateDesktopQuickList();
@@ -140,6 +143,9 @@
   glib::Object<DbusmenuMenuitem> _menu_desktop_shortcuts;
   glib::Object<GFileMonitor> _desktop_file_monitor;
   glib::SignalManager _gsignals;
+
+  bool use_custom_bg_color_;
+  nux::Color bg_color_;
 };
 
 }

=== modified file 'launcher/HudLauncherIcon.cpp'
--- launcher/HudLauncherIcon.cpp	2012-05-15 19:33:20 +0000
+++ launcher/HudLauncherIcon.cpp	2012-06-06 16:00:26 +0000
@@ -106,7 +106,7 @@
   }
 }
 
-nux::Color HudLauncherIcon::BackgroundColor()
+nux::Color HudLauncherIcon::BackgroundColor() const
 {
   return background_color_;
 }

=== modified file 'launcher/HudLauncherIcon.h'
--- launcher/HudLauncherIcon.h	2012-05-07 19:52:54 +0000
+++ launcher/HudLauncherIcon.h	2012-06-06 16:00:26 +0000
@@ -36,7 +36,7 @@
 public:
   HudLauncherIcon(LauncherHideMode hide_mode);
 
-  virtual nux::Color BackgroundColor();
+  virtual nux::Color BackgroundColor() const;
   virtual nux::Color GlowColor();
 
   void ActivateLauncherIcon(ActionArg arg);

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2012-06-01 04:00:29 +0000
+++ launcher/LauncherIcon.cpp	2012-06-06 16:00:26 +0000
@@ -240,7 +240,7 @@
   UpdateQuirkTime(QUIRK_LAST_ACTION);
 }
 
-nux::Color LauncherIcon::BackgroundColor()
+nux::Color LauncherIcon::BackgroundColor() const
 {
   return _background_color;
 }

=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2012-06-01 04:00:29 +0000
+++ launcher/LauncherIcon.h	2012-06-06 16:00:26 +0000
@@ -147,7 +147,7 @@
 
   IconType GetIconType();
 
-  virtual nux::Color BackgroundColor();
+  virtual nux::Color BackgroundColor() const;
 
   virtual nux::Color GlowColor();
 

=== modified file 'launcher/MockLauncherIcon.h'
--- launcher/MockLauncherIcon.h	2012-05-07 19:52:54 +0000
+++ launcher/MockLauncherIcon.h	2012-06-06 16:00:26 +0000
@@ -219,7 +219,7 @@
     return type_;
   }
 
-  nux::Color BackgroundColor()
+  nux::Color BackgroundColor() const
   {
     return nux::Color(0xFFAAAAAA);
   }

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-06-04 22:47:12 +0000
+++ tests/CMakeLists.txt	2012-06-06 16:00:26 +0000
@@ -198,6 +198,7 @@
 
 # Tests that require X
   add_executable(test-gtest
+                 test_bamflaunchericon.cpp
                  test_hud_button.cpp
                  test_dashview_impl.cpp
                  test_texture_cache.cpp
@@ -221,10 +222,14 @@
                  ${CMAKE_SOURCE_DIR}/hud/HudPrivate.cpp
                  ${CMAKE_SOURCE_DIR}/hud/HudView.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/AbstractLauncherIcon.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/BamfLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/CairoBaseWindow.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/DNDCollectionWindow.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/Decaymulator.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/DndData.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/FavoriteStore.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/FavoriteStoreGSettings.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/FavoriteStorePrivate.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/GeisAdapter.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/Launcher.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherDragWindow.cpp

=== modified file 'tests/data/ubuntu-software-center.desktop'
--- tests/data/ubuntu-software-center.desktop	2011-11-28 15:56:30 +0000
+++ tests/data/ubuntu-software-center.desktop	2012-06-06 16:00:26 +0000
@@ -10,3 +10,4 @@
 MimeType=application/x-deb;application/x-debian-package;x-scheme-handler/apt;
 StartupNotify=true
 X-Ubuntu-Gettext-Domain=software-center
+X-Unity-IconBackgroundColor=#aabbcc

=== added file 'tests/test_bamflaunchericon.cpp'
--- tests/test_bamflaunchericon.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_bamflaunchericon.cpp	2012-06-06 16:00:26 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY 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
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Andrea Azzarone <[e-mail]>
+ */
+
+#include <config.h>
+#include <gmock/gmock.h>
+
+#include <UnityCore/GLibWrapper.h>
+
+#include "BamfLauncherIcon.h"
+#include "unity-shared/WindowManager.h"
+using namespace unity;
+
+namespace
+{
+
+class TestBamfLauncherIcon : public testing::Test
+{
+public:
+  virtual void SetUp()
+  {
+    WindowManager::SetDefault(WindowManager::Default());
+
+    bamf_matcher = bamf_matcher_get_default();
+    bamf_app = bamf_matcher_get_application_for_desktop_file(bamf_matcher,
+                                                             BUILDDIR"/tests/data/ubuntu-software-center.desktop",
+                                                             TRUE);
+
+    usc_icon = new launcher::BamfLauncherIcon(bamf_app);
+
+  }
+
+  virtual void TearDown()
+  {
+  }
+
+  glib::Object<BamfMatcher> bamf_matcher;
+  BamfApplication* bamf_app;
+  nux::ObjectPtr<launcher::BamfLauncherIcon> usc_icon;
+
+};
+
+TEST_F(TestBamfLauncherIcon, TestCustomBackgroundColor)
+{
+  nux::Color const& color = usc_icon->BackgroundColor();
+
+  EXPECT_EQ(color.red, 0xaa / 255.0f);
+  EXPECT_EQ(color.green, 0xbb / 255.0f);
+  EXPECT_EQ(color.blue, 0xcc / 255.0f);
+  EXPECT_EQ(color.alpha, 0xff / 255.0f);
+}
+
+}

=== modified file 'tests/test_desktop_utilities.cpp'
--- tests/test_desktop_utilities.cpp	2012-03-31 10:31:01 +0000
+++ tests/test_desktop_utilities.cpp	2012-06-06 16:00:26 +0000
@@ -16,8 +16,11 @@
  *
  * Authored by: Marco Trevisan (Treviño) <[e-mail]>
  *              Tim Penhey <[e-mail]>
+ *              Andrea Azzarone <[e-mail]>
  */
 
+#include <config.h>
+
 #include <UnityCore/DesktopUtilities.h>
 
 #include <glib.h>
@@ -135,4 +138,25 @@
   EXPECT_THAT(data_dirs[4], Eq("UnityUserConfig"));
 }
 
+TEST(TestDesktopUtilitiesDataDirectories, TestGetBackgroundColor)
+{
+  std::string const& color = DesktopUtilities::GetBackgroundColor(BUILDDIR"/tests/data/ubuntu-software-center.desktop");
+
+  EXPECT_EQ(color, "#aabbcc");
+}
+
+TEST(TestDesktopUtilitiesDataDirectories, TestGetBackgroundColorNoKey)
+{
+  std::string const& color = DesktopUtilities::GetBackgroundColor(BUILDDIR"/tests/data/update-manager.desktop");
+
+  EXPECT_TRUE(color.empty());
+}
+
+TEST(TestDesktopUtilitiesDataDirectories, TestGetBackgroundColorNoFile)
+{
+  std::string const& color = DesktopUtilities::GetBackgroundColor("hello-world.desktop");
+
+  EXPECT_TRUE(color.empty());
+}
+
 } // anonymous namespace

=== modified file 'tests/test_main.cpp'
--- tests/test_main.cpp	2012-05-15 18:54:33 +0000
+++ tests/test_main.cpp	2012-06-06 16:00:26 +0000
@@ -1,12 +1,13 @@
 #include <gtest/gtest.h>
 #include <gio/gio.h>
+#include <gtk/gtk.h>
 #include <NuxCore/Logger.h>
 #include <Nux/Nux.h>
 
 int main(int argc, char** argv)
 {
   ::testing::InitGoogleTest(&argc, argv);
-  g_type_init();
+  gtk_init(&argc, &argv);
   
   nux::NuxInitialize (0);
   nux::WindowThread* wnd_thread = nux::CreateNuxWindow("Tests", 300, 200, nux::WINDOWSTYLE_NORMAL, NULL, false, NULL, NULL);

=== modified file 'unity-shared/IconTextureSource.h'
--- unity-shared/IconTextureSource.h	2012-05-07 00:49:31 +0000
+++ unity-shared/IconTextureSource.h	2012-06-06 16:00:26 +0000
@@ -49,7 +49,7 @@
 
   std::vector<nux::Vector4> & GetTransform(TransformIndex index, int monitor);
 
-  virtual nux::Color BackgroundColor() = 0;
+  virtual nux::Color BackgroundColor() const = 0;
 
   virtual nux::Color GlowColor() = 0;