AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-06 00:30:08 +00:00
Code Issues Projects Releases Wiki Activity

GtkIconTheme: Include legacy stock icons from resources

Browse Source 
Add /org/gtk/libgtk/icons as a resource path, and ensure
that we always parse an index.theme file for hicolor which
makes the builtin icons available as part of the hicolor theme.
This commit is contained in:
Matthias Clasen 2014-06-20 01:04:16 -04:00
parent 968ea4186d
commit 49bcaf844c
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gtk/gtkicontheme.c
View File

@ -735,6 +735,8 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme)
for (j = 0; xdg_data_dirs[j]; j++) for (j = 0; xdg_data_dirs[j]; j++)
priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "pixmaps", NULL); priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "pixmaps", NULL);
priv->resource_paths = g_list_append (NULL, g_strdup ("/org/gtk/libgtk/icons"));
priv->themes_valid = FALSE; priv->themes_valid = FALSE;
priv->themes = NULL; priv->themes = NULL;
priv->unthemed_icons = NULL; priv->unthemed_icons = NULL;
@ -1058,6 +1060,24 @@ gtk_icon_theme_set_custom_theme (GtkIconTheme *icon_theme,
} }
} }
static const gchar builtin_hicolor_index[] =
"[Icon Theme]\n"
"Name=Hicolor\n"
"Hidden=True\n"
"Directories=16x16/actions,22x22/actions,24x24/actions,32x32/actions\n"
"[16x16/actions]\n"
"Size=16\n"
"Type=Threshold\n"
"[22x22/actions]\n"
"Size=22\n"
"Type=Threshold\n"
"[24x24/actions]\n"
"Size=24\n"
"Type=Threshold\n"
"[32x32/actions]\n"
"Size=32\n"
"Type=Threshold\n";
static void static void
insert_theme (GtkIconTheme *icon_theme, insert_theme (GtkIconTheme *icon_theme,
const gchar *theme_name) const gchar *theme_name)
@ -1129,6 +1149,12 @@ insert_theme (GtkIconTheme *icon_theme,
theme = g_new0 (IconTheme, 1); theme = g_new0 (IconTheme, 1);
theme->name = g_strdup (theme_name); theme->name = g_strdup (theme_name);
priv->themes = g_list_prepend (priv->themes, theme); priv->themes = g_list_prepend (priv->themes, theme);
if (!theme_file)
{
theme_file = g_key_file_new ();
g_key_file_set_list_separator (theme_file, ',');
g_key_file_load_from_data (theme_file, builtin_hicolor_index, -1, 0, NULL);
}
} }
if (theme_file == NULL) if (theme_file == NULL)