Merge branch 'gtk-demo-run-no-main-window' into 'master'

gtk-demo: Don't show main window if --run is passed in

See merge request GNOME/gtk!1979
This commit is contained in:
Matthias Clasen 2020-06-01 12:26:15 +00:00
commit fe73730d21

View File

@ -1053,8 +1053,6 @@ activate (GApplication *app)
award ("demo-start");
gtk_widget_show (GTK_WIDGET (window));
g_object_unref (builder);
}
@ -1113,11 +1111,11 @@ command_line (GApplication *app,
return 0;
}
window = gtk_application_get_windows (GTK_APPLICATION (app))->data;
if (name == NULL)
goto out;
window = gtk_application_get_windows (GTK_APPLICATION (app))->data;
d = gtk_demos;
while (d->title)
@ -1147,7 +1145,11 @@ out:
gtk_window_set_transient_for (GTK_WINDOW (demo), GTK_WINDOW (window));
gtk_window_set_modal (GTK_WINDOW (demo), TRUE);
g_signal_connect_swapped (G_OBJECT (demo), "destroy", G_CALLBACK (g_application_quit), app);
}
else
gtk_widget_show (GTK_WIDGET (window));
if (autoquit)
g_timeout_add_seconds (1, auto_quit, app);