AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use /usr/share/pixmaps only on Unix.

Browse Source 
2004-12-30  Tor Lillqvist  <tml@iki.fi>

	* gtk/gtkicontheme.c (gtk_icon_theme_init): Use /usr/share/pixmaps
	only on Unix.
This commit is contained in:
Tor Lillqvist 2004-12-30 00:37:12 +00:00 committed by Tor Lillqvist
parent e7662669c1
commit 5e86a6c9cd
5 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-30 Tor Lillqvist <tml@iki.fi>
* gtk/gtkicontheme.c (gtk_icon_theme_init): Use /usr/share/pixmaps
only on Unix.
2004-12-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2004-12-30 Tor Lillqvist <tml@iki.fi>
* gtk/gtkicontheme.c (gtk_icon_theme_init): Use /usr/share/pixmaps
only on Unix.
2004-12-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
2004-12-30 Tor Lillqvist <tml@iki.fi>
* gtk/gtkicontheme.c (gtk_icon_theme_init): Use /usr/share/pixmaps
only on Unix.
2004-12-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2004-12-30 Tor Lillqvist <tml@iki.fi>
* gtk/gtkicontheme.c (gtk_icon_theme_init): Use /usr/share/pixmaps
only on Unix.
2004-12-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmenuitem.c (gtk_menu_item_position_menu): Inherit

7
gtk/gtkicontheme.c
View File

@ -567,7 +567,10 @@ 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 + 3;
priv->search_path_len = i + 2;
#ifdef G_OS_UNIX
priv->search_path_len++;
#endif
priv->search_path = g_new (char *, priv->search_path_len);
@ -578,7 +581,9 @@ 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
priv->themes_valid = FALSE;
priv->themes = NULL;