St: fix regression from f7af96dbb2
A bad rebase caused the wrong patch to be pushed. https://bugzilla.gnome.org/show_bug.cgi?id=687881
This commit is contained in:
parent
a0e340f06e
commit
9860b1c677
@ -1749,7 +1749,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
|
|||||||
base_stylesheet,
|
base_stylesheet,
|
||||||
term->content.str->stryng->str);
|
term->content.str->stryng->str);
|
||||||
|
|
||||||
node->background_image = g_strdup (g_file_get_path (file));
|
node->background_image = g_file_get_path (file);
|
||||||
g_object_unref (file);
|
g_object_unref (file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1859,7 +1859,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
|
|||||||
base_stylesheet,
|
base_stylesheet,
|
||||||
decl->value->content.str->stryng->str);
|
decl->value->content.str->stryng->str);
|
||||||
|
|
||||||
node->background_image = g_strdup (g_file_get_path (file));
|
node->background_image = g_file_get_path (file);
|
||||||
g_object_unref (file);
|
g_object_unref (file);
|
||||||
}
|
}
|
||||||
else if (term_is_inherit (decl->value))
|
else if (term_is_inherit (decl->value))
|
||||||
@ -2756,7 +2756,7 @@ st_theme_node_get_border_image (StThemeNode *node)
|
|||||||
base_stylesheet = NULL;
|
base_stylesheet = NULL;
|
||||||
|
|
||||||
file = _st_theme_resolve_url (node->theme, base_stylesheet, url);
|
file = _st_theme_resolve_url (node->theme, base_stylesheet, url);
|
||||||
filename = g_strdup (g_file_get_path (file));
|
filename = g_file_get_path (file);
|
||||||
g_object_unref (file);
|
g_object_unref (file);
|
||||||
|
|
||||||
if (filename == NULL)
|
if (filename == NULL)
|
||||||
|
@ -855,7 +855,7 @@ add_matched_properties (StTheme *a_this,
|
|||||||
file = _st_theme_resolve_url (a_this,
|
file = _st_theme_resolve_url (a_this,
|
||||||
a_nodesheet,
|
a_nodesheet,
|
||||||
import_rule->url->stryng->str);
|
import_rule->url->stryng->str);
|
||||||
filename = g_strdup (g_file_get_path (file));
|
filename = g_file_get_path (file);
|
||||||
|
|
||||||
g_object_unref (file);
|
g_object_unref (file);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user