[glom: 11/11] Merged
- From: Murray Cumming <murrayc src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [glom: 11/11] Merged
- Date: Mon, 28 Sep 2009 09:22:04 +0000 (UTC)
commit 7f2d9d64fffbb3cfef4461aa2779e75f0e589d31
Merge: 812f4bd... a4f4e75...
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Sep 28 11:21:53 2009 +0200
Merged
ChangeLog | 27 +++++++++++
glom/dialog_existing_or_new.cc | 96 ++++++++++++++++++++++++++-------------
glom/dialog_existing_or_new.h | 57 +++++++++++++----------
glom/dialog_invalid_data.h | 4 +-
glom/main.cc | 1 +
glom/utils_ui.cc | 16 ++++---
glom/utils_ui.h | 3 +
7 files changed, 139 insertions(+), 65 deletions(-)
---
diff --cc ChangeLog
index 7d4d0b8,3b74084..6f14589
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,84 -1,30 +1,111 @@@
+ 2009-09-28 Murray Cumming <murrayc murrayc com>
+
+ client-only mode: Ifdef out unused code.
+
+ * glom/dialog_existing_or_new.[h|cc]: Ifdef out unused code for the new
+ document notebook tab in client-only mode.
+
+ 2009-09-28 Murray Cumming <murrayc murrayc com>
+
+ Maemo: Removed icons from dialogs.
+
+ * glom/glom.glade: Comment out icons in our maemo5 branch.
+
+ 2009-09-28 Murray Cumming <murrayc murrayc com>
+
+ Client-only mode: Change the initial dialog label.
+
+ * glom/dialog_existing_or_new.cc: Constructor: Change the label text if in
+ client-only mode, to avoid mentioning creation of documents.
+
+ 2009-09-25 Murray Cumming <murrayc murrayc com>
+
+ Fix the build with gtkmm < 2.18.
+
+ * glom/utility_widgets/flowtable.cc: Correct the use of
+ GTKMM_MINOR_VERSION to fix the build with older gtkmm versions.
+
+2009-09-25 Michael Hasselmann <michaelh openismus com>
+
+ Import: More code cleanup in tests
+
+ * glom/import_csv/csv_parser.cc (set_file_and_start_parsing): Fail on empty
+ file uri.
+
+ * tests/import/*: Removed the ugly mainloop singleton, among other cleanups.
+
+2009-09-25 Murray Cumming <murrayc murrayc-desktop>
+
+ Cleanup.
+
+ * glom/glom.glade: Really revert a bad merge from the maemo5 branch.
+ * glom/libglom/connectionpool_backends/postgres_self.cc: Do not have
+ actual newlines in string literals.
+
+2009-09-25 Murray Cumming <murrayc murrayc com>
+
+ Fix the build with gtkmm < 2.18.
+
+ * glom/utility_widgets/flowtable.cc: Correct the use of
+ GTKMM_MINOR_VERSION to fix the build with older gtkmm versions.
+
+2009-09-25 Murray Cumming <murrayc murrayc-desktop>
+
+ Import tests: Fixed.
+
+ * tests/import/utils.[h|cc]: run_parser_from_buffer(): Added a
+ version that takes a std::string, to make the common case more robust.
+ * tests/import/test_parsing.cc:
+ * tests/import/test_signals.cc: Fix the tests by not incorrectly
+ taking the length of the raw arrays, which caused the temp files to
+ contain garbage.
+
+2009-09-25 Murray Cumming <murrayc murrayc-desktop>
+
+ Import tests: Handle encoding errors.
+
+ * tests/import/utils.cc: Handle signal_encoding_error too, because this
+ is one way that the parser can stop.
+ Increase the timeout because an infinite loop is unlikely (and not
+ currently happening).
+
+2009-09-25 Murray Cumming <murrayc murrayc com>
+
+ tests/import/: Small cleanup.
+
+ * tests/import/test_parsing.cc:
+ * tests/import/utils.[h|cc]: Use a sigc::slot instead of the ugly
+ (because not typedefed) function pointer type.
+
+2009-09-25 Murray Cumming <murrayc murrayc com>
+
+ Removed some debug output.
+
+ * glom/libglom/data_structure/glomconversions.cc: parse_time():
+ * tests/test_parsing_time.cc: Removed debug output.
+
+2009-09-25 Michael Hasselmann <michaelh openismus com>
+
+ Import: Changed the signature of line_scanned handler
+
+ * glom/import_csv/dialog_import_csv.[h|cc]: Changed the signare of
+ on_parser_line_scanned, to use CsvParser::type_row_strings. It does not
+ change anything, as the handler didn't even use the parameters.
+
+ Import: Fixed tests to fit new parser API
+
+ * glom/import_csv/csv_parser.[h|cc]: Added a finished_parsing signal since the
+ max_row count logic is flawed
+ (https://bugzilla.gnome.org/show_bug.cgi?id=588233#c16). Also moved common
+ parts of on_stream_read(.) (now on_buffer_read(.)) into
+ copy_buffer_and_continue_reading(.), to avoid copy'n'paste bugs.
+
+ * tests/import/utils.[h|cc]: Added mainloop functionality to trigger the idle
+ parse sequence of the CsvParser for the testcases.
+
+ * tests/import/test_[parsing,signals].cc: Fixed the tests to fit new parser
+ API.
+
1.12.0:
2009-09-25 Murray Cumming <murrayc murrayc com>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]