IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve error reporting of QSF import a little bit. Patch provided by Georgi Mirchev, bug#343724.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15084 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2006-11-04 21:57:16 +00:00
parent a746a064aa
commit caedec4d73
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gnome/druid-merge.c
View File

@ -220,7 +220,7 @@ on_merge_finish (GnomeDruidPage *gnomedruidpage,
gnc_suspend_gui_refresh (); gnc_suspend_gui_refresh ();
result = qof_book_merge_commit(mergeData); result = qof_book_merge_commit(mergeData);
if(result != 0) { if(result != 0) {
message = _("Error: the Commit operation failed."); message = g_strdup_printf(_("Error: the Commit operation failed, error code %d."), result);
top = gtk_widget_get_toplevel (GTK_WIDGET (gnomedruidpage)); top = gtk_widget_get_toplevel (GTK_WIDGET (gnomedruidpage));
gnc_error_dialog(top, message); gnc_error_dialog(top, message);
} }

17
src/gnome/gnc-plugin-basic-commands.c
View File

@ -364,8 +364,9 @@ static void
qsf_file_select_ok(GtkWidget *w, GtkFileSelection *fs ) qsf_file_select_ok(GtkWidget *w, GtkFileSelection *fs )
{ {
QofSession *qsf_session, *first_session; QofSession *qsf_session, *first_session;
const gchar *filename; const gchar *filename, *message, *error_message;
QofBook *original; QofBook *original;
QofBackendError err;
ENTER (" "); ENTER (" ");
qof_event_suspend(); qof_event_suspend();
@ -376,6 +377,20 @@ qsf_file_select_ok(GtkWidget *w, GtkFileSelection *fs )
qsf_session = qof_session_new(); qsf_session = qof_session_new();
qof_session_begin(qsf_session, filename, TRUE, FALSE); qof_session_begin(qsf_session, filename, TRUE, FALSE);
qof_session_load(qsf_session, NULL); qof_session_load(qsf_session, NULL);
err = qof_session_get_error(qsf_session);
if (err != ERR_BACKEND_NO_ERR) {
error_message = qof_session_get_error_message(qsf_session);
if (!error_message)
error_message = "";
message = g_strdup_printf(_("Error: Loading failed, error code %d - %s."), err, error_message);
PERR("%s", message);
qof_session_destroy(qsf_session);
qof_event_resume();
gnc_error_dialog(gnc_ui_get_toplevel(), message);
LEAVE (" ");
return;
}
qof_event_resume(); qof_event_resume();
gnc_ui_qsf_import_merge_druid(first_session, qsf_session); gnc_ui_qsf_import_merge_druid(first_session, qsf_session);
LEAVE (" "); LEAVE (" ");