Merge xkb related changes.

bus/ibusimpl.h

Index: bus/ibusimpl.h
diff --git a/bus/ibusimpl.h b/bus/ibusimpl.h
index 0152a219d822a114834902790ea83d4f8471c79e..7eda87175a6b81c6f5996d9c6c648d5948e91c86 100644
--- a/bus/ibusimpl.h
+++ b/bus/ibusimpl.h
@@ -75,6 +75,7 @@ struct _BusIBusImpl {
 
     gboolean use_sys_layout;
     gboolean embed_preedit_text;
+    gboolean enable_by_default;
 
     BusRegistry     *registry;
 
@@ -86,6 +87,7 @@ struct _BusIBusImpl {
 
     gboolean use_global_engine;
     BusEngineProxy  *global_engine;
+    gchar           *global_previous_engine_name;
 };
 
 struct _BusIBusImplClass {
@@ -108,5 +110,13 @@ IBusHotkeyProfile
 IBusKeymap      *bus_ibus_impl_get_keymap           (BusIBusImpl        *ibus);
 BusRegistry     *bus_ibus_impl_get_registry         (BusIBusImpl        *ibus);
 
+gboolean         bus_ibus_impl_filter_keyboard_shortcuts
+                                                    (BusIBusImpl        *ibus,
+                                                     BusInputContext    *context,
+                                                     guint               keyval,
+                                                     guint               modifiers,
+                                                     guint               prev_keyval,
+                                                     guint               prev_modifiers);
+
 G_END_DECLS
 #endif