From b635954523bd823a7097c807020aa7ea46b3c28d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Feb 2005 04:31:21 +0000 Subject: [PATCH] Look for icons in XDG_DATA_DIRS/pixmaps. (#165950, Thomas Zajic) 2005-02-01 Matthias Clasen * gtk/gtkicontheme.c (gtk_icon_theme_init): Look for icons in XDG_DATA_DIRS/pixmaps. (#165950, Thomas Zajic) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtkicontheme.c | 10 +++------- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d8b4775f2..601dda3d8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-02-01 Matthias Clasen + * 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) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2d8b4775f2..601dda3d8e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-02-01 Matthias Clasen + * 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) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2d8b4775f2..601dda3d8e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2005-02-01 Matthias Clasen + * 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) diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index ca6ef338f3..77b6c8c7c0 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -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;