[Goodies-commits] r7126 - gigolo/trunk/src

[Enrico Troeger]

Author: enrico
Date: 2009-04-06 14:16:22 +0000 (Mon, 06 Apr 2009)
New Revision: 7126

Modified:
   gigolo/trunk/src/backendgvfs.c
Log:
Don't show error dialogs when the error was already handled.

Modified: gigolo/trunk/src/backendgvfs.c
===================================================================
--- gigolo/trunk/src/backendgvfs.c	2009-04-06 14:06:46 UTC (rev 7125)
+++ gigolo/trunk/src/backendgvfs.c	2009-04-06 14:16:22 UTC (rev 7126)
@@ -368,13 +368,14 @@
 		}
 
 		g_warning("Mounting of \"%s\" failed: %s", name, error->message);
-		msg = g_strdup_printf(_("Connecting to \"%s\" failed."), name);
-
-		g_signal_emit(backend, signals[OPERATION_FAILED], 0, msg, error->message);
-
+		if (! g_error_matches(error, G_IO_ERROR, G_IO_ERROR_FAILED_HANDLED))
+		{
+			msg = g_strdup_printf(_("Connecting to \"%s\" failed."), name);
+			g_signal_emit(backend, signals[OPERATION_FAILED], 0, msg, error->message);
+			g_free(msg);
+		}
 		g_error_free(error);
 		g_free(name);
-		g_free(msg);
 	}
 	else
 		verbose("Mount finished sucessfully");
@@ -446,7 +447,7 @@
 	if (error != NULL && ! g_error_matches(error, G_IO_ERROR, G_IO_ERROR_ALREADY_MOUNTED))
 	{
 		gchar *msg = g_strdup_printf(_("Connecting to \"%s\" failed."), uri);
-		if (mi->show_errors)
+		if (mi->show_errors && ! g_error_matches(error, G_IO_ERROR, G_IO_ERROR_FAILED_HANDLED))
 			g_signal_emit(mi->self, signals[OPERATION_FAILED], 0, msg, error->message);
 		else
 			verbose("%s (%s)", msg, error->message);