[goffice] fix crash in go-format-sel.c

[Jean Bréfort <jbrefort src gnome org>]

commit fb52318123a1e030f6843c121b41a5c990901fa3
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Aug 26 15:36:44 2009 +0200

    fix crash in go-format-sel.c

 ChangeLog                   |    6 ++++++
 goffice/gtk/go-combo-box.c  |    2 +-
 goffice/gtk/go-format-sel.c |    3 +++
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4ab5ee8..6b75809 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-08-26  Jean Brefort  <jean brefort normalesup org>
 
+	* goffice/gtk/go-combo-box.c (go_combo_box_set_display): expand the
+	 display widget.
+	* goffice/gtk/go-format-sel.c (nfs_init): create missing combo box.
+
+2009-08-26  Jean Brefort  <jean brefort normalesup org>
+
 	* all files: migrated from Glade to GtkBuilder
 
 2009-08-25  Morten Welinder  <terra gnome org>
diff --git a/goffice/gtk/go-combo-box.c b/goffice/gtk/go-combo-box.c
index 6d6cd77..616073e 100644
--- a/goffice/gtk/go-combo-box.c
+++ b/goffice/gtk/go-combo-box.c
@@ -616,7 +616,7 @@ go_combo_box_set_display (GOComboBox *combo_box, GtkWidget *display_widget)
 
 	if (display_widget)
 		gtk_box_pack_start (GTK_BOX (combo_box), display_widget,
-				    FALSE, TRUE, 0);
+				    TRUE, TRUE, 0);
 }
 
 static gboolean
diff --git a/goffice/gtk/go-format-sel.c b/goffice/gtk/go-format-sel.c
index f1c53dc..af73754 100644
--- a/goffice/gtk/go-format-sel.c
+++ b/goffice/gtk/go-format-sel.c
@@ -1015,6 +1015,9 @@ nfs_init (GOFormatSel *gfs)
 		gfs->format.widget[i] = tmp;
 	}
 
+	gfs->format.widget[F_SYMBOL] = go_combo_text_new (NULL);
+	gtk_widget_hide (gfs->format.widget[F_SYMBOL]);
+
 	/* set minimum heights */
 	gtk_widget_set_size_request (gfs->format.widget[F_LIST], -1, 100);
 	gtk_widget_set_size_request (gfs->format.widget[F_NEGATIVE], -1, 100);