summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-03-24 23:47:35 -0400
committerraveit65 <[email protected]>2016-03-25 11:01:42 +0100
commit566242b000341de4b424fe215da6cff7b5ce6ad1 (patch)
treee4bd9cb90c78a8605992c198a607c77039479c22
parent3fd59e58fe9119023bb177da6cf945d501f8804e (diff)
downloadmate-panel-566242b000341de4b424fe215da6cff7b5ce6ad1.tar.bz2
mate-panel-566242b000341de4b424fe215da6cff7b5ce6ad1.tar.xz
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
-rw-r--r--mate-panel/panel-toplevel.h8
1 files changed, 7 insertions, 1 deletions
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 <gtk/gtk.h>
+#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;
};