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

[Mirco Müller]

Once the new average-color of the wallpaper is computed, in addition to being broadcasted via ubus within the unity-process, it is also written to a newly introduced GSettings key "com.canonical.Unity average-bg-color".

This will be picked up by the NotifyOSD-process, thus it is able to update the rendering of future notifications.

[Gord Allott (gordallott)]

Rejecting for now, simply because we can't do this this cycle and the code will just rot in here

review: Disapprove

Unmerged revisions

1274. By Mirco Müller on 2011-07-20

sometimes my brain hurts

1273. By Mirco Müller on 2011-07-19

Trying to fix LP: #810325

1272. By Gord Allott on 2011-07-19

merged latest trunk

1271. By Gord Allott on 2011-07-19

added dep on unity-core for the tests

1270. By Gord Allott on 2011-07-19

initalises bghash in unity shell instead of the dash

1269. By Gord Allott on 2011-07-18

merge latest trunk

1268. By Gord Allott on 2011-07-18

added request colour support over ubus

1267. By Gord Allott on 2011-07-14

bias the left hand side

1266. By Gord Allott on 2011-07-13

added support on the launcher for changing the colour, my editor fixed the whitespace in the launcher too, sorry about that.

1265. By Gord Allott on 2011-07-13

merged trunk, hated CMake some more

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2011-07-20 06:41:32 +0000
+++ com.canonical.Unity.gschema.xml	2011-07-21 09:53:28 +0000
@@ -25,7 +25,13 @@
       <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">
       <default>[ 'ubiquity-gtkui.desktop', 'nautilus-home.desktop', 'firefox.desktop', 'libreoffice-writer.desktop', 'libreoffice-calc.desktop', 'libreoffice-impress.desktop', 'ubuntu-software-center.desktop', 'ubuntuone-control-panel-gtk.desktop' ]</default>

=== modified file 'plugins/unityshell/src/BGHash.cpp'
--- plugins/unityshell/src/BGHash.cpp	2011-07-21 09:53:27 +0000
+++ plugins/unityshell/src/BGHash.cpp	2011-07-21 09:53:28 +0000
@@ -28,6 +28,8 @@
   int level_of_recursion;
   const int MAX_LEVEL_OF_RECURSION = 16;
   const int MIN_LEVEL_OF_RECURSION = 2;
+  const gchar* AVG_BG_COLOR = "average-bg-color\0";
+  const gchar* UNITY_SCHEMA = "com.canonical.Unity\0";
 }
 namespace unity {
 
@@ -300,6 +302,22 @@
                                             _current_color.blue,
                                             _current_color.alpha)
                             );
+
+    GSettings* settings     = NULL;
+    gchar*     color_string = NULL;
+    GdkColor   color        = {0,
+                               (guint16) (_current_color.red * 65535.0),
+                               (guint16) (_current_color.green * 65535.0),
+                               (guint16) (_current_color.blue * 65535.0)};
+
+	settings = g_settings_new (UNITY_SCHEMA);
+	if (settings)
+    {
+      color_string = gdk_color_to_string (&color);
+      g_settings_set_string (settings, AVG_BG_COLOR, color_string);
+      g_object_unref (settings);
+	  g_free (color_string);
+	}
   }
 
   GdkPixbuf *BGHash::GetPixbufFromBG ()

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2011-07-21 09:53:27 +0000
+++ tests/CMakeLists.txt	2011-07-21 09:53:28 +0000
@@ -296,6 +296,7 @@
                 ${UNITY_SRC}/ubus-server.h
                )
 add_dependencies (test-bg-hash unity-core-${UNITY_API_VERSION})
+
 #
 # GTest tests
 #