gnumeric r16582 - in branches/gnumeric-1-8: . src
- From: mortenw svn gnome org
- To: svn-commits-list gnome org
- Subject: gnumeric r16582 - in branches/gnumeric-1-8: . src
- Date: Tue, 20 May 2008 00:24:59 +0000 (UTC)
Author: mortenw
Date: Tue May 20 00:24:59 2008
New Revision: 16582
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16582&view=rev
Log:
2008-05-19 Morten Welinder <terra gnome org>
* src/stf.c (stf_read_workbook_auto_csvtab): Don't assume that the
command context is a gui. Fixes #533511.
Modified:
branches/gnumeric-1-8/ChangeLog
branches/gnumeric-1-8/NEWS
branches/gnumeric-1-8/src/stf.c
Modified: branches/gnumeric-1-8/NEWS
==============================================================================
--- branches/gnumeric-1-8/NEWS (original)
+++ branches/gnumeric-1-8/NEWS Tue May 20 00:24:59 2008
@@ -32,6 +32,7 @@
* Fix AREAS crash. [#533370]
* Fix translation of function description. [#533193]
* Fix R.QPOIS (and related functions) hang. [#533515]
+ * Fix critical spew. [#533511]
--------------------------------------------------------------------------
Gnumeric 1.8.2
Modified: branches/gnumeric-1-8/src/stf.c
==============================================================================
--- branches/gnumeric-1-8/src/stf.c (original)
+++ branches/gnumeric-1-8/src/stf.c Tue May 20 00:24:59 2008
@@ -376,15 +376,27 @@
workbook_recalc_all (book);
sheet_queue_respan (sheet, 0, gnm_sheet_get_max_rows (sheet)-1);
if (po->cols_exceeded) {
-/* Using go_cmd_context_error_import will destroy the successfully imported portion */
-/* go_cmd_context_error_import (GO_CMD_CONTEXT (context), */
-/* _("Some columns of data were" */
-/* " dropped since they exceeded" */
-/* " the available sheet size.")); */
- go_gtk_notice_dialog (wbcg_toplevel (WBC_GTK (context->impl)),
- GTK_MESSAGE_WARNING,_("Some columns of data were"
- " dropped since they exceeded"
- " the available sheet size."));
+ const char *msg =
+ _("Some columns of data were"
+ " dropped since they exceeded"
+ " the available sheet size.");
+ /*
+ * Using go_cmd_context_error_import will destroy the
+ * successfully imported portion. We ought to have a
+ * way to issue a warning.
+ */
+ if (IS_WBC_GTK (context->impl))
+ go_gtk_notice_dialog
+ (wbcg_toplevel (WBC_GTK (context->impl)),
+ GTK_MESSAGE_WARNING,
+ msg);
+ else
+ g_warning (msg);
+#if 0
+ go_cmd_context_error_import
+ (GO_CMD_CONTEXT (context),
+ msg);
+#endif
}
} else {
workbook_sheet_delete (sheet);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]