Skip to content

Commit b28b6c4

Browse files
committed
terminalpage: remove RxJS
#389
1 parent bd5e5e8 commit b28b6c4

File tree

3 files changed

+440
-348
lines changed

3 files changed

+440
-348
lines changed

ddterm/app/appwindow.js

+6-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
/* exported AppWindow */
2323

2424
const { GLib, GObject, Gio, Gdk, Gtk } = imports.gi;
25-
const { settings } = imports.ddterm.rx;
2625
const { extensiondbus, terminalpage } = imports.ddterm.app;
2726
const { translations } = imports.ddterm.util;
2827
const ByteArray = imports.byteArray;
@@ -69,8 +68,6 @@ var AppWindow = GObject.registerClass(
6968
_init(params) {
7069
super._init(params);
7170

72-
this.rx_settings = new settings.Settings({ gsettings: this.settings });
73-
7471
this.extension_dbus = extensiondbus.get();
7572

7673
this.connect('notify::screen', () => this.update_visual());
@@ -299,6 +296,10 @@ var AppWindow = GObject.registerClass(
299296
);
300297
}
301298

299+
this.desktop_settings = new Gio.Settings({
300+
schema_id: 'org.gnome.desktop.interface',
301+
});
302+
302303
this.insert_page(0);
303304

304305
const display = Gdk.Display.get_default();
@@ -349,8 +350,9 @@ var AppWindow = GObject.registerClass(
349350
this.settings.get_boolean('preserve-working-directory') ? this.get_cwd() : null;
350351

351352
const page = new terminalpage.TerminalPage({
352-
settings: this.rx_settings,
353+
settings: this.settings,
353354
menus: this.menus,
355+
desktop_settings: this.desktop_settings,
354356
});
355357

356358
const index = this.notebook.insert_page(page, page.tab_label, position);

0 commit comments

Comments
 (0)