summaryrefslogtreecommitdiff
path: root/gtk/gtktextview.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2022-09-28 01:39:49 +0000
committerMatthias Clasen <mclasen@redhat.com>2022-09-28 01:39:49 +0000
commitaa9a7a931dcfb40d9f6db4ce24aafe37a0275929 (patch)
treea57d16d51aa8d07f12cb3143df24b88bcbea3427 /gtk/gtktextview.c
parent3aee45de2846ee66a818ca94852b4985414b9388 (diff)
parentfb280e47d6487d46aa26a85c35838dce0a90bd94 (diff)
downloadgtk+-aa9a7a931dcfb40d9f6db4ce24aafe37a0275929.tar.gz
Merge branch 'wip/carlosg/shuffle-reset-take2' into 'main'
gtkimcontextwayland: Shuffle full resets after IM changes Closes #5200 See merge request GNOME/gtk!5050
Diffstat (limited to 'gtk/gtktextview.c')
-rw-r--r--gtk/gtktextview.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 3b9cce9fc8..7277035dbe 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -8485,7 +8485,6 @@ gtk_text_view_commit_handler (GtkIMContext *context,
gtk_text_view_commit_text (text_view, str);
gtk_text_view_reset_blink_time (text_view);
gtk_text_view_pend_cursor_blink (text_view);
- gtk_im_context_reset (context);
}
static void
@@ -8695,9 +8694,8 @@ gtk_text_view_delete_surrounding_handler (GtkIMContext *context,
gtk_text_iter_forward_chars (&start, offset);
gtk_text_iter_forward_chars (&end, offset + n_chars);
- if (gtk_text_buffer_delete_interactive (priv->buffer, &start, &end,
- priv->editable))
- gtk_im_context_reset (context);
+ gtk_text_buffer_delete_interactive (priv->buffer, &start, &end,
+ priv->editable);
return TRUE;
}