Merge the devel branch

src/ibusenginesimple.c

 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 /* vim:set et sts=4: */
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
 
 #include "ibusenginesimple.h"
 
 #include "ibuskeys.h"
 #include "ibuskeysyms.h"
@@ skipping 32 matching lines @@
     guint       in_hex_sequence : 1;
     guint       modifiers_dropped : 1;
 };
 
 /* This file contains the table of the compose sequences,
  * static const guint16 ibus_compose_seqs_compact[] = {}
  * IT is generated from the compose-parse.py script.
  */
 #include "gtkimcontextsimpleseqs.h"
 
-/* From the values below, the value 23 means the number of different first keysyms
+/* From the values below, the value 24 means the number of different first keysyms
  * that exist in the Compose file (from Xorg). When running compose-parse.py without
  * parameters, you get the count that you can put here. Needed when updating the
  * gtkimcontextsimpleseqs.h header file (contains the compose sequences).
  */
 static const IBusComposeTableCompact ibus_compose_table_compact = {
     gtk_compose_seqs_compact,
     5,
     24,
     6
 };
@@ skipping 837 matching lines @@
     g_return_if_fail (max_seq_len <= IBUS_MAX_COMPOSE_LEN);
 
     IBusComposeTable *table = g_new (IBusComposeTable, 1);
     table->data = data;
     table->max_seq_len = max_seq_len;
     table->n_seqs = n_seqs;
 
     priv->tables = g_slist_prepend (priv->tables, table);
 
 }