[glom] Fix a typo to fix the build on maemo.
- From: Murray Cumming <murrayc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glom] Fix a typo to fix the build on maemo.
- Date: Fri, 18 Sep 2009 14:20:36 +0000 (UTC)
commit 1b5464451355013c047028e70c06096461169e8f
Author: Murray Cumming <murrayc murrayc com>
Date: Fri Sep 18 16:20:28 2009 +0200
Fix a typo to fix the build on maemo.
ChangeLog | 6 ++++++
configure.ac | 3 +++
glom/dialog_import_csv.cc | 2 +-
3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9d15e07..7ae6cfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-18 Murray Cumming <murrayc murrayc com>
+
+ * configure.ac: Add a full configure example for maemo in a comment,
+ to help my memory.
+ * glom/dialog_import_csv.cc: Fix a typo to fix the build on maemo.
+
2009-09-18 Murray Cumming <murrayc murrayc-desktop>
CsvParser: Made some API private.
diff --git a/configure.ac b/configure.ac
index 50762bf..58e3b33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,9 @@ AS_IF([test "x$glom_host_win32" = xyes],
AM_CONDITIONAL([HOST_WIN32], [test "x$glom_host_win32" = xyes])
+# In most cases, you'll want all these options for the maemo build:
+# ./configure --prefix=/usr --enable-postgesql --enable-sqlite --enable-maemo;make all install
+# And you might need to do export CXXFLAGS="-fno-execptions"
AC_ARG_ENABLE([maemo],
[AS_HELP_STRING([--enable-maemo],
[build with support for the Maemo platform
diff --git a/glom/dialog_import_csv.cc b/glom/dialog_import_csv.cc
index fae6d04..00a552f 100644
--- a/glom/dialog_import_csv.cc
+++ b/glom/dialog_import_csv.cc
@@ -439,7 +439,7 @@ void Dialog_Import_CSV::on_stream_read(const Glib::RefPtr<Gio::AsyncResult>& res
// If the parser does not exist yet, then create a new parser, except when the
// current encoding does not work for the file ,in which case the user must first
// choose another encoding.
- else if(!m_parser.get() && get_parser_state() != CsvParser::ENCODING_ERROR)
+ else if(!m_parser.get() && get_parser_state() != CsvParser::STATE_ENCODING_ERROR)
{
begin_parse();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]