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

Matthiasc/for master

See merge request GNOME/gtk!2803
This commit is contained in:
Matthias Clasen 2020-11-10 04:47:28 +00:00
commit d1de9234c5
2 changed files with 2 additions and 2 deletions

View File

@ -234,7 +234,7 @@ set_widget_type (int type)
break;
case 5:
gtk_window_set_title (GTK_WINDOW (window), "Scrolling a list");
gtk_window_set_title (GTK_WINDOW (window), "Scrolling a columned list");
populate_list2 ();
break;

View File

@ -80,7 +80,7 @@ ucd_model_new (void)
iter = g_variant_iter_new (v);
store = g_list_store_new (G_TYPE_OBJECT);
while (g_variant_iter_next (iter, "(us)", &u, &name))
while (g_variant_iter_next (iter, "(u&s)", &u, &name))
{
if (u == 0)
continue;