diff options
| author | infirit <[email protected]> | 2014-10-25 12:58:42 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-10-25 12:58:42 +0200 |
| commit | b831ed3ec6337a21a9048bc39e989a7de8280c5f (patch) | |
| tree | 47555a380207cdfe2ea643410ee15c70d53bcf16 | |
| parent | 20615934a9d4faf8cd45de56c51357d985461267 (diff) | |
| download | marco-b831ed3ec6337a21a9048bc39e989a7de8280c5f.tar.bz2 marco-b831ed3ec6337a21a9048bc39e989a7de8280c5f.tar.xz | |
Drop support for Gtk+ < 2.24
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/ui/frames.c | 48 |
2 files changed, 1 insertions, 49 deletions
diff --git a/configure.ac b/configure.ac index f43612ac..ecea7680 100644 --- a/configure.ac +++ b/configure.ac @@ -118,7 +118,7 @@ AC_MSG_RESULT([$with_gtk]) case "$with_gtk" in 2.0) GTK_API_VERSION=2.0 - GTK_MIN_VERSION=2.20.0 + GTK_MIN_VERSION=2.24.0 CANBERRA_GTK=libcanberra-gtk ;; 3.0) GTK_API_VERSION=3.0 diff --git a/src/ui/frames.c b/src/ui/frames.c index 54ad369c..d9c7ea1c 100644 --- a/src/ui/frames.c +++ b/src/ui/frames.c @@ -2106,54 +2106,6 @@ meta_frames_destroy_event (GtkWidget *widget, return TRUE; } -#if !GTK_CHECK_VERSION(2,21,6) -/* Copied from GDK */ -static cairo_surface_t * -_gdk_drawable_ref_cairo_surface (GdkDrawable *drawable) -{ - g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL); - - return GDK_DRAWABLE_GET_CLASS (drawable)->ref_cairo_surface (drawable); -} - -static cairo_pattern_t * -gdk_window_get_background_pattern (GdkWindow *window) -{ - GdkWindowObject *private = (GdkWindowObject *) window; - cairo_pattern_t *pattern; - - g_return_val_if_fail (GDK_IS_WINDOW (window), NULL); - - if (private->bg_pixmap == GDK_PARENT_RELATIVE_BG) - pattern = NULL; - else if (private->bg_pixmap != GDK_NO_BG && - private->bg_pixmap != NULL) - { - static cairo_user_data_key_t key; - cairo_surface_t *surface; - - surface = _gdk_drawable_ref_cairo_surface (private->bg_pixmap); - pattern = cairo_pattern_create_for_surface (surface); - cairo_surface_destroy (surface); - - cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT); - cairo_pattern_set_user_data (pattern, - &key, - g_object_ref (private->bg_pixmap), - g_object_unref); - } - else - { - pattern = - cairo_pattern_create_rgb (private->bg_color.red / 65535., - private->bg_color.green / 65535., - private->bg_color.blue / 65535.); - } - - return pattern; -} -#endif - static void setup_bg_cr (cairo_t *cr, GdkWindow *window, int x_offset, int y_offset) { |