From 8c6644f1be844b2f3eca5b4bafa495b4b6ca1243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 27 Nov 2014 14:49:43 +0000 Subject: [PATCH] Revert "user-theme: Temporarily work around a gnome-shell regression" The issue has been fixed in gnome-shell master, so we can revert the workaround. --- extensions/user-theme/extension.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/extensions/user-theme/extension.js b/extensions/user-theme/extension.js index b9dc30ee..b36d36a5 100644 --- a/extensions/user-theme/extension.js +++ b/extensions/user-theme/extension.js @@ -30,7 +30,7 @@ const ThemeManager = new Lang.Class({ this._changedId = 0; } - Main._cssStylesheet = null; + Main.setThemeStylesheet(null); Main.loadTheme(); }, @@ -57,13 +57,11 @@ const ThemeManager = new Lang.Class({ } } - if (_stylesheet) { + if (_stylesheet) global.log('loading user theme: ' + _stylesheet); - Main.setThemeStylesheet(_stylesheet); - } else { + else global.log('loading default theme (Adwaita)'); - Main._cssStylesheet = null; - } + Main.setThemeStylesheet(_stylesheet); Main.loadTheme(); } });