summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-03-24 23:40:26 -0400
committerraveit65 <[email protected]>2016-03-25 11:01:42 +0100
commitda9c05196c082312c18cb74fd21e1a4534d56f53 (patch)
tree92adecf04f5e20ee2aac965899f5b4f750cf14b0
parent40bb634d564dbf752fcc3420d3d92cef94eea592 (diff)
downloadmate-panel-da9c05196c082312c18cb74fd21e1a4534d56f53.tar.bz2
mate-panel-da9c05196c082312c18cb74fd21e1a4534d56f53.tar.xz
Gtk3.18/3.20-move background handling toplevel
panel-profile.c
-rw-r--r--mate-panel/panel-profile.c11
1 files 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);