From da9c05196c082312c18cb74fd21e1a4534d56f53 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Thu, 24 Mar 2016 23:40:26 -0400 Subject: Gtk3.18/3.20-move background handling toplevel panel-profile.c --- mate-panel/panel-profile.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c index 61c05b8c..e63a0feb 100644 --- a/mate-panel/panel-profile.c +++ b/mate-panel/panel-profile.c @@ -620,8 +620,12 @@ panel_profile_load_background (PanelToplevel *toplevel) gboolean rotate; panel_widget = panel_toplevel_get_panel_widget (toplevel); - background = &panel_widget->background; +#if GTK_CHECK_VERSION (3, 18, 0) + background = &panel_widget->toplevel->background; +#else + background = &panel_widget->background; +#endif background_type = panel_profile_get_background_type (toplevel); get_background_color (toplevel, &color); @@ -906,8 +910,11 @@ panel_profile_background_change_notify (GSettings *settings, if (panel_widget == NULL) return; +#if GTK_CHECK_VERSION (3, 18, 0) + background = &panel_widget->toplevel->background; +#else background = &panel_widget->background; - +#endif if (!strcmp (key, "type")) { PanelBackgroundType background_type; background_type = g_settings_get_enum (settings, key); -- cgit v1.2.1