forked from AuroraMiddleware/gtk
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)
This commit is contained in:
parent
adf6e301fa
commit
b635954523
@ -1,5 +1,8 @@
|
||||
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
|
||||
to NULL after freeing it. (#165800, Damon Chaplin)
|
||||
|
||||
|
@ -1,5 +1,8 @@
|
||||
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
|
||||
to NULL after freeing it. (#165800, Damon Chaplin)
|
||||
|
||||
|
@ -1,5 +1,8 @@
|
||||
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
|
||||
to NULL after freeing it. (#165800, Damon Chaplin)
|
||||
|
||||
|
@ -568,10 +568,7 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme)
|
||||
xdg_data_dirs = g_get_system_data_dirs ();
|
||||
for (i = 0; xdg_data_dirs[i]; i++) ;
|
||||
|
||||
priv->search_path_len = i + 2;
|
||||
#ifdef G_OS_UNIX
|
||||
priv->search_path_len++;
|
||||
#endif
|
||||
priv->search_path_len = 2 * i + 2;
|
||||
|
||||
priv->search_path = g_new (char *, priv->search_path_len);
|
||||
|
||||
@ -582,9 +579,8 @@ gtk_icon_theme_init (GtkIconTheme *icon_theme)
|
||||
for (j = 0; xdg_data_dirs[j]; j++)
|
||||
priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "icons", NULL);
|
||||
|
||||
#ifdef G_OS_UNIX
|
||||
priv->search_path[i++] = g_strdup ("/usr/share/pixmaps");
|
||||
#endif
|
||||
for (j = 0; xdg_data_dirs[j]; j++)
|
||||
priv->search_path[i++] = g_build_filename (xdg_data_dirs[j], "pixmaps", NULL);
|
||||
|
||||
priv->themes_valid = FALSE;
|
||||
priv->themes = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user