From 3f93f3893334fc8697fbb892da93070fab0754d8 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Thu, 23 Feb 2023 12:29:35 +0100
Subject: [PATCH 1/2] GNOME 44

---
 meson.build                   |  2 +-
 re.sonny.Workbench.Devel.json |  2 +-
 src/Previewer/Internal.js     |  2 +-
 src/Previewer/previewer.vala  |  2 +-
 src/bin.js                    | 23 ++++++-----------------
 src/main.js                   |  2 +-
 6 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/meson.build b/meson.build
index f07043d88..cb0078d44 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('Workbench', ['vala', 'c'],
-  version: '43.3',
+  version: '44.0',
   meson_version: '>= 0.59.0',
   license: 'GPL-3.0-only'
 )
diff --git a/re.sonny.Workbench.Devel.json b/re.sonny.Workbench.Devel.json
index 4f7dc1850..cae0f2647 100644
--- a/re.sonny.Workbench.Devel.json
+++ b/re.sonny.Workbench.Devel.json
@@ -1,7 +1,7 @@
 {
   "id": "re.sonny.Workbench.Devel",
   "runtime": "org.gnome.Sdk",
-  "runtime-version": "43",
+  "runtime-version": "master",
   "sdk": "org.gnome.Sdk",
   "sdk-extensions" : [
     "org.freedesktop.Sdk.Extension.vala"
diff --git a/src/Previewer/Internal.js b/src/Previewer/Internal.js
index 4c115301b..4705f0b23 100644
--- a/src/Previewer/Internal.js
+++ b/src/Previewer/Internal.js
@@ -216,7 +216,7 @@ export default function Internal({
       const diagnostic = getCssDiagnostic(section, error);
       builder.get_object("code_view_css").handleDiagnostics([diagnostic]);
     });
-    css_provider.load_from_data(style);
+    css_provider.load_from_data(style, -1);
     Gtk.StyleContext.add_provider_for_display(
       output.get_display(),
       css_provider,
diff --git a/src/Previewer/previewer.vala b/src/Previewer/previewer.vala
index 745ed1189..9665e16d0 100644
--- a/src/Previewer/previewer.vala
+++ b/src/Previewer/previewer.vala
@@ -91,7 +91,7 @@ namespace Workbench {
         var end = section.get_end_location();
         this.css_parser_error(error.message, (int)start.lines, (int)start.line_chars, (int)end.lines, (int)end.line_chars);
       });
-      this.css.load_from_data (content.data);
+      this.css.load_from_data (content);
       Gtk.StyleContext.add_provider_for_display (Gdk.Display.get_default (), this.css , Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
 
diff --git a/src/bin.js b/src/bin.js
index c861b7d76..1383f7d6f 100755
--- a/src/bin.js
+++ b/src/bin.js
@@ -1,6 +1,6 @@
 #!@GJS@ -m
 
-import { exit } from "system";
+import { exit, programArgs } from "system";
 import GLib from "gi://GLib";
 import { setConsoleLogDomain } from "console";
 import Gio from "gi://Gio";
@@ -16,9 +16,9 @@ imports.package.init({
 setConsoleLogDomain(pkg.name);
 GLib.set_application_name("Workbench");
 
-if (!Xdp.Portal.running_under_flatpak()) {
+if (Xdp.Portal.running_under_flatpak()) {
   console.error(
-    "Workbench is only meant to be run sandboxed as a Flatpak and a specific target environment.\nBypassing this will exposes users to arbitrary code execution and breakage.",
+    "Flatpak required\nWorkbench is only meant to be run sandboxed in a specific target environment.\nBypassing this will exposes users to arbitrary code execution and breakage.",
   );
   exit(1);
 }
@@ -31,17 +31,6 @@ if (__DEV__) {
   pkg.sourcedir = "@sourcedir@";
 }
 
-const loop = new GLib.MainLoop(null, false);
-import("resource:///re/sonny/Workbench/src/main.js")
-  .then((main) => {
-    // Workaround for issue
-    // https://gitlab.gnome.org/GNOME/gjs/-/issues/468
-    GLib.idle_add(GLib.PRIORITY_DEFAULT_IDLE, () => {
-      loop.quit();
-      const exit_code = imports.package.run(main);
-      exit(exit_code);
-      return GLib.SOURCE_REMOVE;
-    });
-  })
-  .catch(logError);
-loop.run();
+const module = await import("resource:///re/sonny/Workbench/src/main.js");
+const exit_code = await module.main(programArgs);
+exit(exit_code);
diff --git a/src/main.js b/src/main.js
index dc6dc6f47..53d474538 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,5 +5,5 @@ import application from "./application.js";
 pkg.initGettext();
 
 export function main(argv) {
-  return application.run(argv);
+  return application.runAsync(argv);
 }

From 77871640c2589dba88f53011abcbfeace5dc2377 Mon Sep 17 00:00:00 2001
From: Sonny Piers <sonny@fastmail.net>
Date: Mon, 6 Mar 2023 19:14:15 +0100
Subject: [PATCH 2/2] f

---
 src/bin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin.js b/src/bin.js
index 1383f7d6f..7d78a28cf 100755
--- a/src/bin.js
+++ b/src/bin.js
@@ -16,7 +16,7 @@ imports.package.init({
 setConsoleLogDomain(pkg.name);
 GLib.set_application_name("Workbench");
 
-if (Xdp.Portal.running_under_flatpak()) {
+if (!Xdp.Portal.running_under_flatpak()) {
   console.error(
     "Flatpak required\nWorkbench is only meant to be run sandboxed in a specific target environment.\nBypassing this will exposes users to arbitrary code execution and breakage.",
   );