[balsa] Do not crash when default is "text beside items"

[Peter Bloomfield <PeterB src gnome org>]

commit 786f1ff21268ba12645634112fbc2e5423edd821
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Sep 30 09:10:30 2009 -0400

    Do not crash when default is "text beside items"

 ChangeLog             |    6 ++++++
 src/toolbar-factory.c |    4 ++++
 2 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c42df23..5e7aab2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-30  Peter Bloomfield
+
+	* src/toolbar-factory.c (tm_do_popup_menu): do not crash when
+	default is "text beside items"; fixes
+	http://mail.gnome.org/archives/balsa-list/2009-September/msg00045.html
+
 2009-09-28  Laurent Coudeur <laurentc iol ie>
 
 	* src/spell-check.c (balsa_spell_check_init,
diff --git a/src/toolbar-factory.c b/src/toolbar-factory.c
index 9dd3c6f..4f0acb8 100644
--- a/src/toolbar-factory.c
+++ b/src/toolbar-factory.c
@@ -720,6 +720,10 @@ tm_do_popup_menu(GtkWidget * toolbar, GdkEventButton * event,
     }
 
     for (i = 0; i < G_N_ELEMENTS(tm_toolbar_options); i++) {
+
+        if (!tm_toolbar_options[i].text)
+            continue;
+
         if (tm_toolbar_options[i].style == default_style) {
             gchar *option_text, *text;
             GtkWidget *item;