From 489529be5a32fc812662de1e173b7b3fe357ff82 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 7 Jul 2006 05:24:00 +0000 Subject: [PATCH] Small memory savings --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ gtk/gtkicontheme.c | 11 ++++------- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d24530754..6849f92915 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-07-07 Matthias Clasen + + * gtk/gtkicontheme.c: Small memory savings. + 2006-07-06 Matthias Clasen * gtk/gtkfilechooserbutton.c: Get the display name diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3d24530754..6849f92915 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2006-07-07 Matthias Clasen + + * gtk/gtkicontheme.c: Small memory savings. + 2006-07-06 Matthias Clasen * gtk/gtkfilechooserbutton.c: Get the display name diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index bfb063d197..cffb892e90 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -578,7 +578,7 @@ free_dir_mtime (IconThemeDirMtime *dir_mtime) _gtk_icon_cache_unref (dir_mtime->cache); g_free (dir_mtime->dir); - g_free (dir_mtime); + g_slice_free (IconThemeDirMtime, dir_mtime); } @@ -894,7 +894,7 @@ insert_theme (GtkIconTheme *icon_theme, const char *theme_name) path = g_build_filename (priv->search_path[i], theme_name, NULL); - dir_mtime = g_new (IconThemeDirMtime, 1); + dir_mtime = g_slice_new (IconThemeDirMtime); dir_mtime->cache = NULL; dir_mtime->dir = path; if (g_stat (path, &stat_buf) == 0 && S_ISDIR (stat_buf.st_mode)) @@ -1044,7 +1044,7 @@ load_themes (GtkIconTheme *icon_theme) { dir = icon_theme->priv->search_path[base]; - dir_mtime = g_new (IconThemeDirMtime, 1); + dir_mtime = g_slice_new (IconThemeDirMtime); dir_mtime->cache = _gtk_icon_cache_new_for_path (dir); dir_mtime->dir = g_strdup (dir); if (g_stat (dir, &stat_buf) == 0 && S_ISDIR (stat_buf.st_mode)) @@ -2056,7 +2056,6 @@ load_icon_data (IconThemeDir *dir, const char *path, const char *name) char *base_name; char **split; gsize length; - char *dot; char *str; char *split_point; int i; @@ -2076,9 +2075,7 @@ load_icon_data (IconThemeDir *dir, const char *path, const char *name) } else { - base_name = g_strdup (name); - dot = strrchr (base_name, '.'); - *dot = 0; + base_name = strip_suffix (name); data = g_slice_new0 (GtkIconData); g_hash_table_replace (dir->icon_data, base_name, data);