user-theme: Temporarily work around a gnome-shell regression

setThemeStylesheet() stopped accepting %null to revert to the default
stylesheet. The issue is fixed in gnome-shell master, but work around
it for 3.15.2 to not ship broken (again).
This commit is contained in:
Florian Müllner
2014-11-27 14:32:28 +00:00
parent 5c2d13ec51
commit dd3c7ca199
+6 -4
View File
@@ -30,7 +30,7 @@ const ThemeManager = new Lang.Class({
this._changedId = 0;
}
Main.setThemeStylesheet(null);
Main._cssStylesheet = null;
Main.loadTheme();
},
@@ -57,11 +57,13 @@ const ThemeManager = new Lang.Class({
}
}
if (_stylesheet)
if (_stylesheet) {
global.log('loading user theme: ' + _stylesheet);
else
Main.setThemeStylesheet(_stylesheet);
} else {
global.log('loading default theme (Adwaita)');
Main.setThemeStylesheet(_stylesheet);
Main._cssStylesheet = null;
}
Main.loadTheme();
}
});