[gnumeric] ssconvert: improve error handling.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] ssconvert: improve error handling.
- Date: Sun, 10 Mar 2013 16:51:01 +0000 (UTC)
commit 7e29af41e64eb8223d767c84c8284e4c8b78b492
Author: Morten Welinder <terra gnome org>
Date: Sun Mar 10 12:50:17 2013 -0400
ssconvert: improve error handling.
ChangeLog | 4 ++++
NEWS | 1 +
src/ssconvert.c | 8 ++++++--
3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index f33b2e8..5cecece 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-10 Morten Welinder <terra gnome org>
+
+ * src/ssconvert.c (convert): Fix error handling. Part of #695529.
+
2013-03-09 Morten Welinder <terra gnome org>
* configure.ac: Post-release bump.
diff --git a/NEWS b/NEWS
index 2b12d3b..1a06994 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,7 @@ Morten:
* Rewrite the file history dialog. [#694777]
* Fix R.QF and R.QBINOM documentation.
* Fix sheet-removed crashes for a few dialogs. [#364291]
+ * Improve ssconvert error handling. [#695529]
--------------------------------------------------------------------------
Gnumeric 1.12.0
diff --git a/src/ssconvert.c b/src/ssconvert.c
index d5064ae..fe2b1c1 100644
--- a/src/ssconvert.c
+++ b/src/ssconvert.c
@@ -217,7 +217,7 @@ handle_export_options (GOFileSaver *fs, GODoc *doc)
return 0;
} else {
- g_printerr (_("The file saver does not take options"));
+ g_printerr (_("The file saver does not take options\n"));
return 1;
}
}
@@ -686,10 +686,14 @@ convert (char const *inarg, char const *outarg, char const *mergeargs[],
wbv = workbook_view_new (NULL);
}
- if (wbv == NULL || go_io_error_occurred (io_context)) {
+ if (go_io_error_occurred (io_context)) {
go_io_error_display (io_context);
res = 1;
goto out;
+ } else if (wbv == NULL) {
+ g_printerr (_("Loading %s failed\n"), infile);
+ res = 1;
+ goto out;
}
wb = wb_view_get_workbook (wbv);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]