[gnome-control-center] keyboard: Fix compile-time warnings

[Bastien Nocera <hadess src gnome org>]

commit d863154fcb109412494032540b5d0d3d4381d83d
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Sep 20 18:09:52 2010 +0100

    keyboard: Fix compile-time warnings
    
    Including an undeclared function, and deprecated use of GDK_DISPLAY.

 panels/keyboard/Makefile.am                     |    1 +
 panels/keyboard/gnome-keyboard-properties-xkb.c |    2 +-
 panels/keyboard/gnome-keyboard-properties.h     |   30 +++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/panels/keyboard/Makefile.am b/panels/keyboard/Makefile.am
index 3e6a469..3a7d35a 100644
--- a/panels/keyboard/Makefile.am
+++ b/panels/keyboard/Makefile.am
@@ -18,6 +18,7 @@ libkeyboard_properties_la_SOURCES =	\
 		cc-keyboard-panel.c \
 		cc-keyboard-panel.h \
 	        gnome-keyboard-properties.c \
+	        gnome-keyboard-properties.h \
 	        gnome-keyboard-properties-a11y.c \
 	        gnome-keyboard-properties-a11y.h \
 	        gnome-keyboard-properties-xkb.c \
diff --git a/panels/keyboard/gnome-keyboard-properties-xkb.c b/panels/keyboard/gnome-keyboard-properties-xkb.c
index 4976b12..7e083fa 100644
--- a/panels/keyboard/gnome-keyboard-properties-xkb.c
+++ b/panels/keyboard/gnome-keyboard-properties-xkb.c
@@ -169,7 +169,7 @@ setup_xkb_tabs (GtkBuilder * dialog, GConfChangeSet * changeset)
 
 	xkb_gconf_client = gconf_client_get_default ();
 
-	engine = xkl_engine_get_instance (GDK_DISPLAY ());
+	engine = xkl_engine_get_instance (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
 	config_registry = xkl_config_registry_get_instance (engine);
 
 	gkbd_desktop_config_init (&desktop_config, xkb_gconf_client,
diff --git a/panels/keyboard/gnome-keyboard-properties.h b/panels/keyboard/gnome-keyboard-properties.h
new file mode 100644
index 0000000..dc37ced
--- /dev/null
+++ b/panels/keyboard/gnome-keyboard-properties.h
@@ -0,0 +1,30 @@
+/* -*- mode: c; style: linux -*- */
+
+/* keyboard-properties.c
+ * Copyright (C) 2000-2001 Ximian, Inc.
+ * Copyright (C) 2001 Jonathan Blandford
+ *
+ * Written by: Bradford Hovinen <hovinen ximian com>
+ *             Rachel Hestilow <hestilow ximian com>
+ *	       Jonathan Blandford <jrb redhat com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <gtk/gtk.h>
+
+GtkWidget *gnome_keyboard_properties_init (GConfClient * client, GtkBuilder * dialog);
+