From f2313b63cd0856b196b623f6e2908ebfef25f7cf Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 8 Oct 2002 13:27:04 +0000 Subject: [PATCH] Move out of HAVE_XKB. (#95129, Phil Blundell) Mon Oct 7 19:44:45 2002 Owen Taylor * gdk/x11/gdkkeys-x11.c (_gdk_keymap_keys_changed): Move out of HAVE_XKB. (#95129, Phil Blundell) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/x11/gdkkeys-x11.c | 4 ++-- 7 files changed, 32 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3acf07a317..4e68759c07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 7 19:44:45 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (_gdk_keymap_keys_changed): Move + out of HAVE_XKB. (#95129, Phil Blundell) + Mon Oct 7 19:14:24 2002 Eric Warmenhoven * gdk/linux-fb/gdkwindow-fb.c: fix compilation diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3acf07a317..4e68759c07 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Mon Oct 7 19:44:45 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (_gdk_keymap_keys_changed): Move + out of HAVE_XKB. (#95129, Phil Blundell) + Mon Oct 7 19:14:24 2002 Eric Warmenhoven * gdk/linux-fb/gdkwindow-fb.c: fix compilation diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3acf07a317..4e68759c07 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Mon Oct 7 19:44:45 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (_gdk_keymap_keys_changed): Move + out of HAVE_XKB. (#95129, Phil Blundell) + Mon Oct 7 19:14:24 2002 Eric Warmenhoven * gdk/linux-fb/gdkwindow-fb.c: fix compilation diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3acf07a317..4e68759c07 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Mon Oct 7 19:44:45 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (_gdk_keymap_keys_changed): Move + out of HAVE_XKB. (#95129, Phil Blundell) + Mon Oct 7 19:14:24 2002 Eric Warmenhoven * gdk/linux-fb/gdkwindow-fb.c: fix compilation diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3acf07a317..4e68759c07 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Mon Oct 7 19:44:45 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (_gdk_keymap_keys_changed): Move + out of HAVE_XKB. (#95129, Phil Blundell) + Mon Oct 7 19:14:24 2002 Eric Warmenhoven * gdk/linux-fb/gdkwindow-fb.c: fix compilation diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3acf07a317..4e68759c07 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Mon Oct 7 19:44:45 2002 Owen Taylor + + * gdk/x11/gdkkeys-x11.c (_gdk_keymap_keys_changed): Move + out of HAVE_XKB. (#95129, Phil Blundell) + Mon Oct 7 19:14:24 2002 Eric Warmenhoven * gdk/linux-fb/gdkwindow-fb.c: fix compilation diff --git a/gdk/x11/gdkkeys-x11.c b/gdk/x11/gdkkeys-x11.c index 094883f71a..86fa8bf056 100644 --- a/gdk/x11/gdkkeys-x11.c +++ b/gdk/x11/gdkkeys-x11.c @@ -383,6 +383,8 @@ _gdk_keymap_state_changed (GdkDisplay *display) } } +#endif /* HAVE_XKB */ + void _gdk_keymap_keys_changed (GdkDisplay *display) { @@ -394,8 +396,6 @@ _gdk_keymap_keys_changed (GdkDisplay *display) g_signal_emit_by_name (display_x11->keymap, "keys_changed", 0); } -#endif /* HAVE_XKB */ - PangoDirection gdk_keymap_get_direction (GdkKeymap *keymap) {