[glom] Build fixes after recent commits.

[Murray Cumming <murrayc src gnome org>]

commit 0a0035471b6f410b1decbd2251e7701e53ac0112
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Oct 14 11:32:22 2010 +0200

    Build fixes after recent commits.
    
    * glom/libglom/db_utils.cc:
    * glom/libglom/utils.cc:
    * glom/mode_data/datawidget/cellrenderer_dblist.cc: Adde back some
      includes of iostream and fix a size type.

 ChangeLog                                        |    9 +++++++++
 glom/libglom/db_utils.cc                         |    4 ++++
 glom/libglom/utils.cc                            |    2 +-
 glom/mode_data/datawidget/cellrenderer_dblist.cc |   21 +++++++++++----------
 4 files changed, 25 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 919a5d5..07befc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-14  Murray Cumming  <murrayc murrayc com>
+
+	Build fixes after recent commits.
+
+	* glom/libglom/db_utils.cc:
+	* glom/libglom/utils.cc:
+	* glom/mode_data/datawidget/cellrenderer_dblist.cc: Adde back some
+  includes of iostream and fix a size type.
+
 2010-10-11  David King  <davidk openismus com>
 
 	Change some uses of long to more appropriate types
diff --git a/glom/libglom/db_utils.cc b/glom/libglom/db_utils.cc
index 21ecb7c..7bc3ee1 100644
--- a/glom/libglom/db_utils.cc
+++ b/glom/libglom/db_utils.cc
@@ -25,9 +25,13 @@
 #include <libglom/privs.h>
 #include <libglom/data_structure/parameternamegenerator.h>
 #include <libglom/utils.h>
+#include <libgdamm/value.h>
 #include <libgda/libgda.h> // For gda_g_type_from_string
 #include <glibmm/i18n.h>
 
+
+#include <iostream>
+
 namespace Glom
 {
 
diff --git a/glom/libglom/utils.cc b/glom/libglom/utils.cc
index 7ab1109..fc0b4a6 100644
--- a/glom/libglom/utils.cc
+++ b/glom/libglom/utils.cc
@@ -670,7 +670,7 @@ Glib::ustring Utils::create_local_image_uri(const Gnome::Gda::Value& value)
 
   if(value.get_value_type() == GDA_TYPE_BINARY)
   {
-    std::streamsize size = 0;
+    long size = 0;
     gconstpointer pData = value.get_binary(size);
     if(size && pData)
     {
diff --git a/glom/mode_data/datawidget/cellrenderer_dblist.cc b/glom/mode_data/datawidget/cellrenderer_dblist.cc
index 69d65d8..a281b45 100644
--- a/glom/mode_data/datawidget/cellrenderer_dblist.cc
+++ b/glom/mode_data/datawidget/cellrenderer_dblist.cc
@@ -23,6 +23,7 @@
 #include <glom/mode_data/datawidget/treemodel_db_withextratext.h>
 #include <gtkmm.h>
 #include <libglom/data_structure/glomconversions.h>
+#include <iostream>
 
 
 namespace Glom
@@ -66,7 +67,7 @@ void CellRendererDbList::set_choices_related(const Document* document, const sha
   //Show model in the view:
   property_model() = model;
 
-  Glib::RefPtr<DbTreeModelWithExtraText> model_db = 
+  Glib::RefPtr<DbTreeModelWithExtraText> model_db =
     Glib::RefPtr<DbTreeModelWithExtraText>::cast_dynamic(model);
   if(model_db)
     property_text_column() = model_db->get_text_column();
@@ -75,7 +76,7 @@ void CellRendererDbList::set_choices_related(const Document* document, const sha
     std::cerr << G_STRFUNC << ": The model is not a DbTreeModelWithExtraText." << std::endl;
     return;
   }
-  
+
   property_editable() = true; //It would be useless if we couldn't edit it.
 
   //The other cells are added in on_editing_started(),
@@ -97,7 +98,7 @@ void CellRendererDbList::repack_cells_fixed(Gtk::CellLayout* combobox)
   {
     std::cerr << G_STRFUNC << ": widget is null." << std::endl;
   }
-  
+
   if(!m_repacked_first_cell)
   {
     //Get the default column, created by set_text_column():
@@ -155,10 +156,10 @@ void CellRendererDbList::repack_cells_related(Gtk::CellLayout* combobox)
   {
     std::cerr << G_STRFUNC << ": widget is null." << std::endl;
   }
-  
+
   const std::list<Gtk::CellRenderer*> cells = combobox->get_cells();
   const guint initial_cells_count = cells.size();
-  
+
   guint i = 0;
   for(type_vec_const_layout_items::const_iterator iter = m_db_layout_items.begin(); iter != m_db_layout_items.end(); ++iter)
   {
@@ -180,7 +181,7 @@ void CellRendererDbList::repack_cells_related(Gtk::CellLayout* combobox)
         combobox->pack_start(*cell, false);
         cell->unreference();
         cell_connect_cell_data_func(combobox, cell, i);
-        
+
          m_repacked_first_cell = true;
       }
     }
@@ -189,10 +190,10 @@ void CellRendererDbList::repack_cells_related(Gtk::CellLayout* combobox)
       //Create the cell:
       cell = create_cell(layout_item, m_table_name, m_document, get_fixed_cell_height(*widget));
       combobox->pack_start(*cell, true);
-      
+
       cell_connect_cell_data_func(combobox, cell, i);
     }
-    
+
     ++i;
   }
 }
@@ -207,12 +208,12 @@ void CellRendererDbList::on_editing_started(Gtk::CellEditable* cell_editable, co
 
   //The DB model has a special virtual text column,
   //and the simple model just has text in all columns:
-  Glib::RefPtr<DbTreeModelWithExtraText> model_db = 
+  Glib::RefPtr<DbTreeModelWithExtraText> model_db =
     Glib::RefPtr<DbTreeModelWithExtraText>::cast_dynamic(get_choices_model());
   if(model_db)
     repack_cells_related(combobox);
   else
-    repack_cells_fixed(combobox); 
+    repack_cells_fixed(combobox);
 
   Gtk::CellRenderer::on_editing_started(cell_editable, path);
 }