From: Colin Leroy <colin@colino.net>
Date: Mon, 9 Jul 2007 19:16:10 +0000 (+0000)
Subject: 2007-07-09 [colin]	2.10.0cvs10
X-Git-Tag: rel_3_0_0~186
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=a1983621f32c7a5f89b1930f8ee99b730b96b0d5;hp=ad628d1355a9b6e15f0cf5eae9c1fd984ad38013

2007-07-09 [colin]	2.10.0cvs10

	* src/prefs_toolbar.c
		Fix crash when no actions exist
---

diff --git a/ChangeLog b/ChangeLog
index a6b204eac..bd70461c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-09 [colin]	2.10.0cvs10
+
+	* src/prefs_toolbar.c
+		Fix crash when no actions exist
+
 2007-07-07 [paul]	2.10.0cvs9
 
 	* COPYING
diff --git a/PATCHSETS b/PATCHSETS
index 7e9d9e96d..3ce8f5e4e 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2663,3 +2663,4 @@
 ( cvs diff -u -r 1.8.2.20 -r 1.8.2.21 src/quote_fmt.c;  ) > 2.10.0cvs7.patchset
 ( cvs diff -u -r 1.9.2.24 -r 1.9.2.25 src/plugins/clamav/clamav_plugin_gtk.c;  ) > 2.10.0cvs8.patchset
 ( cvs diff -u -r 1.5.10.5 -r 1.5.10.6 COPYING;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/claws-mail-manual.xml;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 po/fi.po;  ) > 2.10.0cvs9.patchset
+( cvs diff -u -r 1.30.2.33 -r 1.30.2.34 src/prefs_toolbar.c;  ) > 2.10.0cvs10.patchset
diff --git a/configure.ac b/configure.ac
index e834c521f..fd8cd7961 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index db5252283..862b6f5df 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -367,6 +367,8 @@ static void prefs_toolbar_default(GtkButton *button, ToolbarPage *prefs_toolbar)
 static void get_action_name(const gchar *entry, gchar **menu)
 {
 	gchar *act, *act_p;
+	
+	*menu = NULL;
 
 	if (prefs_common.actions_list != NULL) {
 		
@@ -387,7 +389,7 @@ static void prefs_toolbar_register(GtkButton *button, ToolbarPage *prefs_toolbar
 	gchar *syl_act = toolbar_ret_descr_from_val(A_SYL_ACTIONS);
 	GtkListStore *store_set;
 	GtkTreeIter iter;
-	gchar *fname;
+	gchar *fname = NULL;
 
 	/* move selection in icon list view to set list view */
 
@@ -441,15 +443,17 @@ static void prefs_toolbar_register(GtkButton *button, ToolbarPage *prefs_toolbar
 			text = gtk_editable_get_chars
 				(GTK_EDITABLE(prefs_toolbar->entry_icon_text), 0, -1);
 
-		gtk_list_store_append(store_set, &iter);
-		gtk_list_store_set(store_set, &iter,
-				   SET_ICON, pixbuf,
-				   SET_FILENAME, fname,
-				   SET_TEXT, text,
-				   SET_EVENT, event,
-				   SET_ICON_TEXT, NULL,
-				   SET_ICON_IS_TEXT, FALSE,
-				   -1);
+		if (text != NULL) {
+			gtk_list_store_append(store_set, &iter);
+			gtk_list_store_set(store_set, &iter,
+					   SET_ICON, pixbuf,
+					   SET_FILENAME, fname,
+					   SET_TEXT, text,
+					   SET_EVENT, event,
+					   SET_ICON_TEXT, NULL,
+					   SET_ICON_IS_TEXT, FALSE,
+					   -1);
+		}
 		g_free(text);
 		g_free(event);
 	}
@@ -534,15 +538,16 @@ static void prefs_toolbar_substitute(GtkButton *button, ToolbarPage *prefs_toolb
 		}
 
 		/* change the row */
-		gtk_list_store_set(store_set, &iter_set,
-				   SET_ICON, pixbuf,
-				   SET_FILENAME, icon_fname,
-				   SET_TEXT, text,
-				   SET_EVENT, icon_event,
-				   SET_ICON_TEXT, NULL,
-				   SET_ICON_IS_TEXT, FALSE,
-				   -1);
-	
+		if (text != NULL) {
+			gtk_list_store_set(store_set, &iter_set,
+					   SET_ICON, pixbuf,
+					   SET_FILENAME, icon_fname,
+					   SET_TEXT, text,
+					   SET_EVENT, icon_event,
+					   SET_ICON_TEXT, NULL,
+					   SET_ICON_IS_TEXT, FALSE,
+					   -1);
+		}	
 		g_free(icon_event);
 		g_free(set_event);
 		g_free(text);