[goffice] make file type work again when saving graph as image

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

commit daee79c09b24061c6d6f737cea1f4c0d3403ceeb
Author: Jean Brefort <jean brefort normalesup org>
Date:   Tue Sep 8 21:35:34 2009 +0200

    make file type work again when saving graph as image

 ChangeLog                                 |    6 ++++++
 goffice/gtk/go-image-save-dialog-extra.ui |    8 ++++++++
 goffice/gtk/goffice-gtk.c                 |    2 +-
 3 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a0d5808..ffbef67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-08  Jean Brefort  <jean brefort normalesup org>
+
+	* goffice/gtk/go-image-save-dialog-extra.ui: fixed a combo box
+	 initialization.
+	* goffice/gtk/goffice-gtk.c (go_gui_get_image_save_info): ditto.
+
 2009-09-05  Morten Welinder <terra gnome org>
 
 	* configure.in: Post-release bump.
diff --git a/goffice/gtk/go-image-save-dialog-extra.ui b/goffice/gtk/go-image-save-dialog-extra.ui
index a94d2ea..0083977 100644
--- a/goffice/gtk/go-image-save-dialog-extra.ui
+++ b/goffice/gtk/go-image-save-dialog-extra.ui
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <interface>
+  <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="value">150</property>
@@ -30,6 +31,7 @@
         <child>
           <object class="GtkComboBox" id="format_combo">
             <property name="visible">True</property>
+            <property name="model">liststore1</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -115,4 +117,10 @@
       </packing>
     </child>
   </object>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
 </interface>
diff --git a/goffice/gtk/goffice-gtk.c b/goffice/gtk/goffice-gtk.c
index 26dc3d6..423ffed 100644
--- a/goffice/gtk/goffice-gtk.c
+++ b/goffice/gtk/goffice-gtk.c
@@ -723,7 +723,7 @@ go_gui_get_image_save_info (GtkWindow *toplevel, GSList *supported_formats,
 		if (supported_formats != NULL && ret_format != NULL) {
 			int i;
 			GSList *l;
-			format_combo = GTK_COMBO_BOX (gtk_builder_get_object (gui, "format_combo"));
+			format_combo = go_gtk_builder_combo_box_init_text (gui, "format_combo");
 			for (l = supported_formats, i = 0; l != NULL; l = l->next, i++) {
 				format = GPOINTER_TO_UINT (l->data);
 				format_info = go_image_get_format_info (format);