Skip to content

Commit 630dbb4

Browse files
committed
Minor changes
1 parent 8ec88e6 commit 630dbb4

File tree

7 files changed

+17
-13
lines changed

7 files changed

+17
-13
lines changed

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,8 @@
3232
"vala.languageServerPath": "${workspaceFolder}/.flatpak/vala-language-server.sh",
3333
"mesonbuild.configureOnOpen": false,
3434
"mesonbuild.buildFolder": "_build",
35-
"mesonbuild.mesonPath": "${workspaceFolder}/.flatpak/meson.sh"
35+
"mesonbuild.mesonPath": "${workspaceFolder}/.flatpak/meson.sh",
36+
"[meson]": {
37+
"editor.defaultFormatter": "mesonbuild.mesonbuild"
38+
}
3639
}

build-aux/wip/run.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ console.debug(argv);
2727
const [manifest_path] = argv._;
2828
if (!manifest_path) {
2929
// eslint-disable-next-line no-restricted-globals
30-
print(`${programInvocationName} [--verbose] [--debug] MANIFEST`);
30+
print(`${programInvocationName} [--verbose] [--debug] MANIFEST [-- command]`);
3131
exit(0);
3232
}
3333

data/app.gschema.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2-
<schemalist gettext-domain="@app_id@">
2+
<schemalist>
33
<enum id="re.sonny.Workbench.UserInterfaceLanguage">
44
<value nick="blueprint" value="0"/>
55
<value nick="xml" value="1"/>

demos

Submodule demos updated 134 files

meson.build

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
project('Workbench', ['vala', 'c', 'rust'],
1+
project(
2+
'Workbench',
3+
['vala', 'c', 'rust'],
24
version: '47.1',
3-
meson_version: '>= 0.64.0',
5+
meson_version: '>= 1.0.0',
46
license: 'GPL-3.0-only',
5-
default_options : [
7+
default_options: [
68
'libdir=lib',
9+
'warning_level=2',
10+
'werror=false',
711
],
812
)
913

@@ -33,5 +37,5 @@ subdir('src')
3337
gnome.post_install(
3438
glib_compile_schemas: true,
3539
gtk_update_icon_cache: true,
36-
update_desktop_database: true
37-
)
40+
update_desktop_database: true,
41+
)

src/bin.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!@GJS@ -m
22

33
import { exit, programArgs } from "system";
4-
import GLib from "gi://GLib";
54
import { setConsoleLogDomain } from "console";
65
import Xdp from "gi://Xdp";
76

@@ -14,7 +13,6 @@ imports.package.init({
1413
datadir: "@datadir@",
1514
});
1615
setConsoleLogDomain(pkg.name);
17-
GLib.set_application_name("Workbench");
1816

1917
if (!Xdp.Portal.running_under_flatpak()) {
2018
console.error(

src/shortcutsWindow.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ export default function ShortcutsWindow({ application }) {
99

1010
const action_shortcuts = new Gio.SimpleAction({
1111
name: "shortcuts",
12-
parameter_type: null,
1312
});
1413
action_shortcuts.connect("activate", () => {
1514
if (!window) {
1615
({ window } = build(resource));
17-
window.set_transient_for(application.get_active_window());
1816
}
17+
window.set_transient_for(application.active_window);
1918
window.present();
2019
});
2120
application.add_action(action_shortcuts);

0 commit comments

Comments
 (0)