gtk+ r19448 - in trunk: . gdk/directfb

[neo svn gnome org]

Author: neo
Date: Thu Jan 31 17:27:54 2008
New Revision: 19448
URL: http://svn.gnome.org/viewvc/gtk+?rev=19448&view=rev

Log:
2008-01-31  Sven Neumann  <sven gimp org>

	* gdk/directfb/gdkimage-directfb.c 
(_gdk_directfb_copy_to_image):
	applied patch from Denis Oliver Kropp <dok directfb org>.



Modified:
   trunk/ChangeLog
   trunk/gdk/directfb/gdkimage-directfb.c

Modified: trunk/gdk/directfb/gdkimage-directfb.c
==============================================================================
--- trunk/gdk/directfb/gdkimage-directfb.c	(original)
+++ trunk/gdk/directfb/gdkimage-directfb.c	Thu Jan 31 17:27:54 2008
@@ -278,7 +278,7 @@
     {
       DFBResult ret;
 
-      ret = layer->SetCooperativeLevel (layer, DLSCL_EXCLUSIVE);
+      ret = layer->SetCooperativeLevel (layer, DLSCL_ADMINISTRATIVE);
       if (ret)
         {
           DirectFBError ("_gdk_directfb_copy_to_image - SetCooperativeLevel",
@@ -300,7 +300,7 @@
 
   if (!image)
     image =  gdk_image_new (GDK_IMAGE_NORMAL,
-                            gdk_visual_get_system (), width, height);
+                            gdk_drawable_get_visual (drawable), width, height);
 
   private = image->windowing_data;
 
@@ -309,7 +309,7 @@
   private->surface->Blit( private->surface,
                           impl->surface, &rect, dest_x, dest_y );
 
-  private->surface->Lock( private->surface, DSLF_WRITE, &image->mem, &pitch );
+  private->surface->Lock( private->surface, DSLF_READ | DSLF_WRITE, &image->mem, &pitch );
   image->bpl = pitch;
 
   if (impl->wrapper == _gdk_parent_root)