summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2015-07-12 15:01:25 +0200
committerinfirit <[email protected]>2015-07-12 16:09:16 +0200
commit575cb06d41e46d701b69b77da37817cf69854777 (patch)
tree2da850480f5bcc115d3211e4b288a87fe51c0644
parent71a3f61d25d6998c07db899148bd0bac48ad0026 (diff)
downloadmate-screensaver-575cb06d41e46d701b69b77da37817cf69854777.tar.bz2
mate-screensaver-575cb06d41e46d701b69b77da37817cf69854777.tar.xz
slideshow: Drop GdkPixmap and use retrieve GdkPixbuf directly
-rw-r--r--savers/gste-slideshow.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/savers/gste-slideshow.c b/savers/gste-slideshow.c
index 72ca87b..566baab 100644
--- a/savers/gste-slideshow.c
+++ b/savers/gste-slideshow.c
@@ -174,9 +174,6 @@ start_fade (GSTESlideshow *show,
{
GdkPixbuf *colored;
guint32 color;
-#if !GTK_CHECK_VERSION (3, 0, 0)
- GdkPixmap *pixmap;
-#endif
color = (show->priv->background_color->red << 16)
+ (show->priv->background_color->green / 256 << 8)
@@ -188,19 +185,11 @@ start_fade (GSTESlideshow *show,
256,
color,
color);
-#if GTK_CHECK_VERSION (3, 0, 0)
+
gdk_pixbuf_copy_area (colored, 0, 0,
gdk_pixbuf_get_width (colored),
gdk_pixbuf_get_height (colored),
pixbuf, 0, 0);
-#else
- pixmap = gdk_pixmap_new (NULL, ph, pw, gdk_visual_get_depth (gdk_visual_get_system ()));
-
- gdk_draw_pixbuf (pixmap, NULL, colored, 0, 0, 0, 0, -1, -1, GDK_RGB_DITHER_MAX, 0, 0);
- gdk_pixbuf_get_from_drawable (pixbuf, pixmap, NULL, 0, 0, 0, 0, -1, -1);
-
- g_object_unref (pixmap);
-#endif
g_object_unref(colored);
}