mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-28 14:31:10 +00:00
Fix config dir <> data dir confusion
We added code to look for settings.ini in system config dirs, and then proceeded to move it to /usr/share/gtk-3.0 :-(. So, look in that location as well.
This commit is contained in:
parent
f5f90e8047
commit
fc7d26860a
@ -313,6 +313,11 @@ gtk_settings_init (GtkSettings *settings)
|
||||
}
|
||||
g_free (pspecs);
|
||||
|
||||
path = g_build_filename (_gtk_get_data_prefix (), "share", "gtk-3.0", "settings.ini", NULL);
|
||||
if (g_file_test (path, G_FILE_TEST_EXISTS))
|
||||
gtk_settings_load_from_key_file (settings, path, GTK_SETTINGS_SOURCE_DEFAULT);
|
||||
g_free (path);
|
||||
|
||||
path = g_build_filename (_gtk_get_sysconfdir (), "gtk-3.0", "settings.ini", NULL);
|
||||
if (g_file_test (path, G_FILE_TEST_EXISTS))
|
||||
gtk_settings_load_from_key_file (settings, path, GTK_SETTINGS_SOURCE_DEFAULT);
|
||||
|
Loading…
Reference in New Issue
Block a user