Merge lp:~donadigo/granite/set-color-primary-refine into lp:~elementary-pantheon/granite/granite

[Adam Bieńkowski]

Granite.Widgets.Utils.set_color_primary: return the added provider and simplify the contents of the method

This branch changes the Granite.Widgets.Utils.set_color_primary definition to include the return value in order to then remove the added provider from the screen if needed. It also replaces the most code in this function with a single call to existing Granite.Widgets.Utils.set_theming_for_screen function.

[Felipe Escoto (philip.scott)]

It passed the ABI test and it doesn't break apps that depend on it. so it should be good to merge.

Only i'm not sure if it's too late in the cycle

review: Approve

=== modified file 'lib/Widgets/Utils.vala'
--- lib/Widgets/Utils.vala	2015-11-01 12:59:58 +0000
+++ lib/Widgets/Utils.vala	2016-08-01 21:29:32 +0000
@@ -140,20 +140,15 @@
      * @param window the widget to apply the color
      * @param color the color to apply
      * @param priority the priority of the style provider
+     * 
+     * @return the added {@link Gtk.CssProvider}, or null in case the parsing of
+     *         stylesheet failed.
      */
-    public void set_color_primary (Gtk.Widget window, Gdk.RGBA color, int priority = Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) {
+    public Gtk.CssProvider? set_color_primary (Gtk.Widget window, Gdk.RGBA color, int priority = Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION) {
         assert (window != null);
 
-        var css_provider = new Gtk.CssProvider ();
         string hex = color.to_string ();
-        try {
-            css_provider.load_from_data (@"@define-color colorPrimary $hex;", -1);
-        } catch (Error e) {
-            warning ("Could not apply primary color: %s\n", e.message);
-            return;
-        }
-
-        Gtk.StyleContext.add_provider_for_screen (window.get_screen (), css_provider, priority);
+        return set_theming_for_screen (window.get_screen (), @"@define-color colorPrimary $hex;", priority);
     }
 
     /**