From 40e26ed6d0e9ef84522ad0723f630bd7d796beec Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Sat, 15 Oct 2016 15:39:12 +0300
Subject: move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option

---
 src/compositor/compositor-private.h |  5 -----
 src/compositor/compositor-xrender.c | 29 -----------------------------
 src/compositor/compositor.c         | 16 ----------------
 3 files changed, 50 deletions(-)

(limited to 'src/compositor')

diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h
index 1eef9633..1fa64695 100644
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -44,13 +44,8 @@ struct _MetaCompositor
   void (*process_event) (MetaCompositor *compositor,
                          XEvent         *event,
                          MetaWindow     *window);
-#if GTK_CHECK_VERSION (3, 0, 0)
   cairo_surface_t *(* get_window_surface) (MetaCompositor *compositor,
                                            MetaWindow     *window);
-#else
-  Pixmap (*get_window_pixmap) (MetaCompositor *compositor,
-                               MetaWindow     *window);
-#endif
   void (*set_active_window) (MetaCompositor *compositor,
                              MetaScreen     *screen,
                              MetaWindow     *window);
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
index 1da598c5..4ad4a6aa 100644
--- a/src/compositor/compositor-xrender.c
+++ b/src/compositor/compositor-xrender.c
@@ -36,9 +36,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 #include <cairo/cairo-xlib.h>
-#endif
 
 #include "display.h"
 #include "screen.h"
@@ -2802,7 +2800,6 @@ xrender_process_event (MetaCompositor *compositor,
 #endif
 }
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 static cairo_surface_t *
 xrender_get_window_surface (MetaCompositor *compositor,
                             MetaWindow     *window)
@@ -2841,28 +2838,6 @@ xrender_get_window_surface (MetaCompositor *compositor,
                                     cw->attrs.width, cw->attrs.height);
 #endif
 }
-#else
-static Pixmap
-xrender_get_window_pixmap (MetaCompositor *compositor,
-                           MetaWindow     *window)
-{
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-  MetaCompWindow *cw = NULL;
-  MetaScreen *screen = meta_window_get_screen (window);
-  MetaFrame *frame = meta_window_get_frame (window);
-
-  cw = find_window_for_screen (screen, frame ? meta_frame_get_xwindow (frame) :
-                               meta_window_get_xwindow (window));
-  if (cw == NULL)
-    return None;
-
-  if (meta_window_is_shaded (window))
-    return cw->shaded_back_pixmap;
-  else
-    return cw->back_pixmap;
-#endif
-}
-#endif  /* GTK_CHECK_VERSION */
 
 static void
 xrender_set_active_window (MetaCompositor *compositor,
@@ -3046,11 +3021,7 @@ static MetaCompositor comp_info = {
   xrender_remove_window,
   xrender_set_updates,
   xrender_process_event,
-#if GTK_CHECK_VERSION (3, 0, 0)
   xrender_get_window_surface,
-#else
-  xrender_get_window_pixmap,
-#endif
   xrender_set_active_window,
   xrender_free_window,
   xrender_maximize_window,
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index 4d3f370b..39344e82 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -107,7 +107,6 @@ meta_compositor_process_event (MetaCompositor *compositor,
 #endif
 }
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 cairo_surface_t *
 meta_compositor_get_window_surface (MetaCompositor *compositor,
                                     MetaWindow     *window)
@@ -121,21 +120,6 @@ meta_compositor_get_window_surface (MetaCompositor *compositor,
   return NULL;
 #endif
 }
-#else
-Pixmap
-meta_compositor_get_window_pixmap (MetaCompositor *compositor,
-                                   MetaWindow     *window)
-{
-#ifdef HAVE_COMPOSITE_EXTENSIONS
-  if (compositor && compositor->get_window_pixmap)
-    return compositor->get_window_pixmap (compositor, window);
-  else
-    return None;
-#else
-  return None;
-#endif
-}
-#endif  /* GTK_CHECK_VERSION */
 
 void
 meta_compositor_set_active_window (MetaCompositor *compositor,
-- 
cgit v1.2.1