Merge xkb related changes.

bus/ibusimpl.h

 /* vim:set et sts=4: */
 /* bus - The Input Bus
  * Copyright (C) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
  * Copyright (C) 2008-2010 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 57 matching lines @@
     GHashTable *factory_dict;
     GList *factory_list;
     GList *contexts;
 
     GList *engine_list;
     GList *register_engine_list;
     GList *component_list;
 
     gboolean use_sys_layout;
     gboolean embed_preedit_text;
+    gboolean enable_by_default;
 
     BusRegistry     *registry;
 
     BusInputContext *focused_context;
     BusPanelProxy   *panel;
     IBusConfig      *config;
     IBusHotkeyProfile *hotkey_profile;
     IBusKeymap      *keymap;
 
     gboolean use_global_engine;
     BusEngineProxy  *global_engine;
+    gchar           *global_previous_engine_name;
 };
 
 struct _BusIBusImplClass {
     IBusServiceClass parent;
 
     /* class members */
 };
 
 GType            bus_ibus_impl_get_type             (void);
 BusIBusImpl     *bus_ibus_impl_get_default          (void);
 BusFactoryProxy *bus_ibus_impl_get_default_factory  (BusIBusImpl        *ibus);
 BusFactoryProxy *bus_ibus_impl_get_next_factory     (BusIBusImpl        *ibus,
                                                      BusFactoryProxy    *factory);
 BusFactoryProxy *bus_ibus_impl_get_previous_factory (BusIBusImpl        *ibus,
                                                      BusFactoryProxy    *factory);
 BusFactoryProxy *bus_ibus_impl_lookup_factory       (BusIBusImpl        *ibus,
                                                      const gchar        *path);
 IBusHotkeyProfile
                 *bus_ibus_impl_get_hotkey_profile   (BusIBusImpl        *ibus);
 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