Commit 58cf79dd authored by Paolo Borelli's avatar Paolo Borelli Committed by Paolo Borelli

Do not error out if the remote share is already mounted. Fixes #531508.

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.


svn path=/trunk/; revision=14132
parent 7c53ad15
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.
2008-05-05 Tomas Bzatek <tbzatek@redhat.com>
* libnautilus-private/nautilus-file-operations.c:
......
......@@ -123,18 +123,26 @@ mount_enclosing_ready_cb (GFile *location,
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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment