[Xfce4-commits] [xfce/xfce4-panel] 02/02: Replace deprecated gtk_style_context_get_background_color

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository xfce/xfce4-panel.

commit 354c066e329e6abe29ef46f40d085b501e415477
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sat Apr 15 23:41:14 2017 +0200

    Replace deprecated gtk_style_context_get_background_color
---
 panel/panel-base-window.c |  8 +++-----
 wrapper/wrapper-plug.c    | 12 +++++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c
index b8e29db..1e11889 100644
--- a/panel/panel-base-window.c
+++ b/panel/panel-base-window.c
@@ -232,7 +232,6 @@ panel_base_window_get_property (GObject    *object,
   PanelBaseWindow         *window = PANEL_BASE_WINDOW (object);
   PanelBaseWindowPrivate  *priv = window->priv;
   GdkRGBA                 *rgba;
-  GdkRGBA                  bg_color;
   GtkStyleContext         *ctx;
 
   switch (prop_id)
@@ -256,8 +255,9 @@ panel_base_window_get_property (GObject    *object,
       else
         {
           ctx = gtk_widget_get_style_context (GTK_WIDGET (window));
-          gtk_style_context_get_background_color (ctx, GTK_STATE_NORMAL, &bg_color);
-          rgba = &bg_color;
+          gtk_style_context_get (ctx, GTK_STATE_FLAG_NORMAL,
+                                 GTK_STYLE_PROPERTY_BACKGROUND_COLOR,
+                                 &rgba, NULL);
         }
       g_value_set_boxed (value, rgba);
       break;
@@ -295,9 +295,7 @@ panel_base_window_set_property (GObject      *object,
   PanelBaseWindow        *window = PANEL_BASE_WINDOW (object);
   PanelBaseWindowPrivate *priv = window->priv;
   PanelBgStyle            bg_style;
-  GtkStyleContext        *context;
 
-  context = gtk_widget_get_style_context (GTK_WIDGET (window));
   switch (prop_id)
     {
     case PROP_ENTER_OPACITY:
diff --git a/wrapper/wrapper-plug.c b/wrapper/wrapper-plug.c
index a3ad661..7fad6eb 100644
--- a/wrapper/wrapper-plug.c
+++ b/wrapper/wrapper-plug.c
@@ -153,9 +153,9 @@ wrapper_plug_draw (GtkWidget *widget,
                    cairo_t   *cr)
 {
   WrapperPlug     *plug = WRAPPER_PLUG (widget);
-  GtkStyleContext *style;
+  GtkStyleContext *context;
   const GdkRGBA   *color;
-  GdkRGBA          rgba;
+  GdkRGBA         *rgba;
   GdkPixbuf       *pixbuf;
   GError          *error = NULL;
 
@@ -215,9 +215,11 @@ wrapper_plug_draw (GtkWidget *widget,
         }
       else
         {
-          style = gtk_widget_get_style_context (widget);
-          gtk_style_context_get_background_color (style, GTK_STATE_FLAG_NORMAL, &rgba);
-          gdk_cairo_set_source_rgba (cr, &rgba);
+          context = gtk_widget_get_style_context (widget);
+          gtk_style_context_get (context, GTK_STATE_FLAG_NORMAL,
+                                 GTK_STYLE_PROPERTY_BACKGROUND_COLOR,
+                                 &rgba, NULL);
+          gdk_cairo_set_source_rgba (cr, rgba);
         }
 
       /* draw the background color */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.