From: Oliver Haertel <o.h.a@gmx.net>
Date: Sat, 17 Aug 2002 10:54:37 +0000 (+0000)
Subject: Custom Toolbar: fix crash on CANCEL
X-Git-Tag: before_folder_color~14
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=098428df3fd06c15c75acbf3127a20f6905b3cfe

Custom Toolbar: fix crash on CANCEL
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 789afcbc6..3e070b08e 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-08-17 [oliver]	0.8.1claws72
+
+	* src/prefs_toolbar.c
+		update toolbar on CANCEL
+		bug reported by Martin Kluge
+	* src/toolbar.c
+		toolbar_destroy memleak fixed		
+
 2002-08-17 [alfons]	0.8.1claws71
 
 	* src/toolbar.c
diff --git a/configure.in b/configure.in
index e88948f81..17fe67df1 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=claws71
+EXTRA_VERSION=claws72
 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 8611ccfe1..0a97c42e5 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -312,6 +312,7 @@ static void prefs_toolbar_ok(void)
 static void prefs_toolbar_cancel(void)
 {
 	prefs_toolbar_close();
+	toolbar_update();
 }
 
 static void get_action_name(gchar *entry, gchar **menu)
diff --git a/src/toolbar.c b/src/toolbar.c
index 7824b2bb6..17877aeb9 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -137,6 +137,10 @@ static void toolbar_forward_popup_closed_cb
 					(GtkMenuShell	*menu_shell,
 					 gpointer	 data);
 
+static void activate_compose_button     (MainToolbar       *toolbar,
+					 ToolbarStyle      style,
+					 ComposeButtonType type);
+
 static ToolbarAction t_action[] = 
 {
 	{ "A_RECEIVE_ALL",   N_("Receive Mail on all Accounts"),    toolbar_inc_all_cb        },
@@ -835,9 +839,10 @@ void toolbar_destroy(MainWindow *mainwin)
 	while (mainwin->toolbar->syl_action != NULL) {
 		syl_action = (ToolbarSylpheedActions*)mainwin->toolbar->syl_action->data;
 
+		mainwin->toolbar->syl_action = g_slist_remove(mainwin->toolbar->syl_action, syl_action);
 		if (syl_action->name)
 			g_free(syl_action->name);
-		mainwin->toolbar->syl_action = g_slist_remove(mainwin->toolbar->syl_action, syl_action);
+		g_free(syl_action);
 	}
 
 	g_slist_free(mainwin->toolbar->syl_action);