[gnome-shell-extensions/wip/fmuellner/misc-cleanups: 11/12] Revert "User theme: compatibility with XDG Base Directory"
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell-extensions/wip/fmuellner/misc-cleanups: 11/12] Revert "User theme: compatibility with XDG Base Directory"
- Date: Mon, 4 Mar 2019 18:37:44 +0000 (UTC)
commit ab334d95e0f5841875739f3632fd99e74c8fb9d5
Author: Florian Müllner <fmuellner gnome org>
Date: Sun Mar 3 05:34:46 2019 +0100
Revert "User theme: compatibility with XDG Base Directory"
We already handled themes in XDG_DATA_HOME before commit 2582ab
by prepending it to the system dirs.
This reverts commit 2582ab4fd03a6a078a3ba2556e250bfdb64308b7.
https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/60
extensions/user-theme/extension.js | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/extensions/user-theme/extension.js b/extensions/user-theme/extension.js
index d9d5b38..1a718d1 100644
--- a/extensions/user-theme/extension.js
+++ b/extensions/user-theme/extension.js
@@ -34,17 +34,11 @@ class ThemeManager {
let _themeName = this._settings.get_string(SETTINGS_KEY);
if (_themeName) {
- let _userCssStylesheetCompat = GLib.build_filenamev([
- GLib.get_home_dir(), '.themes', _themeName, 'gnome-shell', 'gnome-shell.css'
- ]);
- let fileCompat = Gio.file_new_for_path(_userCssStylesheetCompat);
let _userCssStylesheet = GLib.build_filenamev([
- GLib.get_user_data_dir(), 'themes', _themeName, 'gnome-shell', 'gnome-shell.css'
+ GLib.get_home_dir(), '.themes', _themeName, 'gnome-shell', 'gnome-shell.css'
]);
let file = Gio.file_new_for_path(_userCssStylesheet);
- if (fileCompat.query_exists(null))
- _stylesheet = _userCssStylesheetCompat;
- else if (file.query_exists(null))
+ if (file.query_exists(null))
_stylesheet = _userCssStylesheet;
else {
let sysdirs = GLib.get_system_data_dirs();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]