Skip to content

Commit 0762a72

Browse files
authored
Use a file instead of abstract socket for the DBus connection (#697)
1 parent d65dfe0 commit 0762a72

File tree

5 files changed

+10
-12
lines changed

5 files changed

+10
-12
lines changed

src/Library/EntryRow.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ class EntryRow extends Adw.PreferencesRow {
3131
}
3232

3333
#createLanguageTags(demo) {
34-
["javascript", "vala", "rust"].forEach((id) => {
34+
demo.languages.forEach((id) => {
3535
const language = getLanguage(id);
36-
if (!demo.languages.includes(language.id)) return;
36+
if (!language) return;
3737
const language_tag = this.#createLanguageTag(language);
3838
this._languages_box.append(language_tag);
3939
});

src/Previewer/DBusPreviewer.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const interface_info = nodeInfo.interfaces[0];
77

88
const guid = Gio.dbus_generate_guid();
99
const server = Gio.DBusServer.new_sync(
10-
"unix:abstract=re.sonny.Workbench.vala_previewer", // FIXME: abstract socket sucks
10+
"unix:path=/var/tmp/workbench_preview_dbus_socket",
1111
Gio.DBusServerFlags.AUTHENTICATION_REQUIRE_SAME_USER,
1212
guid,
1313
null,
@@ -21,7 +21,7 @@ server.start();
2121

2222
async function startProcess() {
2323
sub_process = Gio.Subprocess.new(
24-
["workbench-vala-previewer", server.get_client_address()],
24+
["workbench-previewer-module", server.get_client_address()],
2525
Gio.SubprocessFlags.NONE,
2626
);
2727

@@ -56,8 +56,8 @@ async function startProcess() {
5656
Gio.DBusProxyFlags.NONE,
5757
interface_info,
5858
null,
59-
"/re/sonny/workbench/vala_previewer", // object path
60-
"re.sonny.Workbench.vala_previewer", // interface name
59+
"/re/sonny/workbench/previewer_module", // object path
60+
"re.sonny.Workbench.previewer_module", // interface name
6161
null,
6262
);
6363

src/Previewer/meson.build

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
executable('workbench-vala-previewer',
1+
executable('workbench-previewer-module',
22
'previewer.vala',
33
dependencies: [ dependency('gio-2.0'), dependency('gmodule-2.0'), dependency('libadwaita-1'), dependency('shumate-1.0'), dependency('webkitgtk-6.0') ],
44
# vala_args: [ '--gresourcesdir=' + meson.current_build_dir() ],
@@ -11,5 +11,3 @@ executable('workbench-crasher',
1111
# vala_args: [ '--gresourcesdir=' + meson.current_build_dir() ],
1212
install: true,
1313
)
14-
15-

src/Previewer/previewer.vala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace Workbench {
22

3-
[DBus (name="re.sonny.Workbench.vala_previewer")]
3+
[DBus (name="re.sonny.Workbench.previewer_module")]
44
public class Previewer : Object {
55
construct {
66
this.notify["ColorScheme"].connect (() => {
@@ -233,7 +233,7 @@ namespace Workbench {
233233
loop.quit();
234234
});
235235

236-
connection.register_object ("/re/sonny/workbench/vala_previewer", previewer);
236+
connection.register_object ("/re/sonny/workbench/previewer_module", previewer);
237237

238238
loop.run();
239239
}

src/Previewer/previewer.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<node>
2-
<interface name="re.sonny.Workbench.vala_previewer">
2+
<interface name="re.sonny.Workbench.previewer_module">
33
<method name="UpdateUi">
44
<arg type="s" name="content" direction="in"/>
55
<arg type="s" name="target_id" direction="in"/>

0 commit comments

Comments
 (0)