From 7345a6f2762d0876a57b49cf52fb5ecf125b21f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 3 Mar 2020 10:05:54 +0100 Subject: [PATCH] main: Get the theme resource name from sessionMode Along the lines of `styleSheetName`, a session mode may want to provide its own gresource file, so make this possible via a `themeResourceName` session mode parameter, defaulted to gnome-shell-theme.gresource https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1063 --- js/ui/main.js | 3 ++- js/ui/sessionMode.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/js/ui/main.js b/js/ui/main.js index 05b30d544..6b180bd9b 100644 --- a/js/ui/main.js +++ b/js/ui/main.js @@ -361,7 +361,8 @@ function reloadThemeResource() { if (_themeResource) _themeResource._unregister(); - _themeResource = Gio.Resource.load('%s/gnome-shell-theme.gresource'.format(global.datadir)); + _themeResource = Gio.Resource.load('%s/%s'.format(global.datadir, + sessionMode.themeResourceName)); _themeResource._register(); } diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js index 1c5298770..e12fc2ef4 100644 --- a/js/ui/sessionMode.js +++ b/js/ui/sessionMode.js @@ -15,6 +15,7 @@ const _modes = { 'restrictive': { parentMode: null, stylesheetName: 'gnome-shell.css', + themeResourceName: 'gnome-shell-theme.gresource', hasOverview: false, showCalendarEvents: false, allowSettings: false,