[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - ucb/source

[Caolán McNamara (via logerrit)]

 ucb/source/ucp/gio/gio_content.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 47a54c397cc70247b562aa360e42afe611c77fb5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Apr 14 13:46:44 2020 +0100
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Wed Apr 15 11:20:19 2020 +0200

    "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/+/92171
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 05c26c42760f..640f3750aa99 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);}