[libwnck] xutils: Split out surface-from-pixmap creation into separate function

[Benjamin Otte <otte src gnome org>]

commit 513c1f029133c37434f14b074dd4c9670264dd5d
Author: Benjamin Otte <otte redhat com>
Date:   Wed Jan 19 20:26:06 2011 +0100

    xutils: Split out surface-from-pixmap creation into separate function

 libwnck/xutils.c |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/libwnck/xutils.c b/libwnck/xutils.c
index 681aca3..61b0e0f 100644
--- a/libwnck/xutils.c
+++ b/libwnck/xutils.c
@@ -1648,8 +1648,8 @@ apply_mask (GdkPixbuf *pixbuf,
   return with_alpha;
 }
 
-GdkPixbuf*
-_wnck_gdk_pixbuf_get_from_pixmap (Pixmap xpixmap)
+static cairo_surface_t *
+_wnck_cairo_surface_get_from_pixmap (Pixmap xpixmap)
 {
   cairo_surface_t *surface;
   Display *display;
@@ -1657,7 +1657,6 @@ _wnck_gdk_pixbuf_get_from_pixmap (Pixmap xpixmap)
   int x_ret, y_ret;
   unsigned int w_ret, h_ret, bw_ret, depth_ret;
   XWindowAttributes attrs;
-  GdkPixbuf *retval;
 
   display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 
@@ -1684,11 +1683,25 @@ _wnck_gdk_pixbuf_get_from_pixmap (Pixmap xpixmap)
                                            w_ret, h_ret);
     }
 
+  return surface;
+}
+
+GdkPixbuf*
+_wnck_gdk_pixbuf_get_from_pixmap (Pixmap xpixmap)
+{
+  cairo_surface_t *surface;
+  GdkPixbuf *retval;
+
+  surface = _wnck_cairo_surface_get_from_pixmap (xpixmap);
+
+  if (surface == NULL)
+    return NULL;
+
   retval = gdk_pixbuf_get_from_surface (surface,
                                         0,
                                         0,
-                                        w_ret,
-                                        h_ret);
+                                        cairo_xlib_surface_get_width (surface),
+                                        cairo_xlib_surface_get_height (surface));
   cairo_surface_destroy (surface);
 
   return retval;