[glom/glom-1-14] 1.14.7

[Murray Cumming <murrayc src gnome org>]

commit 2446c38019d161821458789525925a10c7789087
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Nov 30 10:33:44 2010 +0100

    1.14.7

 ChangeLog             |    2 ++
 NEWS                  |    8 ++++++++
 configure.ac          |    2 +-
 glom/libglom/utils.cc |    2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 95c71ec..9f27a95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+1.14.7:
+
 2010-11-12  Murray Cumming  <murrayc murrayc com>
 
 	CSV Import: Actually preview and import the field values.
diff --git a/NEWS b/NEWS
index 98ba7d1..2ba3e1d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+1.14.7 (stable):
+
+* CSV Import: Actually preview and import the field values.
+  Murray Cumming) Bug #625693 (maximiliano).
+* Build:
+  - Remove the gconfmm dependency, because we don't use it.
+    (Murray Cumming)
+	
 1.14.6 (stable):
 
 * Import dialog, Text formatting:
diff --git a/configure.ac b/configure.ac
index a8680c0..6039854 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([Glom],[1.14.6],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
+AC_INIT([Glom],[1.14.7],[http://bugzilla.gnome.org/enter_bug.cgi?product=Glom],[glom])
 AC_PREREQ(2.63)
 
 AC_CONFIG_SRCDIR([glom/main.cc])
diff --git a/glom/libglom/utils.cc b/glom/libglom/utils.cc
index 4bc6020..503295e 100644
--- a/glom/libglom/utils.cc
+++ b/glom/libglom/utils.cc
@@ -566,7 +566,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)
     {