From 566242b000341de4b424fe215da6cff7b5ce6ad1 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Thu, 24 Mar 2016 23:47:35 -0400 Subject: Gtk3.18/3.20-move background handling toplevel panel-toplevel.h move background handling to the panel toplevel in GTK 3.18 and GTK 3.20 builds only, seems to fix the applet crashes on theme changes with a custom background loaded, and in GTK 3.20 also preserves custom backgrounds when GTK themes are changed --- mate-panel/panel-toplevel.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mate-panel/panel-toplevel.h b/mate-panel/panel-toplevel.h index 935bdd01..51bc0059 100644 --- a/mate-panel/panel-toplevel.h +++ b/mate-panel/panel-toplevel.h @@ -27,7 +27,11 @@ #include +#include "panel-background.h" + +#if GTK_CHECK_VERSION (3, 18, 0) #include "panel-enums.h" +#endif #ifdef __cplusplus extern "C" { @@ -56,7 +60,9 @@ struct _PanelToplevel { GSettings *settings; GSettings *queued_settings; GSettings *background_settings; - +#if GTK_CHECK_VERSION (3, 18, 0) + PanelBackground background; +#endif PanelToplevelPrivate *priv; }; -- cgit v1.2.1