diff options
| author | monsta <[email protected]> | 2016-11-21 18:56:46 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-21 18:56:46 +0300 |
| commit | 615eda9a394167fbc5e4f6bf4f3668e2c8aff080 (patch) | |
| tree | 68befa101d659a693d741c6cccd3b84c3fe8243c | |
| parent | 762dd7e1eb33dc408c5fae091d0284ba71e4d0a0 (diff) | |
| download | mate-panel-615eda9a394167fbc5e4f6bf4f3668e2c8aff080.tar.bz2 mate-panel-615eda9a394167fbc5e4f6bf4f3668e2c8aff080.tar.xz | |
libmate-panel-applet: remove redundant GLib version check in panel-plug
| -rw-r--r-- | libmate-panel-applet/panel-plug-private.h | 6 | ||||
| -rw-r--r-- | libmate-panel-applet/panel-plug.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libmate-panel-applet/panel-plug-private.h b/libmate-panel-applet/panel-plug-private.h index 182bf502..4a69184e 100644 --- a/libmate-panel-applet/panel-plug-private.h +++ b/libmate-panel-applet/panel-plug-private.h @@ -19,12 +19,16 @@ #define PANEL_PLUG_PRIVATE_H #include <gtk/gtk.h> -#if GTK_CHECK_VERSION (3, 18, 0) && GLIB_CHECK_VERSION (2, 44, 0) +#if GTK_CHECK_VERSION (3, 18, 0) #include <gtk/gtkx.h> G_BEGIN_DECLS +/* G_DECLARE_FINAL_TYPE is available only since GLib 2.44, + * but GTK+ 3.18 already requires 2.45.8, so we're safe. + */ + #define PANEL_TYPE_PLUG panel_plug_get_type () G_DECLARE_FINAL_TYPE (PanelPlug, panel_plug, PANEL, PLUG, GtkPlug) diff --git a/libmate-panel-applet/panel-plug.c b/libmate-panel-applet/panel-plug.c index 7360ddac..781271aa 100644 --- a/libmate-panel-applet/panel-plug.c +++ b/libmate-panel-applet/panel-plug.c @@ -16,7 +16,7 @@ */ #include <gtk/gtk.h> -#if GTK_CHECK_VERSION (3, 18, 0) && GLIB_CHECK_VERSION (2, 44, 0) +#if GTK_CHECK_VERSION (3, 18, 0) #include "config.h" #include "panel-plug-private.h" |