[gtk+: 2/2] Merge branch 'directfb-csw'

[Cody Russell <bratsche src gnome org>]

commit 6ca5430a74c86b448e96b64166d67b3268e24789
Merge: 6445943... e6605b0...
Author: Cody Russell <bratsche gnome org>
Date:   Fri Jul 10 03:21:28 2009 +0100

    Merge branch 'directfb-csw'

 gdk/directfb/gdkdisplay-directfb.c |   18 +-
 gdk/directfb/gdkgc-directfb.c      |   14 +-
 gdk/directfb/gdkinput-directfb.h   |    1 -
 gdk/directfb/gdkmain-directfb.c    |   81 +-----
 gdk/directfb/gdkpixmap-directfb.c  |   30 +-
 gdk/directfb/gdkwindow-directfb.c  |  537 ++++++------------------------------
 6 files changed, 119 insertions(+), 562 deletions(-)
---