[Goodies-commits] r6573 - in sion/trunk: . src

[Enrico Troeger]

Author: enrico
Date: 2009-01-26 21:30:00 +0000 (Mon, 26 Jan 2009)
New Revision: 6573

Modified:
   sion/trunk/ChangeLog
   sion/trunk/src/backendgvfs.c
   sion/trunk/src/bookmarkeditdialog.c
   sion/trunk/src/common.c
   sion/trunk/src/window.c
Log:
Make 'Connect' insensitive for connected resources.
Fix default value of sion_describe_scheme().
Ignore empty CDs which are listed as mounted by GVfs.

Modified: sion/trunk/ChangeLog
===================================================================
--- sion/trunk/ChangeLog	2009-01-26 20:51:57 UTC (rev 6572)
+++ sion/trunk/ChangeLog	2009-01-26 21:30:00 UTC (rev 6573)
@@ -1,3 +1,11 @@
+2009-01-26  Enrico Tröger  <enrico(at)xfce(dot)org>
+
+ * src/window.c:
+   Make 'Connect' insensitive for connected resources.
+ * src/backendgvfs.c:
+   Ignore empty CDs which are listed as mounted by GVfs.
+
+
 2009-01-25  Enrico Tröger  <enrico(at)xfce(dot)org>
 
  * src/main.c, src/preferencesdialog.c, src/window.c:

Modified: sion/trunk/src/backendgvfs.c
===================================================================
--- sion/trunk/src/backendgvfs.c	2009-01-26 20:51:57 UTC (rev 6572)
+++ sion/trunk/src/backendgvfs.c	2009-01-26 21:30:00 UTC (rev 6573)
@@ -237,6 +237,13 @@
 		vol_name = g_mount_get_name(mount);
 		file = g_mount_get_root(mount);
 		scheme = g_file_get_uri_scheme(file);
+		if (sion_str_equal(scheme, "burn"))
+		{	/* ignore empty CDs which are listed as mounted to burn:// */
+			g_free(vol_name);
+			g_free(scheme);
+			g_object_unref(file);
+			continue;
+		}
 		scheme_name = sion_describe_scheme(scheme);
 		uri = g_file_get_uri(file);
 		icon = g_mount_get_icon(mount);
@@ -386,7 +393,7 @@
 				name = g_strdup(_("unknown"));
 		}
 
-		g_warning("Mounting of \"%s\" failed (%s)", name, error->message);
+		g_warning("Mounting of \"%s\" failed: %s", name, error->message);
 		msg = g_strdup_printf(_("Mounting of \"%s\" failed."), name);
 
 		g_signal_emit(backend, signals[OPERATION_FAILED], 0, msg, error->message);

Modified: sion/trunk/src/bookmarkeditdialog.c
===================================================================
--- sion/trunk/src/bookmarkeditdialog.c	2009-01-26 20:51:57 UTC (rev 6572)
+++ sion/trunk/src/bookmarkeditdialog.c	2009-01-26 21:30:00 UTC (rev 6573)
@@ -602,7 +602,7 @@
 				break;
 			}
 		}
-		scheme = sion_describe_scheme(methods[i].scheme);
+		scheme = sion_describe_scheme((methods[i].scheme != NULL) ? methods[i].scheme : "custom");
 
 		gtk_list_store_append(store, &iter);
 		gtk_list_store_set(store, &iter,

Modified: sion/trunk/src/common.c
===================================================================
--- sion/trunk/src/common.c	2009-01-26 20:51:57 UTC (rev 6572)
+++ sion/trunk/src/common.c	2009-01-26 21:30:00 UTC (rev 6573)
@@ -88,8 +88,10 @@
 		return _("WebDAV (secure)");
 	else if (sion_str_equal(scheme, "network"))
 		return _("Network");
+	else if (sion_str_equal(scheme, "custom"))
+		return _("Custom Location");
 
-	return _("Custom Location");
+	return NULL;
 }
 
 

Modified: sion/trunk/src/window.c
===================================================================
--- sion/trunk/src/window.c	2009-01-26 20:51:57 UTC (rev 6572)
+++ sion/trunk/src/window.c	2009-01-26 21:30:00 UTC (rev 6573)
@@ -609,8 +609,7 @@
 		gtk_tree_model_get(model, iter, SION_WINDOW_COL_REF_TYPE, &ref_type, -1);
 		is_bookmark = iter_is_bookmark(window, model, iter);
 
-		/* gtk_action_set_sensitive(priv->action_connect, (ref_type != SION_WINDOW_REF_TYPE_MOUNT)); */
-		/* gtk_action_set_sensitive(priv->action_bookmarks_toolbar, (ref_type != SION_WINDOW_REF_TYPE_MOUNT)); */
+		gtk_action_set_sensitive(priv->action_connect, (ref_type != SION_WINDOW_REF_TYPE_MOUNT));
 		gtk_action_set_sensitive(priv->action_disconnect, (ref_type == SION_WINDOW_REF_TYPE_MOUNT));
 		gtk_action_set_sensitive(priv->action_bookmark_create, ! is_bookmark);
 		gtk_action_set_sensitive(priv->action_open, sion_settings_has_file_manager(priv->settings));
@@ -619,7 +618,6 @@
 	else
 	{
 		/* gtk_action_set_sensitive(priv->action_connect, FALSE); */
-		/* gtk_action_set_sensitive(priv->action_bookmarks_toolbar, FALSE); */
 		gtk_action_set_sensitive(priv->action_disconnect, FALSE);
 		gtk_action_set_sensitive(priv->action_bookmark_create, FALSE);
 		gtk_action_set_sensitive(priv->action_open, FALSE);