diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | capplets/keyboard/gnome-keyboard-properties-xkbmc.c | 5 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 7 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2007-10-21 Jens Granseuer <jensgr@gmx.net> + + * configure.in: bump libxklavier requirement to 3.3 + * capplets/keyboard/gnome-keyboard-properties-xkbmc.c: remove + compatibility hack for libxklavier <= 3.2 + 2007-10-18 Bastien Nocera <hadess@hadess.net> * schemas/apps_gnome_settings_daemon_keybindings.schemas.in: diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbmc.c b/capplets/keyboard/gnome-keyboard-properties-xkbmc.c index c3b87638b..f90ad3aa4 100644 --- a/capplets/keyboard/gnome-keyboard-properties-xkbmc.c +++ b/capplets/keyboard/gnome-keyboard-properties-xkbmc.c @@ -41,11 +41,6 @@ static void fill_models_list (GladeXML * chooser_dialog); static gboolean fill_vendors_list (GladeXML * chooser_dialog); -/* hack, till libxklavier 3.3 is released */ -#ifndef XCI_PROP_VENDOR - #define XCI_PROP_VENDOR "vendor" -#endif - static GtkTreePath * gtk_list_store_find_entry (GtkListStore * list_store, GtkTreeIter * iter, gchar * name, int column_id) diff --git a/configure.in b/configure.in index 21d51bb2d..64dcc888f 100644 --- a/configure.in +++ b/configure.in @@ -193,7 +193,7 @@ CAPPLET_LIBS="$CAPPLET_LIBS $XCURSOR_LIBS" dnl ============== dnl gswitchit dnl ============== -PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21 libxklavier >= 3.2]) +PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21 libxklavier >= 3.3]) AC_SUBST(LIBGNOMEKBD_CFLAGS) AC_SUBST(LIBGNOMEKBD_LIBS) |