[eog] Compile against GTK+-3.0



commit 82785ea392f4d5eea0c0048cc16ed3386d28567e
Author: Florian Müllner <fmuellner gnome org>
Date:   Tue Jul 13 07:51:32 2010 +0200

    Compile against GTK+-3.0
    
    Replace the removed GdkRegion API with the corresponding
    cairo_region_t API and switch the build to GTK+-3.0.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=624261

 configure.ac          |   12 ++++++------
 src/eog-scroll-view.c |    9 ++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bdfc15c..73ea192 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,25 +83,25 @@ GNOME_DOC_INIT
 # GNOME Libs
 # **********
 
-GTK_REQUIRED=2.18.0
+GTK_REQUIRED=2.90.4
 GLIB_REQUIRED=2.25.9
-GNOME_DESKTOP_REQUIRED=2.25.1
+GNOME_DESKTOP_REQUIRED=2.90.4
 GDKPIXBUF_REQUIRED=2.4.0
 # Require GConf 2.31+ for GConf-GSettings-Backend
 GCONF_REQUIRED=2.31.1
-GTK_PRINT_REQUIRED=2.10.0
+GTK_PRINT_REQUIRED=2.90.4
 GNOME_ICON_THEME_REQUIRED=2.19.1
 SHARED_MIME_INFO_REQUIRED=0.20
 EXEMPI_REQUIRED=1.99.5
 
-EOG_MODULES="gtk+-2.0 >= $GTK_REQUIRED \
+EOG_MODULES="gtk+-3.0 >= $GTK_REQUIRED \
              glib-2.0 >= $GLIB_REQUIRED \
              gio-2.0 >= $GLIB_REQUIRED \
              gthread-2.0 >= $GLIB_REQUIRED \
-             gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED \
+             gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED \
              gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED \
              gconf-2.0 >= $GCONF_REQUIRED \
-             gtk+-unix-print-2.0 >= $GTK_PRINT_REQUIRED \
+             gtk+-unix-print-3.0 >= $GTK_PRINT_REQUIRED \
 	     gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED \
 	     shared-mime-info >= $SHARED_MIME_INFO_REQUIRED"
 
diff --git a/src/eog-scroll-view.c b/src/eog-scroll-view.c
index 2ea0a4e..e7fcbc6 100644
--- a/src/eog-scroll-view.c
+++ b/src/eog-scroll-view.c
@@ -1723,7 +1723,7 @@ static gboolean
 display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
 	EogScrollView *view;
-	GdkRectangle *rects;
+	GdkRectangle rect;
 	gint n_rects;
 	int i;
 
@@ -1733,14 +1733,13 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 
 	view = EOG_SCROLL_VIEW (data);
 
-	gdk_region_get_rectangles (event->region, &rects, &n_rects);
+	n_rects = cairo_region_num_rectangles (event->region);
 
 	for (i = 0; i < n_rects; i++) {
-		request_paint_area (view, rects + i);
+		cairo_region_get_rectangle (event->region, i, &rect);
+		request_paint_area (view, &rect);
 	}
 
-	g_free (rects);
-
 	return TRUE;
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]