Revert a patch that introduced a gio dependency

svn path=/branches/gtk-2-12/; revision=20293

2 files changed, 10 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index e2c08fea3..270c1c517 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-02  Matthias Clasen <mclasen@redhat.com> 
+
+	gtk/gtkfilechooserdefault.c: Revert the fix for #532262, since
+	we don't depend on GIO in the 2.12 branch.
+
 2008-06-02  Claudio Saavedra  <csaavedra@igalia.com>
 
 	Merge from trunk:
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index b682b805a..feb178782 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -10298,15 +10298,12 @@ shortcuts_activate_volume_mount_cb (GtkFileSystemHandle *handle,
 
   if (error)
     {
-      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_FAILED_HANDLED))
-        {
-          char *msg;
+      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;
     }