isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

windowManager: Allow xwayland startup to complete without systemd

Browse Source 
Since commit 0ecddafc20 gsd-xsettings startup has been made conditional
on the systemd user instance being available at runtime. While that is
correct, it means that completing xwayland startup is also conditional
now.

We always want xwayland startup to go ahead, so wait for the XSettings
plugin to appear on the bus when gsd-xsettings is launched by gnome-session
and complete the task immediately if startup fails.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1252
This commit is contained in:
Florian Müllner 2020-05-12 17:16:34 +02:00
parent e8ae2ea432
commit fde8519002
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
js/ui/windowManager.js
View File

@ -902,31 +902,33 @@ var WindowManager = class {
IBusManager.getIBusManager().restartDaemon(['--xim']); IBusManager.getIBusManager().restartDaemon(['--xim']);
try { try {
if (Shell.util_start_systemd_unit('gsd-xsettings.target', 'fail')) { if (!Shell.util_start_systemd_unit('gsd-xsettings.target', 'fail'))
/* Leave this watchdog timeout so don't block indefinitely here */ log('Not starting gsd-xsettings; waiting for gnome-session to do so');
let timeoutId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 5, () => {
Gio.DBus.session.unwatch_name(watchId);
log('Warning: Failed to start gsd-xsettings');
task.return_boolean(true);
timeoutId = 0;
return GLib.SOURCE_REMOVE;
});
/* When gsd-xsettings daemon is started, we are good to resume */ /* Leave this watchdog timeout so don't block indefinitely here */
let watchId = Gio.DBus.session.watch_name( let timeoutId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT, 5, () => {
'org.gnome.SettingsDaemon.XSettings', Gio.DBus.session.unwatch_name(watchId);
Gio.BusNameWatcherFlags.NONE, log('Warning: Failed to start gsd-xsettings');
() => { task.return_boolean(true);
Gio.DBus.session.unwatch_name(watchId); timeoutId = 0;
if (timeoutId > 0) { return GLib.SOURCE_REMOVE;
task.return_boolean(true); });
GLib.source_remove(timeoutId);
} /* When gsd-xsettings daemon is started, we are good to resume */
}, let watchId = Gio.DBus.session.watch_name(
null); 'org.gnome.SettingsDaemon.XSettings',
} Gio.BusNameWatcherFlags.NONE,
() => {
Gio.DBus.session.unwatch_name(watchId);
if (timeoutId > 0) {
task.return_boolean(true);
GLib.source_remove(timeoutId);
}
},
null);
} catch (e) { } catch (e) {
log('Error starting gsd-xsettings: %s'.format(e.message)); log('Error starting gsd-xsettings: %s'.format(e.message));
task.return_boolean(true);
} }
return true; return true;