From 254f05b54f718c395d154d2e1ebabdf0175b20a0 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sun, 7 Feb 2010 17:19:38 +0000 Subject: [PATCH 2/5] Switch from DirectFB to X11: Drop dfb_input_device_reload_keymap(). --- packages/cdebconf/debian/changelog | 1 + packages/cdebconf/src/modules/frontend/gtk/di.c | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/packages/cdebconf/debian/changelog b/packages/cdebconf/debian/changelog index 29b1ebb..f876d99 100644 --- a/packages/cdebconf/debian/changelog +++ b/packages/cdebconf/debian/changelog @@ -6,6 +6,7 @@ cdebconf (0.148) UNRELEASED; urgency=low ensure the new udeb gets a dependency on libgtk-x11-udeb. - Bump the Build-Depends on libcairo2-dev to ensure the new udeb gets a dependency on libcairo2-udeb. + - Disable DirectFB includes and dfb_input_device_reload_keymap(). -- Cyril Brulebois Sun, 07 Feb 2010 17:05:11 +0000 diff --git a/packages/cdebconf/src/modules/frontend/gtk/di.c b/packages/cdebconf/src/modules/frontend/gtk/di.c index 323f5d4..96356b5 100644 --- a/packages/cdebconf/src/modules/frontend/gtk/di.c +++ b/packages/cdebconf/src/modules/frontend/gtk/di.c @@ -44,9 +44,11 @@ #include #include +#if 0 #include /* for dfb_input_device_reload_keymap() and dfb_input_device_at() */ #include +#endif #include #include "question.h" @@ -202,7 +204,9 @@ gboolean cdebconf_gtk_di_setup(struct frontend * fe) */ static void refresh_keymap(struct frontend * fe) { +#if 0 dfb_input_device_reload_keymap(dfb_input_device_at(DIDID_KEYBOARD)); +#endif } /** Returns the current text direction. -- 1.6.6.1