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

See merge request GNOME/gtk!1565
This commit is contained in:
Matthias Clasen 2020-03-25 21:48:38 +00:00
commit 4f6096947e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkfilechoosererrorstack.c
View File

@ -21,13 +21,13 @@
G_DEFINE_TYPE (GtkFileChooserErrorStack, gtk_file_chooser_error_stack, GTK_TYPE_WIDGET)
static void
gtk_file_chooser_error_stack_finalize (GObject *object)
gtk_file_chooser_error_stack_dispose (GObject *object)
{
GtkFileChooserErrorStack *self = GTK_FILE_CHOOSER_ERROR_STACK (object);
g_clear_pointer (&self->stack, gtk_widget_unparent);
G_OBJECT_CLASS (gtk_file_chooser_error_stack_parent_class)->finalize (object);
G_OBJECT_CLASS (gtk_file_chooser_error_stack_parent_class)->dispose (object);
}
static void
@ -36,7 +36,7 @@ gtk_file_chooser_error_stack_class_init (GtkFileChooserErrorStackClass *class)
GObjectClass *object_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
object_class->finalize = gtk_file_chooser_error_stack_finalize;
object_class->dispose = gtk_file_chooser_error_stack_dispose;
gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
}

1
testsuite/gtk/meson.build
View File

@ -115,6 +115,7 @@ foreach t : tests
'GDK_DEBUG=default-settings',
'GTK_CSD=1',
'G_ENABLE_DIAGNOSTIC=0',
'NO_AT_BRIDGE=1',
'GSK_RENDERER=cairo',
'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),