nautilus r15139 - in trunk: . src/file-manager

[alexl svn gnome org]

Author: alexl
Date: Thu Mar 19 12:33:22 2009
New Revision: 15139
URL: http://svn.gnome.org/viewvc/nautilus?rev=15139&view=rev

Log:
2009-03-19  Alexander Larsson  <alexl redhat com>

	
        * src/file-manager/fm-directory-view.c:
	Report error for failed mounts.
c


Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-directory-view.c

Modified: trunk/src/file-manager/fm-directory-view.c
==============================================================================
--- trunk/src/file-manager/fm-directory-view.c	(original)
+++ trunk/src/file-manager/fm-directory-view.c	Thu Mar 19 12:33:22 2009
@@ -5924,6 +5924,22 @@
 }
 
 static void
+file_mount_callback (NautilusFile  *file,
+		     GFile         *result_location,
+		     GError        *error,
+		     gpointer       callback_data)
+{
+	if (error != NULL &&
+	    (error->domain != G_IO_ERROR ||
+	     (error->code != G_IO_ERROR_CANCELLED &&
+	      error->code != G_IO_ERROR_FAILED_HANDLED &&
+	      error->code != G_IO_ERROR_ALREADY_MOUNTED))) {
+		eel_show_error_dialog (_("Unable to mount location"),
+				       error->message, NULL);
+	}
+}
+
+static void
 action_mount_volume_callback (GtkAction *action,
 			      gpointer data)
 {
@@ -5941,7 +5957,7 @@
 		if (nautilus_file_can_mount (file)) {
 			mount_op = gtk_mount_operation_new (fm_directory_view_get_containing_window (view));
 			nautilus_file_mount (file, mount_op, NULL,
-					     NULL, NULL);
+					     file_mount_callback, NULL);
 			g_object_unref (mount_op);
 		}
 	}
@@ -6029,7 +6045,7 @@
 	}
 
 	mount_op = gtk_mount_operation_new (fm_directory_view_get_containing_window (view));
-	nautilus_file_mount (file, mount_op, NULL, NULL, NULL);
+	nautilus_file_mount (file, mount_op, NULL, file_mount_callback, NULL);
 	g_object_unref (mount_op);
 }
 
@@ -6104,7 +6120,7 @@
 	}
 
 	mount_op = gtk_mount_operation_new (fm_directory_view_get_containing_window (view));
-	nautilus_file_mount (file, mount_op, NULL, NULL, NULL);
+	nautilus_file_mount (file, mount_op, NULL, file_mount_callback, NULL);
 	g_object_unref (mount_op);
 }