Merge lp:~desrt/unity/no-average-bg-color-gsettings into lp:unity

[Allison Lortie]

don't store average-bg-color in GSettings

This is now exported by libgnome-desktop as an X property on the root window. Interested applications can pick it up from there.

don't store average-bg-color in GSettings

This is now exported by libgnome-desktop as an X property on the root
window. Interested applications can pick it up from there.

[Tim Penhey (thumper)]

I'd like Mirco to look at this as he uses this with notify-osd I think.

[Mirco Müller (macslow)]

Looking at this before the weekend and updating my related branches accordingly.

[Mirco Müller (macslow)]

With the changes from Ryan in notify-osd (merge-proposed), this is good to go in.

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

[Allison Lortie (desrt)]

review: Approve

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2012-02-22 13:59:25 +0000
+++ com.canonical.Unity.gschema.xml	2012-03-10 04:56:20 +0000
@@ -20,11 +20,6 @@
       <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-02-22 13:40:18 +0000
+++ plugins/unityshell/src/BGHash.cpp	2012-03-10 04:56:20 +0000
@@ -35,8 +35,6 @@
   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 {
 
@@ -343,23 +341,6 @@
     _hires_time_start = g_get_monotonic_time();
     _hires_time_end = 500 * 1000; // 500 milliseconds
     _transition_handler = g_timeout_add (1000/60, (GSourceFunc)BGHash::OnTransitionCallback, this);
-
-    // export to gsettings
-    GSettings* settings = NULL;
-    GdkColor   color    = {0,
-                           (guint16) (_new_color.red * 65535.0 * 0.7f),
-                           (guint16) (_new_color.green * 65535.0 * 0.7f),
-                           (guint16) (_new_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));
-      LOG_DEBUG(logger) << "Setting gsettings key to: " << color_string;
-      g_settings_set_string(settings, AVG_BG_COLOR.c_str(), color_string);
-      g_object_unref (settings);
-    }
-
   }
 
   gboolean BGHash::OnTransitionCallback(BGHash *self)