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

Merge branch 'Bug796792' of https://github.com/Bob-IT/gnucash into maint

Browse Source
This commit is contained in:
Geert Janssens 2018-08-08 14:22:49 +02:00
commit e330a781f0
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnucash/gnome-utils/dialog-file-access.c
View File

@ -146,15 +146,15 @@ gnc_ui_file_access_response_cb(GtkDialog *dialog, gint response, GtkDialog *unus
gboolean open_readonly = faw->readonly_checkbutton gboolean open_readonly = faw->readonly_checkbutton
? gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(faw->readonly_checkbutton)) ? gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(faw->readonly_checkbutton))
: FALSE; : FALSE;
gnc_file_open_file (gnc_ui_get_main_window (GTK_WIDGET (dialog)), url, open_readonly); gnc_file_open_file (GTK_WINDOW(dialog), url, open_readonly);
} }
else if ( faw->type == FILE_ACCESS_SAVE_AS ) else if ( faw->type == FILE_ACCESS_SAVE_AS )
{ {
gnc_file_do_save_as (gnc_ui_get_main_window (GTK_WIDGET (dialog)), url); gnc_file_do_save_as (GTK_WINDOW(dialog), url);
} }
else if ( faw->type == FILE_ACCESS_EXPORT ) else if ( faw->type == FILE_ACCESS_EXPORT )
{ {
gnc_file_do_export (gnc_ui_get_main_window (GTK_WIDGET (dialog)), url); gnc_file_do_export (GTK_WINDOW(dialog), url);
} }
break; break;

10
gnucash/gnome-utils/gnc-file.c
View File

@ -1019,7 +1019,7 @@ RESTART:
{ {
gchar *message = gnc_account_name_violations_errmsg ( gnc_get_account_separator_string(), gchar *message = gnc_account_name_violations_errmsg ( gnc_get_account_separator_string(),
invalid_account_names ); invalid_account_names );
gnc_warning_dialog(NULL, "%s", message); gnc_warning_dialog(parent, "%s", message);
g_free ( message ); g_free ( message );
} }
return TRUE; return TRUE;
@ -1234,7 +1234,7 @@ gnc_file_do_export(GtkWindow *parent, const char * filename)
else else
name = gnc_uri_normalize_uri ( newfile, FALSE ); name = gnc_uri_normalize_uri ( newfile, FALSE );
/* if user says cancel, we should break out */ /* if user says cancel, we should break out */
if (!gnc_verify_dialog (NULL, FALSE, format, name)) if (!gnc_verify_dialog (parent, FALSE, format, name))
{ {
return; return;
} }
@ -1269,7 +1269,7 @@ gnc_file_do_export(GtkWindow *parent, const char * filename)
/* %s is the strerror(3) error string of the error that occurred. */ /* %s is the strerror(3) error string of the error that occurred. */
const char *format = _("There was an error saving the file.\n\n%s"); const char *format = _("There was an error saving the file.\n\n%s");
gnc_error_dialog (NULL, format, strerror(errno)); gnc_error_dialog (parent, format, strerror(errno));
return; return;
} }
} }
@ -1471,7 +1471,7 @@ gnc_file_do_save_as (GtkWindow *parent, const char* filename)
name = gnc_uri_normalize_uri ( newfile, FALSE ); name = gnc_uri_normalize_uri ( newfile, FALSE );
/* if user says cancel, we should break out */ /* if user says cancel, we should break out */
if (!gnc_verify_dialog (NULL, FALSE, format, name )) if (!gnc_verify_dialog (parent, FALSE, format, name ))
{ {
xaccLogDisable(); xaccLogDisable();
qof_session_destroy (new_session); qof_session_destroy (new_session);
@ -1600,7 +1600,7 @@ gnc_file_revert (GtkWindow *parent)
else else
filename = fileurl; filename = fileurl;
if (!gnc_verify_dialog (NULL, FALSE, title, filename)) if (!gnc_verify_dialog (parent, FALSE, title, filename))
return; return;
qof_book_mark_session_saved (qof_session_get_book (session)); qof_book_mark_session_saved (qof_session_get_book (session));