From 6079033cde3914a01d2c5849dcc1bb428f3a287c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 10 Nov 2020 09:07:22 -0500 Subject: [PATCH] columnview: Plug listmodel memory leaks We were leaking references returned from g_list_model_get_item in some places. --- gtk/gtkcolumnview.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gtk/gtkcolumnview.c b/gtk/gtkcolumnview.c index d39b50e875..afa5150269 100644 --- a/gtk/gtkcolumnview.c +++ b/gtk/gtkcolumnview.c @@ -983,6 +983,8 @@ header_drag_begin (GtkGestureDrag *gesture, break; } + + g_object_unref (column); } for (i = 0; !self->in_column_resize && i < n; i++) @@ -1049,7 +1051,10 @@ header_drag_end (GtkGestureDrag *gesture, sequence = gtk_gesture_single_get_current_sequence (GTK_GESTURE_SINGLE (gesture)); if (!gtk_gesture_handles_sequence (GTK_GESTURE (gesture), sequence)) - return; + { + g_object_unref (column); + return; + } for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->columns)); i++) { @@ -1531,7 +1536,6 @@ gtk_column_view_remove_column (GtkColumnView *self, g_object_unref (item); if (item == column) break; - } gtk_column_view_sorter_remove_column (GTK_COLUMN_VIEW_SORTER (self->sorter), column);