|
 |
2a4ee2 |
From ac68d29966f78ac8799f31f13578e4843a49043f Mon Sep 17 00:00:00 2001
|
|
|
2a4ee2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
2a4ee2 |
Date: Tue, 14 Apr 2020 13:46:44 +0100
|
|
|
2a4ee2 |
Subject: [PATCH] "General Internet Error" dialog appearing on gio mount
|
|
|
2a4ee2 |
|
|
|
2a4ee2 |
we get a GError of G_IO_ERROR_FAILED_HANDLED which is documented
|
|
|
2a4ee2 |
as "Operation failed and a helper program has already interacted with the user.
|
|
|
2a4ee2 |
Do not display any error dialog." PENDING seems to describe this state
|
|
|
2a4ee2 |
better than a generic error case and results in no error dialog.
|
|
|
2a4ee2 |
|
|
|
2a4ee2 |
Change-Id: Iee382e49edaa0a734526659971e0339991e2c03e
|
|
|
2a4ee2 |
---
|
|
|
2a4ee2 |
ucb/source/ucp/gio/gio_content.cxx | 4 +++-
|
|
|
2a4ee2 |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
2a4ee2 |
|
|
|
2a4ee2 |
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
|
|
|
2a4ee2 |
index 77a5c0127ae7..8576713974a8 100644
|
|
|
2a4ee2 |
--- a/ucb/source/ucp/gio/gio_content.cxx
|
|
|
2a4ee2 |
+++ b/ucb/source/ucp/gio/gio_content.cxx
|
|
|
2a4ee2 |
@@ -196,6 +196,9 @@ css::uno::Any convertToException(GError *pError, const css::uno::Reference< css:
|
|
|
2a4ee2 |
css::task::InteractionClassification_ERROR, css::ucb::IOErrorCode_NAME_TOO_LONG, aArgs);
|
|
|
2a4ee2 |
EXCEPT(aExcept); }
|
|
|
2a4ee2 |
break;
|
|
|
2a4ee2 |
+ case G_IO_ERROR_FAILED_HANDLED: /* Operation failed and a helper program
|
|
|
2a4ee2 |
+ has already interacted with the user. Do not display any error
|
|
|
2a4ee2 |
+ dialog */
|
|
|
2a4ee2 |
case G_IO_ERROR_PENDING:
|
|
|
2a4ee2 |
{ css::ucb::InteractiveAugmentedIOException aExcept(sMessage, rContext,
|
|
|
2a4ee2 |
css::task::InteractionClassification_ERROR, css::ucb::IOErrorCode_PENDING, aArgs);
|
|
|
2a4ee2 |
@@ -257,7 +260,6 @@ css::uno::Any convertToException(GError *pError, const css::uno::Reference< css:
|
|
|
2a4ee2 |
case G_IO_ERROR_NOT_EMPTY:
|
|
|
2a4ee2 |
case G_IO_ERROR_NOT_SYMBOLIC_LINK:
|
|
|
2a4ee2 |
case G_IO_ERROR_NOT_MOUNTABLE_FILE:
|
|
|
2a4ee2 |
- case G_IO_ERROR_FAILED_HANDLED:
|
|
|
2a4ee2 |
{ css::ucb::InteractiveNetworkGeneralException aExcept(sMessage, rContext,
|
|
|
2a4ee2 |
css::task::InteractionClassification_ERROR);
|
|
|
2a4ee2 |
EXCEPT(aExcept);}
|
|
|
2a4ee2 |
--
|
|
|
2a4ee2 |
2.25.1
|
|
|
2a4ee2 |
|