Bug#402127: GTK frontend should build on and X target too

[Attilio Fiandrotti <attilio.fiandrotti@gmail.com>]

package: cdebconf-gtk-udeb
severity: minor
tags: patch

This patch is needed to build cdebconf's GTK frontend in an X11 
environment; i'm using GDK_WINDOWING_X11 as GDK_WINDOWING_DIRECTFB is 
currently not available in GTKDFB 2.8.20.
I'd like this patch to be applied because

- It's necessary if one wants to replace debconf with cdebconf on a 
regular debian system (it's a blocker for #328498)

-It's useful to test the GTK frontend on top of X11

I guess we'll also have to provide cdebconf's build system with a switch 
that allows building the directfb or x11 flavuor of the GTK frontend.

Loic, could you please check if this patch is ok?

thanks

Attilio

Index: gtk.c
===================================================================
--- gtk.c	(revisione 43216)
+++ gtk.c	(copia locale)
@@ -49,13 +49,9 @@
 #include <debian-installer/slist.h>
 #include <gdk/gdkkeysyms.h>
 
-#if GTK_CHECK_VERSION(2,10,0)
-#ifdef GDK_WINDOWING_DIRECTFB
+#ifndef GDK_WINDOWING_X11
 #include <directfb.h>
 #endif
-#else
-#include <directfb.h>
-#endif
 
 #define WINDOW_WIDTH 800
 #define WINDOW_HEIGHT 600
@@ -1494,13 +1490,9 @@
      * (See also bug #381979)
      */
 
-    #if GTK_CHECK_VERSION(2,10,0)
-    #ifdef GDK_WINDOWING_DIRECTFB
+    #ifndef GDK_WINDOWING_X11
     dfb_input_device_reload_keymap( dfb_input_device_at( DIDID_KEYBOARD ) );
     #endif
-    #else
-    dfb_input_device_reload_keymap( dfb_input_device_at( DIDID_KEYBOARD ) );
-    #endif
 
     gtk_rc_reparse_all();