From 4535d09beade268cea1f2bbbd3bf8a207ea2cf58 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Thu, 3 Sep 2015 17:43:52 +0900 Subject: [PATCH] GtkIMContextSimple: Change guint to guint16 in gtkimcontextsimple.c GtkComposeTable and GtkComposeTableCompact use guint16 for the data. https://bugzilla.gnome.org/show_bug.cgi?id=721120 --- gtk/gtkimcontextsimple.c | 10 +++++----- gtk/gtkimcontextsimpleprivate.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index d5d394b744..a89146aa8c 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -42,7 +42,7 @@ struct _GtkIMContextSimplePrivate { GSList *tables; - guint compose_buffer[GTK_MAX_COMPOSE_LEN + 1]; + guint16 compose_buffer[GTK_MAX_COMPOSE_LEN + 1]; gunichar tentative_match; gint tentative_match_len; @@ -163,7 +163,7 @@ gtk_im_context_simple_commit_char (GtkIMContext *context, static int compare_seq_index (const void *key, const void *value) { - const guint *keysyms = key; + const guint16 *keysyms = key; const guint16 *seq = value; if (keysyms[0] < seq[0]) @@ -178,7 +178,7 @@ static int compare_seq (const void *key, const void *value) { int i = 0; - const guint *keysyms = key; + const guint16 *keysyms = key; const guint16 *seq = value; while (keysyms[i]) @@ -394,7 +394,7 @@ check_quartz_special_cases (GtkIMContextSimple *context_simple, gboolean gtk_check_compact_table (const GtkComposeTableCompact *table, - guint *compose_buffer, + guint16 *compose_buffer, gint n_compose, gboolean *compose_finish, gboolean *compose_match, @@ -567,7 +567,7 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose) } gboolean -gtk_check_algorithmically (const guint *compose_buffer, +gtk_check_algorithmically (const guint16 *compose_buffer, gint n_compose, gunichar *output_char) diff --git a/gtk/gtkimcontextsimpleprivate.h b/gtk/gtkimcontextsimpleprivate.h index 7e59368f50..737f07a233 100644 --- a/gtk/gtkimcontextsimpleprivate.h +++ b/gtk/gtkimcontextsimpleprivate.h @@ -33,11 +33,11 @@ G_BEGIN_DECLS extern const GtkComposeTableCompact gtk_compose_table_compact; -gboolean gtk_check_algorithmically (const guint *compose_buffer, +gboolean gtk_check_algorithmically (const guint16 *compose_buffer, gint n_compose, gunichar *output); gboolean gtk_check_compact_table (const GtkComposeTableCompact *table, - guint *compose_buffer, + guint16 *compose_buffer, gint n_compose, gboolean *compose_finish, gboolean *compose_match,