callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssprovider: Move fallback code into _gtk_css_provider_load_named()

Browse Source 
This makes sure the full theme loading logic resides in one function and
isn't scattered around.

As a side-effect, the hash table kept by gtk_css_provider_get_named()
will now be populated with fallback themes. This will not be a problem
after the next commit though.
This commit is contained in:
Benjamin Otte
2012-09-19 16:30:27 +02:00
parent 738b453c66
commit b41215bdea
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtksettings.c
View File

@ -2924,18 +2924,13 @@ settings_update_theme (GtkSettings *settings)
"gtk-application-prefer-dark-theme", &prefer_dark_theme,
NULL);
if (theme_name && *theme_name)
if (!theme_name || !*theme_name)
{
if (prefer_dark_theme)
provider = gtk_css_provider_get_named (theme_name, "dark");
if (!provider)
provider = gtk_css_provider_get_named (theme_name, NULL);
g_free (theme_name);
theme_name = g_strdup ("Raleigh");
}
/* If we didn't find the named theme, fall back */
if (!provider)
provider = gtk_css_provider_get_named ("Raleigh", NULL);
provider = gtk_css_provider_get_named (theme_name, prefer_dark_theme ? "dark" : NULL);
settings_update_provider (priv->screen, &priv->theme_provider, provider);