[glom] Fix regression: Actually show field choices again in combo boxes.

[Murray Cumming <murrayc src gnome org>]

commit 922e157e299733c6112fdecfb02443b92992f37a
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Oct 4 13:25:16 2009 +0200

    Fix regression: Actually show field choices again in combo boxes.
    
    * glom/libglom/utils.cc: get_choice_values(): Move the list_values.push_back()
    out of the ifdef block so we actually show field choices again in the combo
    boxes. This was broken by the commit from Johannes on 2009-07-30.
    Hopefully ldtp tests will avoid this in future.

 ChangeLog             |    9 +++++++++
 glom/libglom/utils.cc |    5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7f7680b..e0b280d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-04  Murray Cumming  <murrayc murrayc com>
+
+  Fix regression: Actually show field choices again in combo boxes.
+  
+	* glom/libglom/utils.cc: get_choice_values(): Move the list_values.push_back() 
+	out of the ifdef block so we actually show field choices again in the combo 
+	boxes. This was broken by the commit from Johannes on 2009-07-30.
+	Hopefully ldtp tests will avoid this in future.
+
 2009-10-02  Murray Cumming  <murrayc murrayc com>
 
 	Maemo: Avoid multi-column details layouts.
diff --git a/glom/libglom/utils.cc b/glom/libglom/utils.cc
index fcb5b8d..3713007 100644
--- a/glom/libglom/utils.cc
+++ b/glom/libglom/utils.cc
@@ -472,8 +472,9 @@ Utils::type_list_values_with_second Utils::get_choice_values(const sharedptr<con
 
       if(with_second)
         itempair.second = datamodel->get_value_at(1, row, error);
-      list_values.push_back(itempair);
-#endif      
+#endif
+
+      list_values.push_back(itempair);      
     }
   }
   else