2005-03-20 [thorsten] 1.9.6cvs4

	* src/prefs_toolbar.c
		fix crash when selecting toolbar item (uninitialized pointer)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 38cdb219ee79a2b92dc71449cc45944aafc9f9ac..46557b65c90fa889511d1447c5c094ad54b967e6 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-03-20 [thorsten]  1.9.6cvs4
+
+       * src/prefs_toolbar.c
+               fix crash when selecting toolbar item (uninitialized pointer)
+
 2005-03-20 [thorsten]  1.9.6cvs3
 
        * src/procmime.c

diff --git a/PATCHSETS b/PATCHSETS
index 537b3a608ea2a1bf2b96f1aa7ce3cdb9aac557c1..6f009914e11509cd4cf2f3ff6d6f74370ca7b906 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -420,3 +420,4 @@
 ( cvs diff -u -r 1.395.2.60 -r 1.395.2.61 src/summaryview.c; cvs diff -u -r 1.68.2.5 -r 1.68.2.6 src/summaryview.h; ) > 1.9.6cvs1.patchset
 ( cvs diff -u -r 1.382.2.111 -r 1.382.2.112 src/compose.c; ) > 1.9.6cvs2.patchset
 ( cvs diff -u -r 1.49.2.36 -r 1.49.2.37 src/procmime.c; ) > 1.9.6cvs3.patchset
+( cvs diff -u -r 1.30.2.10 -r 1.30.2.11 src/prefs_toolbar.c; ) > 1.9.6cvs4.patchset

diff --git a/configure.ac b/configure.ac
index a6b7a501ff32623b7e3ee910a35b499bdc1ece8e..c0e962fc506c7d5e25df208708f471ed6eaf027f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index afc86d9da2238789d1d5f84cfcd64aa9feb2c51d..239be15fc4181fa3e9ecdb9123eb4be2a27b10a9 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -1136,7 +1136,7 @@ static gboolean set_list_selected(GtkTreeSelection *selector,
        GtkTreeIter iter;
        GtkTreeView *list_ico = GTK_TREE_VIEW(prefs_toolbar->list_view_icons);
        GtkTreeView *list_set = GTK_TREE_VIEW(prefs_toolbar->list_view_set);
-       gchar *syl_act;
+       gchar *syl_act = toolbar_ret_descr_from_val(A_SYL_ACTIONS);
        gchar *file, *icon_text, *descr;
        GList *cur;
        gint item_num;