From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 14 Mar 2022 19:40:12 +0000 (-0400)
Subject: gtk-builder-tool: Operate without display
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~19^2~3^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=38bbcb74115b69263a63fae3a70bc6c11e701814;p=gtk4.git

gtk-builder-tool: Operate without display

The simplify and validate commands can function
without a display connection, only preview absolutely
needs one. Allow this, by using gtk_init_check().
---

diff --git a/tools/gtk-builder-tool.c b/tools/gtk-builder-tool.c
index bc89207049..b62773738a 100644
--- a/tools/gtk-builder-tool.c
+++ b/tools/gtk-builder-tool.c
@@ -109,11 +109,13 @@ log_writer_func (GLogLevelFlags   level,
 int
 main (int argc, const char *argv[])
 {
+  gboolean has_display;
+
   g_set_prgname ("gtk-builder-tool");
 
   g_log_set_writer_func (log_writer_func, NULL, NULL);
 
-  gtk_init ();
+  has_display = gtk_init_check ();
 
   gtk_test_register_all_types ();
 
@@ -133,7 +135,15 @@ main (int argc, const char *argv[])
   else if (strcmp (argv[0], "enumerate") == 0)
     do_enumerate (&argc, &argv);
   else if (strcmp (argv[0], "preview") == 0)
-    do_preview (&argc, &argv);
+    {
+      if (!has_display)
+        {
+          g_printerr ("Could not initialize windowing system\n");
+          return 1;
+        }
+
+      do_preview (&argc, &argv);
+    }
   else
     usage ();