diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-04-14 13:46:44 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-04-14 17:50:59 +0200 |
| commit | 9833b30ee32d6395123919a3b2f9771fadcb67e0 (patch) | |
| tree | 10446e9c908c0564dd365339d0859c50683e1931 /ucb | |
| parent | 35a304c4918544d8978e4096f02b62063f1a0e4a (diff) | |
"General Internet Error" dialog appearing on gio mount
we get a GError of G_IO_ERROR_FAILED_HANDLED which is documented
as "Operation failed and a helper program has already interacted with the user.
Do not display any error dialog." PENDING seems to describe this state
better than a generic error case and results in no error dialog.
Change-Id: Iee382e49edaa0a734526659971e0339991e2c03e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92187
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/gio/gio_content.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 77a5c0127ae7..8576713974a8 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -196,6 +196,9 @@ css::uno::Any convertToException(GError *pError, const css::uno::Reference< css: css::task::InteractionClassification_ERROR, css::ucb::IOErrorCode_NAME_TOO_LONG, aArgs); EXCEPT(aExcept); } break; + case G_IO_ERROR_FAILED_HANDLED: /* Operation failed and a helper program + has already interacted with the user. Do not display any error + dialog */ case G_IO_ERROR_PENDING: { css::ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext, css::task::InteractionClassification_ERROR, css::ucb::IOErrorCode_PENDING, aArgs); @@ -257,7 +260,6 @@ css::uno::Any convertToException(GError *pError, const css::uno::Reference< css: case G_IO_ERROR_NOT_EMPTY: case G_IO_ERROR_NOT_SYMBOLIC_LINK: case G_IO_ERROR_NOT_MOUNTABLE_FILE: - case G_IO_ERROR_FAILED_HANDLED: { css::ucb::InteractiveNetworkGeneralException aExcept(sMessage, rContext, css::task::InteractionClassification_ERROR); EXCEPT(aExcept);} |