diff options
| author | raveit65 <[email protected]> | 2016-03-22 20:15:12 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-03-22 20:15:12 +0100 |
| commit | f9221b85ca81f34dc6eb258c6b160bf88ef0d7ea (patch) | |
| tree | 70902289fea7c868d969fadf60a19f19050ab2b0 | |
| parent | b6684bd302bd6794771eb2569b2b7b1539f8be09 (diff) | |
| download | mate-panel-f9221b85ca81f34dc6eb258c6b160bf88ef0d7ea.tar.bz2 mate-panel-f9221b85ca81f34dc6eb258c6b160bf88ef0d7ea.tar.xz | |
use gtk+-3.20 custom bg fixixes only for > gtk+-3.18 and > glib-2.42
This fixes also distcheck
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | libmate-panel-applet/Makefile.am | 12 | ||||
| -rw-r--r-- | libmate-panel-applet/panel-plug-private.h | 4 | ||||
| -rw-r--r-- | libmate-panel-applet/panel-plug.c | 3 |
4 files changed, 8 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index b9e2e948..970a72eb 100644 --- a/configure.ac +++ b/configure.ac @@ -103,7 +103,6 @@ case "$with_gtk" in esac AC_SUBST(GTK_API_VERSION) -AM_CONDITIONAL([HAVE_GTK3], [test "x$GTK_API_VERSION" = "x3.0"]) dnl pkg-config dependency checks PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-$GTK_API_VERSION) diff --git a/libmate-panel-applet/Makefile.am b/libmate-panel-applet/Makefile.am index cb83268c..2d181c97 100644 --- a/libmate-panel-applet/Makefile.am +++ b/libmate-panel-applet/Makefile.am @@ -14,7 +14,7 @@ libmate_panel_appletinclude_HEADERS = \ mate-panel-applet.h \ mate-panel-applet-gsettings.h \ mate-panel-applet-enums.h -if HAVE_GTK3 + libmate_panel_applet_4_la_SOURCES = \ $(BUILT_SOURCES) \ mate-panel-applet.h \ @@ -25,16 +25,6 @@ libmate_panel_applet_4_la_SOURCES = \ mate-panel-applet-gsettings.h \ panel-plug.c \ panel-plug-private.h -else -libmate_panel_applet_4_la_SOURCES = \ - $(BUILT_SOURCES) \ - mate-panel-applet.h \ - mate-panel-applet.c \ - mate-panel-applet-factory.h \ - mate-panel-applet-factory.c \ - mate-panel-applet-gsettings.c \ - mate-panel-applet-gsettings.h -endif libmate_panel_applet_4_la_LIBADD = \ $(LIBMATE_PANEL_APPLET_LIBS) \ diff --git a/libmate-panel-applet/panel-plug-private.h b/libmate-panel-applet/panel-plug-private.h index 5c7f12ad..0aa64717 100644 --- a/libmate-panel-applet/panel-plug-private.h +++ b/libmate-panel-applet/panel-plug-private.h @@ -18,6 +18,9 @@ #ifndef PANEL_PLUG_PRIVATE_H #define PANEL_PLUG_PRIVATE_H +#include <gtk/gtk.h> +#if GTK_CHECK_VERSION (3, 19, 0) && GLIB_CHECK_VERSION (2, 44, 0) + #include <gtk/gtkx.h> G_BEGIN_DECLS @@ -30,3 +33,4 @@ GtkWidget *panel_plug_new (void); G_END_DECLS #endif +#endif diff --git a/libmate-panel-applet/panel-plug.c b/libmate-panel-applet/panel-plug.c index 549e98f9..5b0e366c 100644 --- a/libmate-panel-applet/panel-plug.c +++ b/libmate-panel-applet/panel-plug.c @@ -15,6 +15,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <gtk/gtk.h> +#if GTK_CHECK_VERSION (3, 19, 0) && GLIB_CHECK_VERSION (2, 44, 0) #include "config.h" #include "panel-plug-private.h" @@ -98,3 +100,4 @@ panel_plug_new (void) { return g_object_new (PANEL_TYPE_PLUG, NULL); } +#endif |