diff options
author | Benjamin Otte <otte@redhat.com> | 2012-09-19 15:32:38 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2012-09-19 15:32:38 +0200 |
commit | 6696aa2128e37fa0c1866ad7667bcb11c5cc3e78 (patch) | |
tree | 1ee7d86a4da0faa5391550e8d8d2ff2e0871b46b /gtk/gtkcssprovider.c | |
parent | 697ed544ddd15b5811b226e886d87f6dcf69eaf3 (diff) | |
download | gtk+-6696aa2128e37fa0c1866ad7667bcb11c5cc3e78.tar.gz |
cssprovider: Remove another path that can't be reached
... because the return value of a function is always TRUE.
Diffstat (limited to 'gtk/gtkcssprovider.c')
-rw-r--r-- | gtk/gtkcssprovider.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index cdeb00b1d1..d6f5d2b169 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -2848,22 +2848,11 @@ gtk_css_provider_get_named (const gchar *name, if (resource != NULL) g_resources_register (resource); - if (!gtk_css_provider_load_from_path (provider, path, NULL)) - { - if (resource != NULL) - { - g_resources_unregister (resource); - g_resource_unref (resource); - } - g_object_unref (provider); - provider = NULL; - } - else - { - /* Only set this after load success, as load_from_path will clear it */ - provider->priv->resource = resource; - g_hash_table_insert (themes, g_strdup (key), provider); - } + gtk_css_provider_load_from_path (provider, path, NULL); + + /* Only set this after load, as load_from_path will clear it */ + provider->priv->resource = resource; + g_hash_table_insert (themes, g_strdup (key), provider); g_free (path); g_free (dir); |