move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option

and require libmatekbd and libmate-desktop >= 1.17

1 files changed, 0 insertions, 69 deletions

diff --git a/savers/floaters.c b/savers/floaters.c
index d565d63..b9291dc 100644
--- a/savers/floaters.c
+++ b/savers/floaters.c
@@ -35,8 +35,6 @@
 #include <glib/gi18n.h>
 
 #include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-
 #include <gtk/gtk.h>
 
 #include "gs-theme-window.h"
@@ -284,13 +282,8 @@ static void screen_saver_create_floaters (ScreenSaver *screen_saver);
 static void screen_saver_destroy_floaters (ScreenSaver *screen_saver);
 static void screen_saver_on_size_allocate (ScreenSaver   *screen_saver,
         GtkAllocation *allocation);
-#if GTK_CHECK_VERSION (3, 0, 0)
 static void screen_saver_on_draw (ScreenSaver    *screen_saver,
         cairo_t *context);
-#else
-static void screen_saver_on_expose_event (ScreenSaver    *screen_saver,
-        GdkEventExpose *event);
-#endif
 static gboolean do_print_screen_saver_stats (ScreenSaver *screen_saver);
 static GdkPixbuf *gamma_correct (const GdkPixbuf *input_pixbuf);
 
@@ -860,15 +853,9 @@ screen_saver_new (GtkWidget       *drawing_area,
 	                          G_CALLBACK (screen_saver_on_size_allocate),
 	                          screen_saver);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	g_signal_connect_swapped (G_OBJECT (drawing_area), "draw",
 	                          G_CALLBACK (screen_saver_on_draw),
 	                          screen_saver);
-#else
-	g_signal_connect_swapped (G_OBJECT (drawing_area), "expose-event",
-	                          G_CALLBACK (screen_saver_on_expose_event),
-	                          screen_saver);
-#endif
 
 	screen_saver->first_update_time = 0.0;
 	screen_saver->current_calculated_stats_time = 0.0;
@@ -1021,59 +1008,23 @@ compare_floaters (ScreenSaverFloater *a,
 }
 
 static void
-#if GTK_CHECK_VERSION (3, 0, 0)
 screen_saver_on_draw (ScreenSaver    *screen_saver,
                       cairo_t        *context)
-#else
-screen_saver_on_expose_event (ScreenSaver    *screen_saver,
-                              GdkEventExpose *event)
-#endif
 {
 	GList *tmp;
-#if !GTK_CHECK_VERSION (3, 0, 0)
-	cairo_t *context;
-#endif
 
 	if (screen_saver->floaters == NULL)
 		screen_saver_create_floaters (screen_saver);
 
-#if !GTK_CHECK_VERSION (3, 0, 0)
-	context = gdk_cairo_create (gtk_widget_get_window (screen_saver->drawing_area));
-
-	cairo_rectangle (context,
-	                 (double) event->area.x,
-	                 (double) event->area.y,
-	                 (double) event->area.width,
-	                 (double) event->area.height);
-	cairo_clip (context);
-#endif
-
 	screen_saver->floaters = g_list_sort (screen_saver->floaters,
 	                                      (GCompareFunc)compare_floaters);
 
 	for (tmp = screen_saver->floaters; tmp != NULL; tmp = tmp->next)
 	{
 		ScreenSaverFloater *floater;
-#if !GTK_CHECK_VERSION (3, 0, 0)
-		GdkRectangle rect;
-		gint size;
-#endif
 
 		floater = (ScreenSaverFloater *) tmp->data;
 
-#if !GTK_CHECK_VERSION (3, 0, 0)
-		size = CLAMP ((int) (FLOATER_MAX_SIZE * floater->scale),
-		              FLOATER_MIN_SIZE, FLOATER_MAX_SIZE);
-
-		rect.x = (int) (floater->position.x - .5 * G_SQRT2 * size);
-		rect.y = (int) (floater->position.y - .5 * G_SQRT2 * size);
-		rect.width = G_SQRT2 * size;
-		rect.height = G_SQRT2 * size;
-
-		if (!gdk_region_rect_in (event->region, &rect))
-			continue;
-#endif
-
 		if (!screen_saver_floater_do_draw (screen_saver, floater, context))
 		{
 			gtk_main_quit ();
@@ -1081,10 +1032,6 @@ screen_saver_on_expose_event (ScreenSaver    *screen_saver,
 		}
 	}
 
-#if !GTK_CHECK_VERSION (3, 0, 0)
-	cairo_destroy (context);
-#endif
-
 	screen_saver->draw_ops_pending = TRUE;
 	screen_saver->frame_count++;
 }
@@ -1219,12 +1166,6 @@ main (int   argc,
 	ScreenSaver     *screen_saver;
 	GtkWidget       *window;
 	GtkWidget       *drawing_area;
-#if !GTK_CHECK_VERSION (3, 0, 0)
-	GtkStyle        *style;
-	GtkStateType     state;
-	GdkColor         black = { 0, 0x0000, 0x0000, 0x0000 };
-#endif
-
 	GError *error;
 
 	error = NULL;
@@ -1264,16 +1205,6 @@ main (int   argc,
 
 	drawing_area = GTK_WIDGET (gtk_drawing_area_new ());
 
-#if !GTK_CHECK_VERSION (3, 0, 0)
-	style = gtk_widget_get_style (drawing_area);
-	state = (GtkStateType) 0;
-	while (state < (GtkStateType) G_N_ELEMENTS (style->bg))
-	{
-		gtk_widget_modify_bg (drawing_area, state, &black);
-		state++;
-	}
-#endif
-
 	gtk_widget_show (drawing_area);
 	gtk_container_add (GTK_CONTAINER (window), drawing_area);