Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '169-gtktextview-accesses-already-disposed-object' into 'master'

Browse Source 
Resolve "GtkTextView accesses already disposed object"

Closes #169

See merge request GNOME/gtk!109
This commit is contained in:
Benjamin Otte
2018-04-30 11:56:36 +00:00
parent bf6aafe460 0abf8efd2f
commit 5166767e8b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtktextview.c
View File

@@ -6981,17 +6981,20 @@ typedef struct
SelectionGranularity granularity;
GtkTextMark *orig_start;
GtkTextMark *orig_end;
GtkTextBuffer *buffer;
} SelectionData;
static void
selection_data_free (SelectionData *data)
{
if (data->orig_start != NULL)
gtk_text_buffer_delete_mark (gtk_text_mark_get_buffer (data->orig_start),
data->orig_start);
gtk_text_buffer_delete_mark (data->buffer, data->orig_start);
if (data->orig_end != NULL)
gtk_text_buffer_delete_mark (gtk_text_mark_get_buffer (data->orig_end),
data->orig_end);
gtk_text_buffer_delete_mark (data->buffer, data->orig_end);
g_object_unref (data->buffer);
g_slice_free (SelectionData, data);
}
@@ -7271,6 +7274,7 @@ gtk_text_view_start_selection_drag (GtkTextView *text_view,
&orig_start, TRUE);
data->orig_end = gtk_text_buffer_create_mark (buffer, NULL,
&orig_end, TRUE);
data->buffer = g_object_ref (buffer);
gtk_text_view_check_cursor_blink (text_view);
g_object_set_qdata_full (G_OBJECT (priv->drag_gesture),