diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2011-05-24 20:05:42 +0200 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2012-01-12 17:09:37 +0100 |
| commit | 03d4c13ab32ca42d1226e6f314dbbfe810d46122 (patch) | |
| tree | 3db7940a89466ff7e7b79954c11929c9856d0328 | |
| parent | 1d22c6b57de22b3e406af6aae43a7527acc36d1a (diff) | |
| download | metacity-03d4c13ab32ca42d1226e6f314dbbfe810d46122.tar.gz | |
build: Bump required GTK+ version and remove compat code
https://bugzilla.gnome.org/show_bug.cgi?id=572332
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gdk-compat.h | 35 | ||||
| -rw-r--r-- | src/ui/frames.c | 2 | ||||
| -rw-r--r-- | src/ui/ui.c | 2 |
5 files changed, 1 insertions, 41 deletions
diff --git a/configure.in b/configure.in index 88987638..63122cd0 100644 --- a/configure.in +++ b/configure.in @@ -112,7 +112,7 @@ dnl This used to purport to allow compilation against gtk3, but it doesn't actua dnl work; see https://bugzilla.gnome.org/show_bug.cgi?id=650513 with_gtk=2.0 GTK_API_VERSION=2.0 -GTK_MIN_VERSION=2.20.0 +GTK_MIN_VERSION=2.24.0 GIO_MIN_VERSION=2.25.10 CANBERRA_GTK=libcanberra-gtk diff --git a/src/Makefile.am b/src/Makefile.am index fa49bef8..cfbce378 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,7 +38,6 @@ metacity_SOURCES= \ core/frame.c \ core/frame-private.h \ include/frame.h \ - gdk-compat.h \ ui/gradient.c \ ui/gradient.h \ core/group-private.h \ diff --git a/src/gdk-compat.h b/src/gdk-compat.h deleted file mode 100644 index b794f24c..00000000 --- a/src/gdk-compat.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef __GDK_COMPAT_H__ -#define __GDK_COMPAT_H__ - -#include <gdk/gdk.h> - -/* Provide a compatibility layer for accessor function introduced - * in GTK+ 2.22 which we need to build without deprecated GDK symbols. - * That way it is still possible to build with GTK+ 2.20 when not - * using GDK_DISABLE_DEPRECATED. - */ - -#if !GTK_CHECK_VERSION (2, 21, 1) - -#define gdk_window_get_background(w,c) *c = GDK_WINDOW_OBJECT (w)->bg_color -#define gdk_visual_get_depth(v) GDK_VISUAL(v)->depth -#define gdk_window_get_back_pixmap(w,p,r) \ - G_STMT_START { \ - GdkWindowObject *priv = GDK_WINDOW_OBJECT (w); \ - \ - if (p != NULL) \ - { \ - if (priv->bg_pixmap == GDK_PARENT_RELATIVE_BG || \ - priv->bg_pixmap == GDK_NO_BG) \ - *p = NULL; \ - else \ - *p = priv->bg_pixmap; \ - } \ - \ - if (r != NULL) \ - *r = (priv->bg_pixmap == GDK_PARENT_RELATIVE_BG); \ - } G_STMT_END - -#endif /*GTK_CHECK_VERSION */ - -#endif /* __GDK_COMPAT_H__ */ diff --git a/src/ui/frames.c b/src/ui/frames.c index 232994b0..22f501e1 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -35,8 +35,6 @@ #include "prefs.h" #include "ui.h" -#include "gdk-compat.h" - #ifdef HAVE_SHAPE #include <X11/extensions/shape.h> #endif diff --git a/src/ui/ui.c b/src/ui/ui.c index 5a4af380..5ef4f525 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -32,8 +32,6 @@ #include "inlinepixbufs.h" -#include "gdk-compat.h" - #include <string.h> #include <stdlib.h> |