callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk/gtkemojicompletion.c: Fix build on C89 and non-GCC

Browse Source 
Declare variables at the top of the clock, and ensure that we don't try
to use g_autoptr(), which is a GCCism.
This commit is contained in:
Chun-wei Fan 2018-06-19 18:30:22 +08:00
parent aa76abbbeb
commit defbbb95e9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkemojicompletion.c
View File

@ -345,9 +345,10 @@ entry_key_press (GtkEntry *entry,
if (keyval == GDK_KEY_Tab) if (keyval == GDK_KEY_Tab)
{ {
guint offset;
show_variations (completion, completion->active, FALSE); show_variations (completion, completion->active, FALSE);
guint offset = completion->offset + MAX_ROWS; offset = completion->offset + MAX_ROWS;
if (offset >= completion->n_matches) if (offset >= completion->n_matches)
offset = 0; offset = 0;
populate_completion (completion, completion->text, offset); populate_completion (completion, completion->text, offset);
@ -658,12 +659,13 @@ long_pressed_cb (GtkGesture *gesture,
static void static void
gtk_emoji_completion_init (GtkEmojiCompletion *completion) gtk_emoji_completion_init (GtkEmojiCompletion *completion)
{ {
g_autoptr(GBytes) bytes = NULL; GBytes *bytes = NULL;
gtk_widget_init_template (GTK_WIDGET (completion)); gtk_widget_init_template (GTK_WIDGET (completion));
bytes = g_resources_lookup_data ("/org/gtk/libgtk/emoji/emoji.data", 0, NULL); bytes = g_resources_lookup_data ("/org/gtk/libgtk/emoji/emoji.data", 0, NULL);
completion->data = g_variant_ref_sink (g_variant_new_from_bytes (G_VARIANT_TYPE ("a(auss)"), bytes, TRUE)); completion->data = g_variant_ref_sink (g_variant_new_from_bytes (G_VARIANT_TYPE ("a(auss)"), bytes, TRUE));
g_bytes_unref (bytes);
completion->long_press = gtk_gesture_long_press_new (completion->list); completion->long_press = gtk_gesture_long_press_new (completion->list);
g_signal_connect (completion->long_press, "pressed", G_CALLBACK (long_pressed_cb), completion); g_signal_connect (completion->long_press, "pressed", G_CALLBACK (long_pressed_cb), completion);