gtk+ r20145 - in trunk: . gtk

[jap svn gnome org]

Author: jap
Date: Sun May 25 12:22:30 2008
New Revision: 20145
URL: http://svn.gnome.org/viewvc/gtk+?rev=20145&view=rev

Log:
2008-05-25  Jan Arne Petersen  <jpetersen jpetersen org>

	* gtk/gtkfilechooserdefault.c:
	(shortcuts_activate_volume_mount_cb): Ignore G_IO_ERROR_FAILED_HANDLED
	errors (#532262).



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkfilechooserdefault.c

Modified: trunk/gtk/gtkfilechooserdefault.c
==============================================================================
--- trunk/gtk/gtkfilechooserdefault.c	(original)
+++ trunk/gtk/gtkfilechooserdefault.c	Sun May 25 12:22:30 2008
@@ -10346,12 +10346,15 @@
 
   if (error)
     {
-      char *msg;
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED_HANDLED))
+        {
+          char *msg;
 
-      msg = g_strdup_printf (_("Could not mount %s"),
-			     gtk_file_system_volume_get_display_name (impl->file_system, volume));
-      error_message (impl, msg, error->message);
-      g_free (msg);
+          msg = g_strdup_printf (_("Could not mount %s"),
+                                 gtk_file_system_volume_get_display_name (impl->file_system, volume));
+          error_message (impl, msg, error->message);
+          g_free (msg);
+        }
 
       goto out;
     }