summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2016-02-11 07:34:31 +0100
committerWolfgang Ulbrich <[email protected]>2016-02-12 07:04:30 +0100
commit34e7aab28c26aae136be2cbf1df6b48ea24e9bcc (patch)
treea93363b78bb39825df02c29a8c02c4ec1e2a386b
parenta14d2b7ddde3bc2713b31e692331f74f0b5ceb68 (diff)
downloadmate-panel-34e7aab28c26aae136be2cbf1df6b48ea24e9bcc.tar.bz2
mate-panel-34e7aab28c26aae136be2cbf1df6b48ea24e9bcc.tar.xz
Gtk+-3 panel-widget: don't use deprecated get_background_color
taken from: https://git.gnome.org/browse/gnome-panel/commit/?id=539ecc4
-rw-r--r--mate-panel/panel-widget.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c
index ab1872cb..a776a86a 100644
--- a/mate-panel/panel-widget.c
+++ b/mate-panel/panel-widget.c
@@ -1640,23 +1640,26 @@ panel_widget_set_background_default_style (GtkWidget *widget)
{
GtkStyleContext *context;
GtkStateFlags state;
- GdkRGBA bg_color;
+ GdkRGBA *bg_color;
cairo_pattern_t *bg_image;
+ PanelBackground *background;
if (gtk_widget_get_realized (widget)) {
context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget);
+ background = &PANEL_WIDGET (widget)->background;
gtk_style_context_add_class(context,"gnome-panel-menu-bar");
gtk_style_context_add_class(context,"mate-panel-menu-bar");
panel_background_apply_css (&PANEL_WIDGET (widget)->background, widget);
- gtk_style_context_get_background_color (context, state, &bg_color);
- gtk_style_context_get (context, state, "background-image", &bg_image, NULL);
+ gtk_style_context_get (context, state,
+ "background-color", &bg_color,
+ "background-image", &bg_image,
+ NULL);
- panel_background_set_default_style (
- &PANEL_WIDGET (widget)->background,
- &bg_color,
- bg_image);
+ panel_background_set_default_style (background,
+ bg_color,
+ bg_image);
if (bg_image)
cairo_pattern_destroy (bg_image);