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.
2014-11-27 14:49:43 +00:00
parent 71fa03c4ea
commit 8c6644f1be
1 changed files with 4 additions and 6 deletions
@@ -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();
    }
 });