Use combobox to select map type

[andy/viking.git] / src / uibuilder.c

diff --git a/src/uibuilder.c b/src/uibuilder.c
index afc675870875b0fa9a5406eda8fcbf8441592948..81c689882f8420cf475cf4fbfa8361f943ffe6d3 100644 (file)
--- a/src/uibuilder.c
+++ b/src/uibuilder.c
@@ -65,12 +65,13 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data
               break;
             }
         }
-        gtk_combo_box_set_active ( GTK_COMBO_BOX ( rv ), data.u );
+        else
+          gtk_combo_box_set_active ( GTK_COMBO_BOX ( rv ), data.u );
       }
       else if ( param->type == VIK_LAYER_PARAM_STRING && param->widget_data )
       {
         gchar **pstr = param->widget_data;
-        rv = GTK_COMBO_BOX ( gtk_combo_box_entry_new_text () );
+        rv = GTK_WIDGET ( gtk_combo_box_entry_new_text () );
         if ( data.s )
           gtk_combo_box_append_text ( GTK_COMBO_BOX ( rv ), data.s );
         while ( *pstr )
@@ -88,7 +89,7 @@ GtkWidget *a_uibuilder_new_widget ( VikLayerParam *param, VikLayerParamData data
         if ( param->extra_widget_data ) /* map of alternate uint values for options */
         {
           int i;
-         int nb_elem = g_list_length(param->widget_data);
+          int nb_elem = g_list_length(param->widget_data);
           for ( i = 0; i < nb_elem; i++ )
             if ( GPOINTER_TO_UINT ( g_list_nth_data(param->extra_widget_data, i) ) == data.u )
             {