[gthumb] Removed deprecated gdk_pixbuf_render_to_drawable_alpha, bug 575017

[Michael J. Chudobiak <mjc src gnome org>]

commit 4635365bdd8e5cc710e1e361eb2319adce3a55c8
Author: Lincoln de Sousa <lincoln alfaiati net>
Date:   Thu May 28 11:16:10 2009 -0400

    Removed deprecated gdk_pixbuf_render_to_drawable_alpha, bug 575017
---
 libgthumb/gthumb-slide.c   |  179 ++++++++++++++++++++++----------------------
 src/catalog-png-exporter.c |   35 ++-------
 2 files changed, 99 insertions(+), 115 deletions(-)

diff --git a/libgthumb/gthumb-slide.c b/libgthumb/gthumb-slide.c
index a40119c..70321a3 100644
--- a/libgthumb/gthumb-slide.c
+++ b/libgthumb/gthumb-slide.c
@@ -575,14 +575,15 @@ draw_shadow (GdkPixmap *pixmap, int x, int y, int width, int height)
 		alpha = MIN (alpha, 255);
 	}
 
-	gdk_pixbuf_render_to_drawable_alpha (shadow,
-					     pixmap,
-					     0, 0,
-					     x, y,
-					     width, height,
-					     GDK_PIXBUF_ALPHA_FULL, 
-					     255,
-					     GDK_RGB_DITHER_MAX, 0, 0);
+	gdk_draw_pixbuf (pixmap,
+			 NULL,
+			 shadow,
+			 0, 0,
+			 x, y,
+			 width,
+			 height,
+			 GDK_RGB_DITHER_MAX,
+			 0, 0);
 
 	g_object_unref (shadow);
 }
@@ -705,26 +706,27 @@ gthumb_draw_image_shadow_in (int          image_x,
 	shadow = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 1, 8, image_w, image_h);
 
 	gdk_pixbuf_fill (shadow,  0x00000080);
-	gdk_pixbuf_render_to_drawable_alpha (shadow,
-					     drawable,
-					     0, 0,
-					     image_x - INOUT_SHADOW_OFFSET,
-					     image_y - INOUT_SHADOW_OFFSET,
-					     image_w, image_h,
-					     GDK_PIXBUF_ALPHA_FULL, 
-					     255,
-					     GDK_RGB_DITHER_MAX, 0, 0);
+	gdk_draw_pixbuf (drawable,
+			 NULL,
+			 shadow,
+			 0, 0,
+			 image_x - INOUT_SHADOW_OFFSET,
+			 image_y - INOUT_SHADOW_OFFSET,
+			 image_w, image_h,
+			 GDK_RGB_DITHER_MAX,
+			 0, 0);
+				
 
 	gdk_pixbuf_fill (shadow,  0xFFFFFF80);
-	gdk_pixbuf_render_to_drawable_alpha (shadow,
-					     drawable,
-					     0, 0,
-					     image_x + INOUT_SHADOW_OFFSET,
-					     image_y + INOUT_SHADOW_OFFSET,
-					     image_w, image_h,
-					     GDK_PIXBUF_ALPHA_FULL, 
-					     255,
-					     GDK_RGB_DITHER_MAX, 0, 0);
+	gdk_draw_pixbuf (drawable,
+			 NULL,
+			 shadow,
+			 0, 0,
+			 image_x - INOUT_SHADOW_OFFSET,
+			 image_y - INOUT_SHADOW_OFFSET,
+			 image_w, image_h,
+			 GDK_RGB_DITHER_MAX,
+			 0, 0);
 
 	g_object_unref (shadow);
 	
@@ -735,29 +737,27 @@ gthumb_draw_image_shadow_in (int          image_x,
 				 INOUT_SHADOW_OFFSET * 2);
 
 	_gdk_pixbuf_fill_triangle (shadow, 0x00000080, 0xFFFFFF80);
-	
-	gdk_pixbuf_render_to_drawable_alpha (shadow,
-					     drawable,
-					     0, 0,
-					     image_x + image_w - INOUT_SHADOW_OFFSET,
-					     image_y - INOUT_SHADOW_OFFSET,
-					     INOUT_SHADOW_OFFSET * 2, 
-					     INOUT_SHADOW_OFFSET * 2,
-					     GDK_PIXBUF_ALPHA_FULL, 
-					     255,
-					     GDK_RGB_DITHER_MAX, 0, 0);
-
-	gdk_pixbuf_render_to_drawable_alpha (shadow,
-					     drawable,
-					     0, 0,
-					     image_x - INOUT_SHADOW_OFFSET,
-					     image_y + image_h - INOUT_SHADOW_OFFSET,
-					     INOUT_SHADOW_OFFSET * 2, 
-					     INOUT_SHADOW_OFFSET * 2,
-					     GDK_PIXBUF_ALPHA_FULL, 
-					     255,
-					     GDK_RGB_DITHER_MAX, 0, 0);
-
+	gdk_draw_pixbuf (drawable,
+			 NULL,
+			 shadow,
+			 0, 0,
+			 image_x + image_w - INOUT_SHADOW_OFFSET,
+			 image_y - INOUT_SHADOW_OFFSET,
+			 INOUT_SHADOW_OFFSET * 2, 
+			 INOUT_SHADOW_OFFSET * 2,
+			 GDK_RGB_DITHER_MAX,
+			 0, 0);
+
+	gdk_draw_pixbuf (drawable,
+			 NULL,
+			 shadow,
+			 0, 0,
+			 image_x - INOUT_SHADOW_OFFSET,
+			 image_y + image_h - INOUT_SHADOW_OFFSET,
+			 INOUT_SHADOW_OFFSET * 2, 
+			 INOUT_SHADOW_OFFSET * 2,
+			 GDK_RGB_DITHER_MAX,
+			 0, 0);
 
 	g_object_unref (shadow);
 }
@@ -775,26 +775,28 @@ gthumb_draw_image_shadow_out (int          image_x,
 	shadow = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, image_w, image_h);
 
 	gdk_pixbuf_fill (shadow,  0xFFFFFF80);
-	gdk_pixbuf_render_to_drawable_alpha (shadow,
-					     drawable,
-					     0, 0,
-					     image_x - INOUT_SHADOW_OFFSET,
-					     image_y - INOUT_SHADOW_OFFSET,
-					     image_w, image_h,
-					     GDK_PIXBUF_ALPHA_FULL, 
-					     255,
-					     GDK_RGB_DITHER_MAX, 0, 0);
+	gdk_draw_pixbuf (drawable,
+			 NULL,
+			 shadow,
+			 0, 0,
+			 image_x - INOUT_SHADOW_OFFSET,
+			 image_y - INOUT_SHADOW_OFFSET,
+			 image_w,
+			 image_h,
+			 GDK_RGB_DITHER_MAX,
+			 0, 0);
 
 	gdk_pixbuf_fill (shadow,  0x00000080);
-	gdk_pixbuf_render_to_drawable_alpha (shadow,
-					     drawable,
-					     0, 0,
-					     image_x + INOUT_SHADOW_OFFSET,
-					     image_y + INOUT_SHADOW_OFFSET,
-					     image_w, image_h,
-					     GDK_PIXBUF_ALPHA_FULL, 
-					     255,
-					     GDK_RGB_DITHER_MAX, 0, 0);
+	gdk_draw_pixbuf (drawable,
+			 NULL,
+			 shadow,
+			 0, 0,
+			 image_x + INOUT_SHADOW_OFFSET,
+			 image_y + INOUT_SHADOW_OFFSET,
+			 image_w,
+			 image_h,
+			 GDK_RGB_DITHER_MAX,
+			 0, 0);
 
 	g_object_unref (shadow);
 
@@ -805,29 +807,28 @@ gthumb_draw_image_shadow_out (int          image_x,
 				 INOUT_SHADOW_OFFSET * 2);
 
 	_gdk_pixbuf_fill_triangle (shadow, 0xFFFFFF80, 0x00000080);
-	
-	gdk_pixbuf_render_to_drawable_alpha (shadow,
-					     drawable,
-					     0, 0,
-					     image_x + image_w - INOUT_SHADOW_OFFSET,
-					     image_y - INOUT_SHADOW_OFFSET,
-					     INOUT_SHADOW_OFFSET * 2, 
-					     INOUT_SHADOW_OFFSET * 2,
-					     GDK_PIXBUF_ALPHA_FULL, 
-					     255,
-					     GDK_RGB_DITHER_MAX, 0, 0);
-
-	gdk_pixbuf_render_to_drawable_alpha (shadow,
-					     drawable,
-					     0, 0,
-					     image_x - INOUT_SHADOW_OFFSET,
-					     image_y + image_h - INOUT_SHADOW_OFFSET,
-					     INOUT_SHADOW_OFFSET * 2, 
-					     INOUT_SHADOW_OFFSET * 2,
-					     GDK_PIXBUF_ALPHA_FULL, 
-					     255,
-					     GDK_RGB_DITHER_MAX, 0, 0);
 
+	gdk_draw_pixbuf (drawable,
+			 NULL,
+			 shadow,
+			 0, 0,
+			 image_x + image_w - INOUT_SHADOW_OFFSET,
+			 image_y - INOUT_SHADOW_OFFSET,
+			 INOUT_SHADOW_OFFSET * 2, 
+			 INOUT_SHADOW_OFFSET * 2,
+			 GDK_RGB_DITHER_MAX,
+			 0, 0);
+	
+	gdk_draw_pixbuf (drawable,
+			 NULL,
+			 shadow,
+			 0, 0,
+			 image_x - INOUT_SHADOW_OFFSET,
+			 image_y + image_h - INOUT_SHADOW_OFFSET,
+			 INOUT_SHADOW_OFFSET * 2, 
+			 INOUT_SHADOW_OFFSET * 2,
+			 GDK_RGB_DITHER_MAX,
+			 0, 0);
 
 	g_object_unref (shadow);
 }
diff --git a/src/catalog-png-exporter.c b/src/catalog-png-exporter.c
index 5410efe..f86279d 100644
--- a/src/catalog-png-exporter.c
+++ b/src/catalog-png-exporter.c
@@ -1816,32 +1816,15 @@ paint_image (CatalogPngExporter *ce,
 	width = image_rect->width;
 	height = image_rect->height;
 
-	if (gdk_pixbuf_get_has_alpha (image)) {
-		gdk_gc_set_rgb_fg_color (ce->gc, &ce->white);
-		gdk_draw_rectangle (ce->pixmap,
-				    ce->gc,
-				    TRUE,
-				    x, y,
-				    width,
-				    height);
-
-		gdk_pixbuf_render_to_drawable_alpha (image,
-						     ce->pixmap,
-						     0, 0,
-						     x, y,
-						     width, height,
-						     GDK_PIXBUF_ALPHA_BILEVEL,
-						     112,
-						     GDK_RGB_DITHER_MAX, 0, 0);
-
-	} else
-		gdk_pixbuf_render_to_drawable (image,
-					       ce->pixmap,
-					       ce->gc,
-					       0, 0,
-					       x, y,
-					       width, height,
-					       GDK_RGB_DITHER_MAX, 0, 0);
+	gdk_draw_pixbuf (ce->pixmap,
+			 ce->gc,
+			 image,
+			 0, 0,
+			 x, y,
+			 width,
+			 height,
+			 GDK_RGB_DITHER_MAX,
+			 0, 0);
 }