Merge lp:~unity-team/unity/unity.fix-810325-2 into lp:unity

[Mirco Müller]

The updated Unity-part of fixing LP: #810325. This makes sure the average color - computed after a change of wallpaper - is exposed via Unity's GSettings schema. That in turn can get picked up by other applications... notify-osd in this case.

[Gord Allott (gordallott)]

few things need fixing

24 + const gchar* AVG_BG_COLOR = "average-bg-color\0";
25 + const gchar* UNITY_SCHEMA = "com.canonical.Unity\0";

should use std::string not gchar*'s

35 + gchar* color_string = NULL;

should use unity::glib::String, from UnityCore/GlibWrapper.h - it will handle freeing when scope is lost for you and you can use it with methods.

41 + settings = g_settings_new (UNITY_SCHEMA);

we have a gsettings pointer in the object already, "client", should use that instead of creating another instance

review: Needs Fixing

[Mirco Müller (macslow)]

Fixes stated issues.

[Gord Allott (gordallott)]

review: Approve

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2012-02-04 05:28:23 +0000
+++ com.canonical.Unity.gschema.xml	2012-02-07 15:00:26 +0000
@@ -20,6 +20,11 @@
       <summary>Whether the home screen should be expanded.</summary>
       <description>Whether the home screen should be expanded.</description>
     </key>
+    <key type="s" name="average-bg-color">
+      <default>'#757550507B7BFFFF'</default>
+      <summary>Average background color</summary>
+      <description>The average color derived from the currently set desktop-wallpaper. This is written/updated by the Unity-process and read by NotifyOSD-process for example.</description>
+    </key>
   </schema>
   <schema path="/desktop/unity/launcher/" id="com.canonical.Unity.Launcher" gettext-domain="unity">
     <key type="as" name="favorites">

=== modified file 'plugins/unityshell/src/BGHash.cpp'
--- plugins/unityshell/src/BGHash.cpp	2012-01-04 09:33:05 +0000
+++ plugins/unityshell/src/BGHash.cpp	2012-02-07 15:00:26 +0000
@@ -35,6 +35,8 @@
   int level_of_recursion;
   const int MAX_LEVEL_OF_RECURSION = 16;
   const int MIN_LEVEL_OF_RECURSION = 2;
+  std::string AVG_BG_COLOR = "average-bg-color";
+  std::string UNITY_SCHEMA = "com.canonical.Unity";
 }
 namespace unity {
 
@@ -373,6 +375,19 @@
                                             _current_color.blue * 0.7f,
                                             0.5)
                             );
+    GSettings* settings = NULL;
+    GdkColor   color    = {0,
+                           (guint16) (_current_color.red * 65535.0 * 0.7f),
+                           (guint16) (_current_color.green * 65535.0 * 0.7f),
+                           (guint16) (_current_color.blue * 65535.0 * 0.7f)};
+
+    settings = g_settings_new (UNITY_SCHEMA.c_str());
+    if (settings)
+    {
+      unity::glib::String color_string(gdk_color_to_string(&color));
+      g_settings_set_string(settings, AVG_BG_COLOR.c_str(), color_string);
+      g_object_unref (settings);
+    }
   }
 
   GdkPixbuf *BGHash::GetPixbufFromBG ()