Add user_visible to mount info Reorder args so that new stuff comes at the

2007-10-19  Alexander Larsson  <alexl@redhat.com>

        * common/gmounttracker.[ch]:
        * client/gdaemonvfs.c:
        * daemon/mount.c:
	Add user_visible to mount info
	Reorder args so that new stuff comes at the end
	
        * daemon/gvfsbackend.[ch]:
	Add user_visible setting
	Fix up various setters that set the wrong variable
	
        * daemon/gvfsbackendtrash.c:
	Add icon and better display name



svn path=/trunk/; revision=984

4 files changed, 41 insertions, 14 deletions

diff --git a/daemon/gvfsbackend.c b/daemon/gvfsbackend.c
index 491e46d0..372c56c0 100644
--- a/daemon/gvfsbackend.c
+++ b/daemon/gvfsbackend.c
@@ -44,6 +44,7 @@ struct _GVfsBackendPrivate
   char *display_name;
   char *icon;
   char *prefered_filename_encoding;
+  gboolean user_visible;
   GMountSpec *mount_spec;
 };
 
@@ -165,6 +166,7 @@ g_vfs_backend_init (GVfsBackend *backend)
   backend->priv->icon = g_strdup ("");
   backend->priv->prefered_filename_encoding = g_strdup ("");
   backend->priv->display_name = g_strdup ("");
+  backend->priv->user_visible = TRUE;
 }
 
 static void
@@ -252,7 +254,7 @@ g_vfs_backend_set_icon (GVfsBackend *backend,
 			const char *icon)
 {
   g_free (backend->priv->icon);
-  backend->priv->display_name = g_strdup (icon);
+  backend->priv->icon = g_strdup (icon);
 }
 
 void
@@ -260,7 +262,14 @@ g_vfs_backend_set_prefered_filename_encoding (GVfsBackend  *backend,
 					      const char *prefered_filename_encoding)
 {
   g_free (backend->priv->prefered_filename_encoding);
-  backend->priv->display_name = g_strdup (prefered_filename_encoding);
+  backend->priv->prefered_filename_encoding = g_strdup (prefered_filename_encoding);
+}
+
+void
+g_vfs_backend_set_user_visible (GVfsBackend  *backend,
+				gboolean user_visible)
+{
+  backend->priv->user_visible = user_visible;
 }
 
 void
@@ -384,6 +393,7 @@ g_vfs_backend_register_mount (GVfsBackend *backend,
 {
   DBusMessage *message;
   DBusMessageIter iter;
+  dbus_bool_t user_visible;
   
   message = dbus_message_new_method_call (G_VFS_DBUS_DAEMON_NAME,
 					  G_VFS_DBUS_MOUNTTRACKER_PATH,
@@ -392,11 +402,13 @@ g_vfs_backend_register_mount (GVfsBackend *backend,
   if (message == NULL)
     _g_dbus_oom ();
 
+  user_visible = backend->priv->user_visible;
   if (!dbus_message_append_args (message,
+				 DBUS_TYPE_OBJECT_PATH, &backend->priv->object_path,
 				 DBUS_TYPE_STRING, &backend->priv->display_name,
 				 DBUS_TYPE_STRING, &backend->priv->icon,
 				 DBUS_TYPE_STRING, &backend->priv->prefered_filename_encoding,
-				 DBUS_TYPE_OBJECT_PATH, &backend->priv->object_path,
+				 DBUS_TYPE_BOOLEAN, &user_visible,
 				 0))
     _g_dbus_oom ();
 
diff --git a/daemon/gvfsbackend.h b/daemon/gvfsbackend.h
index 8fdd7922..88267c1b 100644
--- a/daemon/gvfsbackend.h
+++ b/daemon/gvfsbackend.h
@@ -322,6 +322,8 @@ void        g_vfs_backend_set_icon                       (GVfsBackend        *ba
 							  const char         *icon);
 void        g_vfs_backend_set_prefered_filename_encoding (GVfsBackend        *backend,
 							  const char         *prefered_filename_encoding);
+void        g_vfs_backend_set_user_visible               (GVfsBackend        *backend,
+							  gboolean            user_visible);
 void        g_vfs_backend_set_mount_spec                 (GVfsBackend        *backend,
 							  GMountSpec         *mount_spec);
 void        g_vfs_backend_register_mount                 (GVfsBackend        *backend,
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c
index e14f7567..fe2ebba1 100644
--- a/daemon/gvfsbackendtrash.c
+++ b/daemon/gvfsbackendtrash.c
@@ -574,7 +574,8 @@ g_vfs_backend_trash_init (GVfsBackendTrash *trash_backend)
   GVfsBackend *backend = G_VFS_BACKEND (trash_backend);
   GMountSpec *mount_spec;
   
-  g_vfs_backend_set_display_name (backend, "trash");
+  g_vfs_backend_set_display_name (backend, _("Trashcan"));
+  g_vfs_backend_set_icon (backend, "user-trash");
 
   mount_spec = g_mount_spec_new ("trash");
   g_vfs_backend_set_mount_spec (backend, mount_spec);
diff --git a/daemon/mount.c b/daemon/mount.c
index 9c29754c..2113e6f0 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -15,6 +15,7 @@ typedef struct {
   char *display_name;
   char *icon;
   char *prefered_filename_encoding;
+  gboolean user_visible;
 
   /* Daemon object ref */
   char *dbus_id;
@@ -126,6 +127,7 @@ vfs_mount_to_dbus (VfsMount *mount,
 		   DBusMessageIter *iter)
 {
   DBusMessageIter struct_iter;
+  dbus_bool_t user_visible;
   
   if (!dbus_message_iter_open_container (iter,
 					 DBUS_TYPE_STRUCT,
@@ -133,6 +135,15 @@ vfs_mount_to_dbus (VfsMount *mount,
 					 &struct_iter))
     _g_dbus_oom ();
   
+  if (!dbus_message_iter_append_basic (&struct_iter,
+				       DBUS_TYPE_STRING,
+				       &mount->dbus_id))
+    _g_dbus_oom ();
+  
+  if (!dbus_message_iter_append_basic (&struct_iter,
+				       DBUS_TYPE_OBJECT_PATH,
+				       &mount->object_path))
+    _g_dbus_oom ();
   
   if (!dbus_message_iter_append_basic (&struct_iter,
 				       DBUS_TYPE_STRING,
@@ -148,16 +159,13 @@ vfs_mount_to_dbus (VfsMount *mount,
 				       DBUS_TYPE_STRING,
 				       &mount->prefered_filename_encoding))
     _g_dbus_oom ();
-	      
-  if (!dbus_message_iter_append_basic (&struct_iter,
-				       DBUS_TYPE_STRING,
-				       &mount->dbus_id))
-    _g_dbus_oom ();
-  
+
+  user_visible = mount->user_visible;
   if (!dbus_message_iter_append_basic (&struct_iter,
-				       DBUS_TYPE_OBJECT_PATH,
-				       &mount->object_path))
+				       DBUS_TYPE_BOOLEAN,
+				       &user_visible))
     _g_dbus_oom ();
+	      
   
   g_mount_spec_to_dbus (&struct_iter, mount->mount_spec);
 
@@ -502,6 +510,7 @@ register_mount (DBusConnection *connection,
   DBusMessage *reply;
   DBusError error;
   const char *display_name, *icon, *obj_path, *id, *prefered_filename_encoding;
+  dbus_bool_t user_visible;
   DBusMessageIter iter;
   GMountSpec *mount_spec;
 
@@ -512,10 +521,11 @@ register_mount (DBusConnection *connection,
   dbus_error_init (&error);
   if (_g_dbus_message_iter_get_args (&iter,
 				     &error,
+				     DBUS_TYPE_OBJECT_PATH, &obj_path,
 				     DBUS_TYPE_STRING, &display_name,
 				     DBUS_TYPE_STRING, &icon,
 				     DBUS_TYPE_STRING, &prefered_filename_encoding,
-				     DBUS_TYPE_OBJECT_PATH, &obj_path,
+				     DBUS_TYPE_BOOLEAN, &user_visible,
 				     0))
     {
       if (find_vfs_mount (id, obj_path) != NULL)
@@ -536,6 +546,7 @@ register_mount (DBusConnection *connection,
 	  mount->display_name = g_strdup (display_name);
 	  mount->icon = g_strdup (icon);
 	  mount->prefered_filename_encoding = g_strdup (prefered_filename_encoding);
+	  mount->user_visible = user_visible;
 	  mount->dbus_id = g_strdup (id);
 	  mount->object_path = g_strdup (obj_path);
 	  mount->mount_spec = mount_spec;
@@ -694,10 +705,11 @@ list_mounts (DBusConnection *connection,
 					 DBUS_TYPE_ARRAY,
 					 DBUS_STRUCT_BEGIN_CHAR_AS_STRING
 					   DBUS_TYPE_STRING_AS_STRING
+					   DBUS_TYPE_OBJECT_PATH_AS_STRING
 					   DBUS_TYPE_STRING_AS_STRING
 					   DBUS_TYPE_STRING_AS_STRING
 					   DBUS_TYPE_STRING_AS_STRING
-					   DBUS_TYPE_OBJECT_PATH_AS_STRING
+					   DBUS_TYPE_BOOLEAN_AS_STRING
  					   G_MOUNT_SPEC_TYPE_AS_STRING
 					 DBUS_STRUCT_END_CHAR_AS_STRING,
 					 &array_iter))