Commit b6359545 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Look for icons in XDG_DATA_DIRS/pixmaps. (#165950, Thomas Zajic)

2005-02-01  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkicontheme.c (gtk_icon_theme_init): Look for icons
	in XDG_DATA_DIRS/pixmaps.  (#165950, Thomas Zajic)
parent adf6e301
2005-02-01 Matthias Clasen <mclasen@redhat.com> 2005-02-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (gtk_icon_theme_init): Look for icons
in XDG_DATA_DIRS/pixmaps. (#165950, Thomas Zajic)
* gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list * gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
to NULL after freeing it. (#165800, Damon Chaplin) to NULL after freeing it. (#165800, Damon Chaplin)
......
2005-02-01 Matthias Clasen <mclasen@redhat.com> 2005-02-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (gtk_icon_theme_init): Look for icons
in XDG_DATA_DIRS/pixmaps. (#165950, Thomas Zajic)
* gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list * gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
to NULL after freeing it. (#165800, Damon Chaplin) to NULL after freeing it. (#165800, Damon Chaplin)
......
2005-02-01 Matthias Clasen <mclasen@redhat.com> 2005-02-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (gtk_icon_theme_init): Look for icons
in XDG_DATA_DIRS/pixmaps. (#165950, Thomas Zajic)
* gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list * gtk/gtkwindow.c (gtk_window_set_icon_name): Set info->icon_list
to NULL after freeing it. (#165800, Damon Chaplin) to NULL after freeing it. (#165800, Damon Chaplin)
......
...@@ -568,10 +568,7 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme) ...@@ -568,10 +568,7 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme)
xdg_data_dirs = g_get_system_data_dirs (); xdg_data_dirs = g_get_system_data_dirs ();
for (i = 0; xdg_data_dirs[i]; i++) ; for (i = 0; xdg_data_dirs[i]; i++) ;
priv->search_path_len = i + 2; priv->search_path_len = 2 * i + 2;
#ifdef G_OS_UNIX
priv->search_path_len++;
#endif
priv->search_path = g_new (char *, priv->search_path_len); priv->search_path = g_new (char *, priv->search_path_len);
...@@ -582,9 +579,8 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme) ...@@ -582,9 +579,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], "icons", NULL); priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "icons", NULL);
#ifdef G_OS_UNIX for (j = 0; xdg_data_dirs[j]; j++)
priv->search_path[i++] = g_strdup ("/usr/share/pixmaps"); priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "pixmaps", NULL);
#endif
priv->themes_valid = FALSE; priv->themes_valid = FALSE;
priv->themes = NULL; priv->themes = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment