[gnome-shell] St: fix regression from f7af96dbb2152c796c5877585e7d1e555471d6ce
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] St: fix regression from f7af96dbb2152c796c5877585e7d1e555471d6ce
- Date: Sun, 16 Dec 2012 19:46:46 +0000 (UTC)
commit 9860b1c677430fe96f6afdd95a2958bce398ca62
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Sun Dec 16 18:05:38 2012 +0100
St: fix regression from f7af96dbb2152c796c5877585e7d1e555471d6ce
A bad rebase caused the wrong patch to be pushed.
https://bugzilla.gnome.org/show_bug.cgi?id=687881
src/st/st-theme-node.c | 6 +++---
src/st/st-theme.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/st/st-theme-node.c b/src/st/st-theme-node.c
index d049ca1..694c496 100644
--- a/src/st/st-theme-node.c
+++ b/src/st/st-theme-node.c
@@ -1749,7 +1749,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
base_stylesheet,
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);
}
}
@@ -1859,7 +1859,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
base_stylesheet,
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);
}
else if (term_is_inherit (decl->value))
@@ -2756,7 +2756,7 @@ st_theme_node_get_border_image (StThemeNode *node)
base_stylesheet = NULL;
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);
if (filename == NULL)
diff --git a/src/st/st-theme.c b/src/st/st-theme.c
index 601f31e..479645f 100644
--- a/src/st/st-theme.c
+++ b/src/st/st-theme.c
@@ -855,7 +855,7 @@ add_matched_properties (StTheme *a_this,
file = _st_theme_resolve_url (a_this,
a_nodesheet,
import_rule->url->stryng->str);
- filename = g_strdup (g_file_get_path (file));
+ filename = g_file_get_path (file);
g_object_unref (file);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]