composetable: Keep the number of sequences

And print it out in tests.

Update all tests for this.

2 files changed, 6 insertions, 0 deletions

diff --git a/gtk/gtkcomposetable.c b/gtk/gtkcomposetable.c
index eb1ceeeca1..39ca2e3e92 100644
--- a/gtk/gtkcomposetable.c
+++ b/gtk/gtkcomposetable.c
@@ -879,6 +879,7 @@ parser_get_compose_table (GtkComposeParser *parser)
   int first_pos;
   int rest_pos;
   int index_rowstride;
+  int n_sequences;
   gunichar current_first;
 
   parser_remove_duplicates (parser);
@@ -899,6 +900,7 @@ parser_get_compose_table (GtkComposeParser *parser)
 
   char_data = g_string_new ("");
 
+  n_sequences = 0;
   current_first = 0;
   first_pos = 0;
   rest_pos = n_first * index_rowstride;
@@ -958,6 +960,8 @@ parser_get_compose_table (GtkComposeParser *parser)
       g_assert (encoded_value != 0);
       data[rest_pos + len - 1] = encoded_value;
 
+      n_sequences++;
+
       rest_pos += len;
 
       for (i = len; i <= max_compose_len; i++)
@@ -980,6 +984,7 @@ parser_get_compose_table (GtkComposeParser *parser)
   table->n_index_size = n_first;
   table->n_chars = char_data->len;
   table->char_data = g_string_free (char_data, FALSE);
+  table->n_sequences = n_sequences;
   table->id = g_str_hash (parser->compose_file);
 
   g_list_free (sequences);
diff --git a/gtk/gtkcomposetable.h b/gtk/gtkcomposetable.h
index 0e6c1aec9c..7a4c952f33 100644
--- a/gtk/gtkcomposetable.h
+++ b/gtk/gtkcomposetable.h
@@ -53,6 +53,7 @@ struct _GtkComposeTable
   int n_index_size;
   int data_size;
   int n_chars;
+  int n_sequences;
   guint32 id;
 };