[librsvg] Remove some deprecated gtk+ functions and bump gtk+ requirement. Bug #572084.

[Andre Klapper <aklapper src gnome org>]

commit d8b0dc125c41f6017e19a81dd3f92397c8a6e0be
Author: Andre Klapper <a9016009 gmx de>
Date:   Mon Jun 1 14:18:54 2009 +0200

    Remove some deprecated gtk+ functions and bump gtk+ requirement. Bug #572084.
---
 ChangeLog               |    8 ++++++++
 configure.in            |    2 +-
 gtk-engine/svg-draw.c   |   12 ++++++------
 gtk-engine/svg-render.c |   29 ++++++++++++++---------------
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 04563c6..b29c513 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-01  Andre Klapper  <a9016009 gmx de>
+
+	* configure.in:
+	* gtk-engine/svg-render.c:
+	* gtk-engine/svg-draw.c:
+	Remove some deprecated gtk+ functions. Bump gtk+ requirement to 2.16.
+	Partially fixes bug #572084.
+
 2009-03-16  Dominic Lachowicz <domlachowicz gmail com>
 
 	* configure.in: 2.26.0
diff --git a/configure.in b/configure.in
index 2311e9e..dd64a2b 100644
--- a/configure.in
+++ b/configure.in
@@ -212,7 +212,7 @@ else
 fi
 
 have_gtk=no
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0, have_gtk=yes,
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16.0, have_gtk=yes,
 		       have_gtk=no)
 
 GTK_VERSION=
diff --git a/gtk-engine/svg-draw.c b/gtk-engine/svg-draw.c
index 8c01866..63bcc64 100644
--- a/gtk-engine/svg-draw.c
+++ b/gtk-engine/svg-draw.c
@@ -104,14 +104,14 @@ draw_simple_image(GtkStyle       *style,
   
   if ((width == -1) && (height == -1))
     {
-      gdk_window_get_size(window, &width, &height);
+      gdk_drawable_get_size(window, &width, &height);
       if (allow_setbg)
       	setbg = TRUE;
     }
   else if (width == -1)
-    gdk_window_get_size(window, &width, NULL);
+    gdk_drawable_get_size(window, &width, NULL);
   else if (height == -1)
-    gdk_window_get_size(window, NULL, &height);
+    gdk_drawable_get_size(window, NULL, &height);
 
   if (!(match_data->flags & THEME_MATCH_ORIENTATION))
     {
@@ -167,13 +167,13 @@ draw_gap_image(GtkStyle       *style,
   
   if ((width == -1) && (height == -1))
     {
-      gdk_window_get_size(window, &width, &height);
+      gdk_drawable_get_size(window, &width, &height);
       setbg = TRUE;
     }
   else if (width == -1)
-    gdk_window_get_size(window, &width, NULL);
+    gdk_drawable_get_size(window, &width, NULL);
   else if (height == -1)
-    gdk_window_get_size(window, NULL, &height);
+    gdk_drawable_get_size(window, NULL, &height);
 
   if (!(match_data->flags & THEME_MATCH_ORIENTATION))
     {
diff --git a/gtk-engine/svg-render.c b/gtk-engine/svg-render.c
index 014ca1a..41d1ebe 100644
--- a/gtk-engine/svg-render.c
+++ b/gtk-engine/svg-render.c
@@ -427,13 +427,12 @@ pixbuf_render (GdkPixbuf    *src,
 					 128);
     }
 
-  gdk_pixbuf_render_to_drawable_alpha (tmp_pixbuf, window,
-				       x_offset, y_offset,
-				       rect.x, rect.y,
-				       rect.width, rect.height,
-				       GDK_PIXBUF_ALPHA_FULL, 128,
-				       GDK_RGB_DITHER_NORMAL,
-				       0, 0);
+  gdk_draw_pixbuf (window, NULL, tmp_pixbuf, 
+		   x_offset, y_offset,
+		   rect.x, rect.y,
+		   rect.width, rect.height,
+		   GDK_RGB_DITHER_NORMAL,
+		   0, 0);
   g_object_unref (tmp_pixbuf);
 }
 
@@ -837,13 +836,13 @@ theme_pixbuf_render (ThemePixbuf  *theme_pb,
 				       pixbuf_height,
 				       -1);
 	  tmp_gc = gdk_gc_new (tmp_pixmap);
-	  gdk_pixbuf_render_to_drawable (pixbuf, tmp_pixmap, tmp_gc,
-					 0, 0, 
-					 0, 0,
-					 pixbuf_width, pixbuf_height,
-					 GDK_RGB_DITHER_NORMAL,
-					 0, 0);
-	  gdk_gc_unref (tmp_gc);
+	  gdk_draw_pixbuf (tmp_pixmap, tmp_gc, pixbuf, 
+			   0, 0, 
+			   0, 0,
+			   pixbuf_width, pixbuf_height,
+			   GDK_RGB_DITHER_NORMAL,
+			   0, 0);
+	  g_object_unref (tmp_gc);
 
 	  gc_values.fill = GDK_TILED;
 	  gc_values.tile = tmp_pixmap;
@@ -855,7 +854,7 @@ theme_pixbuf_render (ThemePixbuf  *theme_pb,
 	  else
 	    gdk_draw_rectangle (window, tmp_gc, TRUE, x, y, width, height);
 	  
-	  gdk_gc_unref (tmp_gc);
+	  g_object_unref (tmp_gc);
 	  gdk_pixmap_unref (tmp_pixmap);
 	}
     }