Support engine specific hotkey.

src/ibusenginedesc.c

 /* 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 46 matching lines @@
 {
     IBusObjectClass *object_class = IBUS_OBJECT_CLASS (klass);
     IBusSerializableClass *serializable_class = IBUS_SERIALIZABLE_CLASS (klass);
 
     object_class->destroy = (IBusObjectDestroyFunc) ibus_engine_desc_destroy;
 
     serializable_class->serialize   = (IBusSerializableSerializeFunc) ibus_engine_desc_serialize;
     serializable_class->deserialize = (IBusSerializableDeserializeFunc) ibus_engine_desc_deserialize;
     serializable_class->copy        = (IBusSerializableCopyFunc) ibus_engine_desc_copy;
 
-    g_string_append (serializable_class->signature, "ssssssssu");
+    g_string_append (serializable_class->signature, "sssssssssu");
 }
 
 static void
 ibus_engine_desc_init (IBusEngineDesc *desc)
 {
 
     desc->name = NULL;
     desc->longname = NULL;
     desc->description = NULL;
     desc->language = NULL;
     desc->license = NULL;
     desc->author = NULL;
     desc->icon = NULL;
     desc->layout = NULL;
+    desc->hotkeys = NULL;
     desc->rank = 0;
 }
 
 static void
 ibus_engine_desc_destroy (IBusEngineDesc *desc)
 {
     g_free (desc->name);
     g_free (desc->longname);
     g_free (desc->description);
     g_free (desc->language);
     g_free (desc->license);
     g_free (desc->author);
     g_free (desc->icon);
     g_free (desc->layout);
+    g_free (desc->hotkeys);
 
     IBUS_OBJECT_CLASS (ibus_engine_desc_parent_class)->destroy (IBUS_OBJECT (desc));
 }
 
 static gboolean
 ibus_engine_desc_serialize (IBusEngineDesc  *desc,
                             IBusMessageIter *iter)
 {
     gboolean retval;
 
@@ skipping 17 matching lines @@
 
     retval = ibus_message_iter_append (iter, G_TYPE_STRING, &desc->author);
     g_return_val_if_fail (retval, FALSE);
 
     retval = ibus_message_iter_append (iter, G_TYPE_STRING, &desc->icon);
     g_return_val_if_fail (retval, FALSE);
 
     retval = ibus_message_iter_append (iter, G_TYPE_STRING, &desc->layout);
     g_return_val_if_fail (retval, FALSE);
 
+    retval = ibus_message_iter_append (iter, G_TYPE_STRING, &desc->hotkeys);
+    g_return_val_if_fail (retval, FALSE);
+
     retval = ibus_message_iter_append (iter, G_TYPE_UINT, &desc->rank);
     g_return_val_if_fail (retval, FALSE);
 
     return TRUE;
 }
 
 static gboolean
 ibus_engine_desc_deserialize (IBusEngineDesc  *desc,
                               IBusMessageIter *iter)
 {
@@ skipping 36 matching lines @@
     retval = ibus_message_iter_get (iter, G_TYPE_STRING, &str);
     g_return_val_if_fail (retval, FALSE);
     ibus_message_iter_next (iter);
     desc->icon = g_strdup (str);
 
     retval = ibus_message_iter_get (iter, G_TYPE_STRING, &str);
     g_return_val_if_fail (retval, FALSE);
     ibus_message_iter_next (iter);
     desc->layout = g_strdup (str);
 
+    retval = ibus_message_iter_get (iter, G_TYPE_STRING, &str);
+    g_return_val_if_fail (retval, FALSE);
+    ibus_message_iter_next (iter);
+    desc->hotkeys = g_strdup (str);
+
     retval = ibus_message_iter_get (iter, G_TYPE_UINT, &desc->rank);
     g_return_val_if_fail (retval, FALSE);
     ibus_message_iter_next (iter);
 
     return TRUE;
 }
 
 static gboolean
 ibus_engine_desc_copy (IBusEngineDesc       *dest,
                        const IBusEngineDesc *src)
 {
     gboolean retval;
 
     retval = IBUS_SERIALIZABLE_CLASS (ibus_engine_desc_parent_class)->copy ((IBusSerializable *)dest,
                                  (IBusSerializable *)src);
     g_return_val_if_fail (retval, FALSE);
 
 
     dest->name          = g_strdup (src->name);
     dest->longname      = g_strdup (src->longname);
     dest->description   = g_strdup (src->description);
     dest->language      = g_strdup (src->language);
     dest->license       = g_strdup (src->license);
     dest->author        = g_strdup (src->author);
     dest->icon          = g_strdup (src->icon);
     dest->layout        = g_strdup (src->layout);
+    dest->hotkeys       = g_strdup (src->hotkeys);
 
     return TRUE;
 }
 
 #define g_string_append_indent(string, indent)  \
     {                                           \
         gint i;                                 \
         for (i = 0; i < (indent); i++) {        \
             g_string_append (string, "    ");   \
         }                                       \
@@ skipping 16 matching lines @@
     }
 #define OUTPUT_ENTRY_1(name) OUTPUT_ENTRY(name, #name)
     OUTPUT_ENTRY_1(name);
     OUTPUT_ENTRY_1(longname);
     OUTPUT_ENTRY_1(description);
     OUTPUT_ENTRY_1(language);
     OUTPUT_ENTRY_1(license);
     OUTPUT_ENTRY_1(author);
     OUTPUT_ENTRY_1(icon);
     OUTPUT_ENTRY_1(layout);
+    OUTPUT_ENTRY_1(hotkeys);
     g_string_append_indent (output, indent + 1);
     g_string_append_printf (output, "<rank>%u</rank>\n", desc->rank);
 #undef OUTPUT_ENTRY
 #undef OUTPUT_ENTRY_1
     g_string_append_indent (output, indent);
     g_string_append (output, "</engine>\n");
 }
 
 static gboolean
 ibus_engine_desc_parse_xml_node (IBusEngineDesc *desc,
@@ skipping 11 matching lines @@
         }
 #define PARSE_ENTRY_1(name) PARSE_ENTRY(name, #name)
         PARSE_ENTRY_1(name);
         PARSE_ENTRY_1(longname);
         PARSE_ENTRY_1(description);
         PARSE_ENTRY_1(language);
         PARSE_ENTRY_1(license);
         PARSE_ENTRY_1(author);
         PARSE_ENTRY_1(icon);
         PARSE_ENTRY_1(layout);
+        PARSE_ENTRY_1(hotkeys);
 #undef PARSE_ENTRY
-#undef PARSE_ENTRY1
+#undef PARSE_ENTRY_1
         if (g_strcmp0 (sub_node->name , "rank") == 0) {
             desc->rank = atoi (sub_node->text);
             continue;
         }
         g_warning ("<engines> element contains invalidate element <%s>", sub_node->name);
     }
     return TRUE;
 }
 
 IBusEngineDesc *
 ibus_engine_desc_new (const gchar *name,
                       const gchar *longname,
                       const gchar *description,
                       const gchar *language,
                       const gchar *license,
                       const gchar *author,
                       const gchar *icon,
                       const gchar *layout)
 {
+    return ibus_engine_desc_new2 (name, longname, description, language,
+                                  license, author, icon, layout, "");
+}
+
+IBusEngineDesc *
+ibus_engine_desc_new2 (const gchar *name,
+                       const gchar *longname,
+                       const gchar *description,
+                       const gchar *language,
+                       const gchar *license,
+                       const gchar *author,
+                       const gchar *icon,
+                       const gchar *layout,
+                       const gchar *hotkeys)
+{
     g_assert (name);
     g_assert (longname);
     g_assert (description);
     g_assert (language);
     g_assert (license);
     g_assert (author);
     g_assert (icon);
     g_assert (layout);
+    g_assert (hotkeys);
 
     IBusEngineDesc *desc;
     desc = (IBusEngineDesc *)g_object_new (IBUS_TYPE_ENGINE_DESC, NULL);
 
     desc->name          = g_strdup (name);
     desc->longname      = g_strdup (longname);
     desc->description   = g_strdup (description);
     desc->language      = g_strdup (language);
     desc->license       = g_strdup (license);
     desc->author        = g_strdup (author);
     desc->icon          = g_strdup (icon);
     desc->layout        = g_strdup (layout);
+    desc->hotkeys       = g_strdup (hotkeys);
 
     return desc;
 }
 
 IBusEngineDesc *
 ibus_engine_desc_new_from_xml_node (XMLNode      *node)
 {
     g_assert (node);
 
     IBusEngineDesc *desc;
 
     if (G_UNLIKELY (g_strcmp0 (node->name, "engine") != 0)) {
         return NULL;
     }
 
     desc = (IBusEngineDesc *)g_object_new (IBUS_TYPE_ENGINE_DESC, NULL);
 
     if (!ibus_engine_desc_parse_xml_node (desc, node)) {
         g_object_unref (desc);
         desc = NULL;
     }
 
     return desc;
 }
-