brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Use StSettings instead of GtkSettings

Browse Source 
Cut a middle man by listening to dconf settings directly, and stop relying
on XSettings for it.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/317
This commit is contained in:
Carlos Garnacho 2018-11-27 14:59:09 +01:00
parent 91d73d65c3
commit f02033acb7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/ui/main.js
View File

@ -127,8 +127,8 @@ function start() {
sessionMode = new SessionMode.SessionMode(); sessionMode = new SessionMode.SessionMode();
sessionMode.connect('updated', _sessionUpdated); sessionMode.connect('updated', _sessionUpdated);
Gtk.Settings.get_default().connect('notify::gtk-theme-name',
_loadDefaultStylesheet); St.Settings.get().connect('notify::gtk-theme', _loadDefaultStylesheet);
Gtk.IconTheme.get_default().add_resource_path('/org/gnome/shell/theme/icons'); Gtk.IconTheme.get_default().add_resource_path('/org/gnome/shell/theme/icons');
_initializeUI(); _initializeUI();
@ -279,7 +279,7 @@ function _getDefaultStylesheet() {
// Look for a high-contrast variant first when using GTK+'s HighContrast // Look for a high-contrast variant first when using GTK+'s HighContrast
// theme // theme
if (Gtk.Settings.get_default().gtk_theme_name == 'HighContrast') if (St.Settings.get().gtk_theme == 'HighContrast')
stylesheet = _getStylesheet(name.replace('.css', '-high-contrast.css')); stylesheet = _getStylesheet(name.replace('.css', '-high-contrast.css'));
if (stylesheet == null) if (stylesheet == null)