AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 19:00:08 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Avoid deprecation warnings from GTK_ALIGN_BASELINE_FILL

Closes #5875

See merge request GNOME/gtk!6077
This commit is contained in:
Matthias Clasen 2023-06-09 14:18:51 +00:00
commit 0557b29f5b
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdk/gdkcontentformats.c
View File

@ -645,6 +645,9 @@ gdk_content_formats_builder_clear (GdkContentFormatsBuilder *builder)
{
g_clear_pointer (&builder->gtypes, g_slist_free);
g_clear_pointer (&builder->mime_types, g_slist_free);
builder->n_gtypes = 0;
builder->n_mime_types = 0;
}
/**

6
gtk.supp
View File

@ -14,7 +14,7 @@
GIO modules
Memcheck:Leak
match-leak-kinds: definite
fun:malloc
fun:calloc
...
fun:_g_io_module_get_default
}
@ -23,9 +23,9 @@
GTK media extension gio modules
Memcheck:Leak
match-leak-kinds: definite
fun:malloc
fun:calloc
...
fun:gio_module_new
fun:g_io_module_new
...
fun:gtk_media_file_extension_init
}

2
gtk/gtkenums.h
View File

@ -70,7 +70,7 @@ typedef enum
GTK_ALIGN_END,
GTK_ALIGN_CENTER,
GTK_ALIGN_BASELINE_FILL GDK_AVAILABLE_ENUMERATOR_IN_4_12,
GTK_ALIGN_BASELINE GDK_DEPRECATED_ENUMERATOR_IN_4_12_FOR(GTK_ALIGN_BASELINE_FILL) = GTK_ALIGN_BASELINE_FILL,
GTK_ALIGN_BASELINE GDK_DEPRECATED_ENUMERATOR_IN_4_12_FOR(GTK_ALIGN_BASELINE_FILL) = GTK_ALIGN_CENTER + 1,
GTK_ALIGN_BASELINE_CENTER GDK_AVAILABLE_ENUMERATOR_IN_4_12,
} GtkAlign;

3
gtk/print/gtkprintunixdialog.c
View File

@ -2583,8 +2583,7 @@ draw_page (GtkDrawingArea *da,
g_object_unref (layout);
style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
color = *gtk_css_color_value_get_rgba (style->core->color);
gtk_widget_get_color (widget, &color);
if (page_setup != NULL)
{