AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkIMContextSimple: Change guint to guint16 in gtkimcontextsimple.c

Browse Source 
GtkComposeTable and GtkComposeTableCompact use guint16 for the data.

https://bugzilla.gnome.org/show_bug.cgi?id=721120
This commit is contained in:
Takao Fujiwara 2015-09-03 17:43:52 +09:00 committed by Matthias Clasen
parent 48a2477f2d
commit 4535d09bea
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkimcontextsimple.c
View File

@ -42,7 +42,7 @@ struct _GtkIMContextSimplePrivate
{ {
GSList *tables; GSList *tables;
guint compose_buffer[GTK_MAX_COMPOSE_LEN + 1]; guint16 compose_buffer[GTK_MAX_COMPOSE_LEN + 1];
gunichar tentative_match; gunichar tentative_match;
gint tentative_match_len; gint tentative_match_len;
@ -163,7 +163,7 @@ gtk_im_context_simple_commit_char (GtkIMContext *context,
static int static int
compare_seq_index (const void *key, const void *value) compare_seq_index (const void *key, const void *value)
{ {
const guint *keysyms = key; const guint16 *keysyms = key;
const guint16 *seq = value; const guint16 *seq = value;
if (keysyms[0] < seq[0]) if (keysyms[0] < seq[0])
@ -178,7 +178,7 @@ static int
compare_seq (const void *key, const void *value) compare_seq (const void *key, const void *value)
{ {
int i = 0; int i = 0;
const guint *keysyms = key; const guint16 *keysyms = key;
const guint16 *seq = value; const guint16 *seq = value;
while (keysyms[i]) while (keysyms[i])
@ -394,7 +394,7 @@ check_quartz_special_cases (GtkIMContextSimple *context_simple,
gboolean gboolean
gtk_check_compact_table (const GtkComposeTableCompact *table, gtk_check_compact_table (const GtkComposeTableCompact *table,
guint *compose_buffer, guint16 *compose_buffer,
gint n_compose, gint n_compose,
gboolean *compose_finish, gboolean *compose_finish,
gboolean *compose_match, gboolean *compose_match,
@ -567,7 +567,7 @@ check_normalize_nfc (gunichar* combination_buffer, gint n_compose)
} }
gboolean gboolean
gtk_check_algorithmically (const guint *compose_buffer, gtk_check_algorithmically (const guint16 *compose_buffer,
gint n_compose, gint n_compose,
gunichar *output_char) gunichar *output_char)

4
gtk/gtkimcontextsimpleprivate.h
View File

@ -33,11 +33,11 @@ G_BEGIN_DECLS
extern const GtkComposeTableCompact gtk_compose_table_compact; 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, gint n_compose,
gunichar *output); gunichar *output);
gboolean gtk_check_compact_table (const GtkComposeTableCompact *table, gboolean gtk_check_compact_table (const GtkComposeTableCompact *table,
guint *compose_buffer, guint16 *compose_buffer,
gint n_compose, gint n_compose,
gboolean *compose_finish, gboolean *compose_finish,
gboolean *compose_match, gboolean *compose_match,