nautilus r14133 - in branches/gnome-2-22: . src

[pborelli svn gnome org]

Author: pborelli
Date: Mon May  5 11:59:56 2008
New Revision: 14133
URL: http://svn.gnome.org/viewvc/nautilus?rev=14133&view=rev

Log:
2008-05-05  Paolo Borelli  <pborelli katamail com>

	* src/nautilus-connect-server-dialog-main.c:
	Do not error out if the remote share is already mounted.
	Fixes #531508.



Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/nautilus-connect-server-dialog-main.c

Modified: branches/gnome-2-22/src/nautilus-connect-server-dialog-main.c
==============================================================================
--- branches/gnome-2-22/src/nautilus-connect-server-dialog-main.c	(original)
+++ branches/gnome-2-22/src/nautilus-connect-server-dialog-main.c	Mon May  5 11:59:56 2008
@@ -123,18 +123,26 @@
 			  GtkWidget *widget)
 {
 	char *uri;
+	gboolean success;
 	GError *error = NULL;
-	
-	g_file_mount_enclosing_volume_finish (location,
-					      res, &error);
+
 	uri = g_file_get_uri (location);
-	if (error) {
-		display_error_dialog (error, uri, widget);
-	} else {
+	success = g_file_mount_enclosing_volume_finish (location,
+							res, &error);
+
+	if (success ||
+	    g_error_matches (error, G_IO_ERROR, G_IO_ERROR_ALREADY_MOUNTED)) {
 		/* volume is mounted, show it */
 		show_uri (uri, widget);
-		g_object_unref (location);
+	} else {
+		display_error_dialog (error, uri, widget);
+	}
+
+	if (error) {
+		g_error_free (error);
 	}
+
+	g_object_unref (location);
 	g_free (uri);
 }