From e51cc4ecddbd57cb900610ac8f1dcc0b350b8d68 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Fri, 13 Nov 2015 18:29:14 +0100 Subject: Gtk+-3.16 draw-workspace.c: don't use deprecated gtk_style_context_get_background_color partially taken from: https://git.gnome.org/browse/metacity/commit/?id=33ad43f --- src/ui/draw-workspace.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/ui/draw-workspace.c b/src/ui/draw-workspace.c index 4feb25c9..694dcae1 100644 --- a/src/ui/draw-workspace.c +++ b/src/ui/draw-workspace.c @@ -65,6 +65,27 @@ get_window_rect (const WnckWindowDisplayInfo *win, rect->height = height; } +#if GTK_CHECK_VERSION (3, 16, 0) +static void +get_background_color (GtkStyleContext *context, + GtkStateFlags state, + GdkRGBA *color) +{ + GdkRGBA *c; + + g_return_if_fail (color != NULL); + g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); + + gtk_style_context_get (context, + state, + "background-color", &c, + NULL); + + *color = *c; + gdk_rgba_free (c); +} +#endif + static void draw_window (GtkWidget *widget, #if GTK_CHECK_VERSION(3, 0, 0) @@ -107,7 +128,11 @@ draw_window (GtkWidget *widget, if (is_active) meta_gtk_style_get_light_color (style, state, &color); else +#if GTK_CHECK_VERSION (3, 16, 0) + get_background_color (style, state, &color); +#else gtk_style_context_get_background_color (style, state, &color); +#endif gdk_cairo_set_source_rgba (cr, &color); #else style = gtk_widget_get_style (widget); -- cgit v1.2.1