gtk+ r20275 - in branches/gtk-2-12: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Jun  2 21:38:18 2008
New Revision: 20275
URL: http://svn.gnome.org/viewvc/gtk+?rev=20275&view=rev

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



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkfilechooserdefault.c

Modified: branches/gtk-2-12/gtk/gtkfilechooserdefault.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkfilechooserdefault.c	(original)
+++ branches/gtk-2-12/gtk/gtkfilechooserdefault.c	Mon Jun  2 21:38:18 2008
@@ -10298,12 +10298,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;
     }