[gtk+] GktIconTheme: Be even more careful with paths
- From: Руслан Ижбулатов <ruslanizhb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GktIconTheme: Be even more careful with paths
- Date: Tue, 15 Jul 2014 19:04:40 +0000 (UTC)
commit e3d725ed8c72db5e1b2edb1d6bc4ffa8945c4a22
Author: Руслан Ижбулатов <lrn1986 gmail com>
Date: Tue Jul 15 16:42:39 2014 +0000
GktIconTheme: Be even more careful with paths
This is a followup for 5a252f13a863c00ccd9901afa110e85836a6af4c
https://bugzilla.gnome.org/show_bug.cgi?id=733189
gtk/gtkicontheme.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 42cb138..465970d 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -3025,18 +3025,21 @@ theme_lookup_icon (IconTheme *theme,
if (min_dir->dir)
{
- gchar *uri;
-
file = g_strconcat (icon_name, string_from_suffix (suffix), NULL);
icon_info->filename = g_build_filename (min_dir->dir, file, NULL);
+
if (min_dir->is_resource)
- uri = g_strconcat ("resource://", icon_info->filename, NULL);
+ {
+ gchar *uri;
+ uri = g_strconcat ("resource://", icon_info->filename, NULL);
+ icon_info->icon_file = g_file_new_for_uri (uri);
+ g_free (uri);
+ }
else
- uri = g_strconcat ("file://", icon_info->filename, NULL);
- icon_info->icon_file = g_file_new_for_uri (uri);
+ icon_info->icon_file = g_file_new_for_path (icon_info->filename);
+
icon_info->is_svg = suffix == ICON_SUFFIX_SVG;
icon_info->is_resource = min_dir->is_resource;
- g_free (uri);
g_free (file);
}
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]