Mercurial > hg > forks > geeqie
changeset 2712:d7f6f1ce57eb
Merge remote-tracking branches 'github/merge-requests/581', 'github/merge-requests/576', 'github/merge-requests/574' and 'github/merge-requests/573'
* github/merge-requests/581:
Fix crash after strange behaviour of the "Really Continue" dialog
* github/merge-requests/576:
Trap build errors
* github/merge-requests/574:
Fix spelling mistake occured/occurred
* github/merge-requests/573:
Partially fix #561: Hi-DPI-aware rendering of images.
| author | Klaus Ethgen <Klaus@Ethgen.de> |
|---|---|
| date | Mon, 22 Jan 2018 21:07:11 +0100 |
| parents | 6aef3ede2ec5 (diff) 70457fceb02c (current diff) |
| children | cac6dcf7e2e7 |
| files | src/print.c src/remote.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/print.c Mon Jan 22 21:07:11 2018 +0100 +++ b/src/print.c Mon Jan 22 21:07:11 2018 +0100 @@ -1975,7 +1975,7 @@ parent, TRUE, NULL, NULL); generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, NULL, TRUE); - buf = g_strdup_printf(_("An error occurred printing to %s."), print_output_name(pw->output)); + buf = g_strdup_printf(_("An error occured printing to %s."), print_output_name(pw->output)); generic_dialog_add_message(gd, GTK_STOCK_DIALOG_ERROR, _("Printing error"), buf, TRUE); g_free(buf);
--- a/src/remote.c Mon Jan 22 21:07:11 2018 +0100 +++ b/src/remote.c Mon Jan 22 21:07:11 2018 +0100 @@ -279,11 +279,11 @@ return rc; } -static sig_atomic_t sigpipe_occurred = FALSE; +static sig_atomic_t sigpipe_occured = FALSE; static void sighandler_sigpipe(gint sig) { - sigpipe_occurred = TRUE; + sigpipe_occured = TRUE; } static gboolean remote_client_send(RemoteConnection *rc, const gchar *text) @@ -296,7 +296,7 @@ if (!rc || rc->server) return FALSE; if (!text) return TRUE; - sigpipe_occurred = FALSE; + sigpipe_occured = FALSE; new_action.sa_handler = sighandler_sigpipe; sigemptyset(&new_action.sa_mask);