From 83b67f4a2e9cb06527451ec5a3513cf086931cdf Mon Sep 17 00:00:00 2001 From: Oliver Haertel Date: Thu, 8 Aug 2002 06:11:08 +0000 Subject: [PATCH] fix substitute pixmap bug --- ChangeLog.claws | 5 +++++ configure.in | 2 +- src/prefs_toolbar.c | 13 ++++++------- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index 830f25613..e534592aa 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,8 @@ +2002-08-08 [oliver] 0.8.1claws37 + + * src/prefs_toolbar.c + fix substitute pixmap bug + 2002-08-08 [paul] 0.8.1claws36 * sync with 0.8.1cvs19 diff --git a/configure.in b/configure.in index 4f735644a..1e029aa33 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws36 +EXTRA_VERSION=claws37 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c index 7a48a2c11..318742215 100644 --- a/src/prefs_toolbar.c +++ b/src/prefs_toolbar.c @@ -330,7 +330,7 @@ static gint prefs_toolbar_register(void) gint row_set = 0; GdkPixmap *xpm; GdkBitmap *xpmmask; - gchar *item[5] = {0}; + gchar *item[4]; if (clist_icons->rows == 0) return -1; @@ -348,7 +348,8 @@ static gint prefs_toolbar_register(void) item[3] = g_strdup (""); row_set = gtk_clist_append (GTK_CLIST (mtoolbar.clist_set), item); - + + g_free (item[0]); } else { if (is_duplicate (item[3])) { @@ -376,7 +377,6 @@ static gint prefs_toolbar_register(void) gtk_clist_moveto(clist_set, row_set, 0, row_set/clist_set->rows, 0); gtk_clist_select_row (clist_set, row_set, 0); - g_free (item[0]); g_free (item[2]); g_free (item[3]); @@ -392,7 +392,7 @@ static gint prefs_toolbar_substitute(void) gint row_set = 0; GdkPixmap *xpm; GdkBitmap *xpmmask; - gchar *item[5] = {0}; + gchar *item[4]; gchar *ac_set; /* no rows or nothing selected */ @@ -417,6 +417,8 @@ static gint prefs_toolbar_substitute(void) gtk_clist_remove (clist_set, row_set); row_set = gtk_clist_insert (clist_set, row_set, item); + + g_free (item[0]); } else { if ((is_duplicate(item[3])) && (g_strcasecmp(item[3], ac_set) != 0)){ @@ -441,12 +443,9 @@ static gint prefs_toolbar_substitute(void) gtk_clist_set_pixmap (clist_set, row_set, 0, xpm, xpmmask); } - - gtk_clist_moveto(clist_set, row_set, 0, row_set/clist_set->rows, 0); gtk_clist_select_row (clist_set, row_set, 0); - g_free (item[0]); g_free (item[2]); g_free (item[3]); -- 2.25.1