keyboard: Fix compile-time warnings

Including an undeclared function, and deprecated use of GDK_DISPLAY.
This commit is contained in:
Bastien Nocera 2010-09-20 18:09:52 +01:00
parent 383882a4c5
commit d863154fcb
3 changed files with 32 additions and 1 deletions

View file

@ -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 \

View file

@ -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,

View file

@ -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);