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

Merge branch 'testsuite_fix_icontheme_win32_v2' into 'main'

Browse Source 
testsuite: fix icontheme test failure on win32 [v2]

See merge request GNOME/gtk!6664
This commit is contained in:
Benjamin Otte
2023-12-12 23:54:43 +00:00
parent 6ad9db0bf0 d692243727
commit ff9c9e05c3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
testsuite/gtk/icontheme.c
View File

@@ -59,7 +59,7 @@ assert_icon_lookup_size (const char *icon_name,
{
GtkIconPaintable *info;
GFile *file;
char *path = NULL;
char *uri = NULL;
if (fallbacks)
{
@@ -83,26 +83,26 @@ assert_icon_lookup_size (const char *icon_name,
file = gtk_icon_paintable_get_file (info);
if (file)
{
path = g_file_get_path (file);
uri = g_file_get_uri (file);
g_object_unref (file);
}
if (filename)
{
if (path == NULL || !g_str_has_suffix (path, filename))
if (uri == NULL || !g_str_has_suffix (uri, filename))
{
g_error ("Icon for \"%s\" with flags %s at size %d should be \"...%s\" but is \"...%s\"",
icon_name, lookup_flags_to_string (flags), size,
filename, path);
filename, uri);
return;
}
}
else
{
g_assert_null (path);
g_assert_null (uri);
}
g_free (path);
g_free (uri);
g_assert_cmpint (gdk_paintable_get_intrinsic_width (GDK_PAINTABLE (info)), ==, size);