[gnome-screensaver] Make compile with gtk3

[Ray Strode <halfline src gnome org>]

commit ae58137858659046350316bb6c985591c4ea9432
Author: Ray Strode <rstrode redhat com>
Date:   Wed Sep 29 12:42:44 2010 -0400

    Make compile with gtk3
    
    This commit does the small changes left to make g-s require and
    compile with gtk3.

 configure.ac      |   18 +++++++++---------
 savers/floaters.c |    4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1a4be42..155120a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,11 +40,11 @@ AM_GLIB_GNU_GETTEXT
 DBUS_REQUIRED_VERSION=0.30
 GLIB_REQUIRED_VERSION=2.15.0
 GCONF_REQUIRED_VERSION=2.6.1
-GDK_REQUIRED_VERSION=2.22.0
-GTK_REQUIRED_VERSION=2.22.0
+GDK_REQUIRED_VERSION=2.90.7
+GTK_REQUIRED_VERSION=2.90.7
 X11_REQUIRED_VERSION=1.0
 LIBGNOME_MENU_REQUIRED_VERSION=2.11.1
-GNOME_DESKTOP_REQUIRED_VERSION=2.29.0
+GNOME_DESKTOP_REQUIRED_VERSION=2.90.0
 
 LIBGNOMEKBDUI_REQUIRED_VERSION=0.1
 
@@ -58,10 +58,10 @@ AC_TYPE_UID_T
 AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv])
 PKG_CHECK_MODULES(GNOME_SCREENSAVER,
         x11 >= $X11_REQUIRED_VERSION
-        gtk+-2.0 >= $GTK_REQUIRED_VERSION
+        gtk+-3.0 >= $GTK_REQUIRED_VERSION
         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
-        gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+        gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
         libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
 AC_SUBST(GNOME_SCREENSAVER_CFLAGS)
 AC_SUBST(GNOME_SCREENSAVER_LIBS)
@@ -69,14 +69,14 @@ AC_SUBST(GNOME_SCREENSAVER_LIBS)
 PKG_CHECK_MODULES(GNOME_SCREENSAVER_DIALOG,
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
         gthread-2.0
-        gtk+-2.0 >= $GTK_REQUIRED_VERSION)
+        gtk+-3.0 >= $GTK_REQUIRED_VERSION)
 AC_SUBST(GNOME_SCREENSAVER_DIALOG_CFLAGS)
 AC_SUBST(GNOME_SCREENSAVER_DIALOG_LIBS)
 
 PKG_CHECK_MODULES(GNOME_SCREENSAVER_CAPPLET,
         gio-2.0 >= $GLIB_REQUIRED_VERSION
         gconf-2.0 >= $GCONF_REQUIRED_VERSION
-        gtk+-2.0 >= $GTK_REQUIRED_VERSION
+        gtk+-3.0 >= $GTK_REQUIRED_VERSION
         libgnome-menu >= $LIBGNOME_MENU_REQUIRED_VERSION)
 AC_SUBST(GNOME_SCREENSAVER_CAPPLET_CFLAGS)
 AC_SUBST(GNOME_SCREENSAVER_CAPPLET_LIBS)
@@ -108,7 +108,7 @@ esac
 
 # Optional dependencies for the theme engines
 
-SAVER_MODULES="gthread-2.0 gtk+-2.0 >= $GTK_REQUIRED_VERSION"
+SAVER_MODULES="gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED_VERSION"
 
 PKG_CHECK_MODULES(GNOME_SCREENSAVER_SAVER, $SAVER_MODULES)
 AC_SUBST(GNOME_SCREENSAVER_SAVER_CFLAGS)
@@ -172,7 +172,7 @@ AC_SUBST(PAM_PREFIX)
 # Desktop entry handling
 
 PKG_CHECK_MODULES(LIB_GNOME_MENU,
-        gtk+-2.0 >= $GTK_REQUIRED_VERSION)
+        gtk+-3.0 >= $GTK_REQUIRED_VERSION)
 
 AC_SUBST(LIB_GNOME_MENU_CFLAGS)
 AC_SUBST(LIB_GNOME_MENU_LIBS)
diff --git a/savers/floaters.c b/savers/floaters.c
index 01bf0b2..e3be5e9 100644
--- a/savers/floaters.c
+++ b/savers/floaters.c
@@ -1021,7 +1021,7 @@ screen_saver_on_expose_event (ScreenSaver    *screen_saver,
   for (tmp = screen_saver->floaters; tmp != NULL; tmp = tmp->next)
     {
       ScreenSaverFloater *floater;
-      GdkRectangle rect;
+      cairo_rectangle_int_t rect;
       gint size;
 
       floater = (ScreenSaverFloater *) tmp->data;
@@ -1034,7 +1034,7 @@ screen_saver_on_expose_event (ScreenSaver    *screen_saver,
       rect.width = G_SQRT2 * size;
       rect.height = G_SQRT2 * size;
 
-      if (!gdk_region_rect_in (event->region, &rect))
+      if (!cairo_region_contains_rectangle (event->region, &rect))
         continue;
 
       if (!screen_saver_floater_do_draw (screen_saver, floater, context))