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

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

Closes #3107

See merge request GNOME/gtk!2516
This commit is contained in:
Matthias Clasen 2020-09-01 18:26:21 +00:00
commit a3030d3a62
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtktreelistrowsorter.c
View File

@ -354,7 +354,7 @@ gtk_tree_list_row_sort_keys_new (GtkTreeListRowSorter *self)
sizeof (gpointer[MAX_KEY_DEPTH]));
if (self->sorter)
result->sort_keys = gtk_sort_keys_ref (gtk_sorter_get_keys (self->sorter));
result->sort_keys = gtk_sorter_get_keys (self->sorter);
result->cached_keys = g_hash_table_new (NULL, NULL);
return (GtkSortKeys *) result;

4
gtk/inspector/controllers.c
View File

@ -265,6 +265,8 @@ gtk_inspector_controllers_dispose (GObject *object)
gtk_widget_unparent (gtk_widget_get_first_child (GTK_WIDGET (self)));
g_clear_object (&self->sizegroup);
G_OBJECT_CLASS (gtk_inspector_controllers_parent_class)->dispose (object);
}
@ -274,7 +276,7 @@ gtk_inspector_controllers_class_init (GtkInspectorControllersClass *klass)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose= gtk_inspector_controllers_dispose;
object_class->dispose = gtk_inspector_controllers_dispose;
gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
}

2
gtk/inspector/gtktreemodelcssnode.c
View File

@ -345,6 +345,8 @@ gtk_tree_model_css_node_finalize (GObject *object)
priv->root = NULL;
}
g_free (priv->column_types);
G_OBJECT_CLASS (gtk_tree_model_css_node_parent_class)->finalize (object);
}