summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2008-01-21 14:35:48 +0000
committerAlexander Larsson <alexl@src.gnome.org>2008-01-21 14:35:48 +0000
commit233f20fbc47042df871ab2a845a97222b14602e3 (patch)
tree1891d43f9201db532ddd7df80ef44a614b093d45
parent6bf042ace2a56ce759a969cee35056c841d8258d (diff)
downloadgvfs-233f20fbc47042df871ab2a845a97222b14602e3.tar.gz
Fix error with the names of the root items the fuse mount.
2008-01-21 Alexander Larsson <alexl@redhat.com> * client/gvfsfusedaemon.c: Fix error with the names of the root items the fuse mount. svn path=/trunk/; revision=1157
-rw-r--r--ChangeLog6
-rw-r--r--client/gvfsfusedaemon.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 21df6c20..1b921b61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-01-21 Alexander Larsson <alexl@redhat.com>
+ * client/gvfsfusedaemon.c:
+ Fix error with the names of the root items the
+ fuse mount.
+
+2008-01-21 Alexander Larsson <alexl@redhat.com>
+
* daemon/mount.c:
Reload the list of mountables on SIGUSR1
diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
index 308e9494..c715da14 100644
--- a/client/gvfsfusedaemon.c
+++ b/client/gvfsfusedaemon.c
@@ -53,7 +53,7 @@
#define FUSE_USE_VERSION 26
#include <fuse.h>
-#define DEBUG_ENABLED 1
+#define DEBUG_ENABLED 0
#define GET_FILE_HANDLE(fi) (GUINT_TO_POINTER ((guint) (fi)->fh))
#define SET_FILE_HANDLE(fi, fh) ((fi)->fh = (guint64) GPOINTER_TO_UINT (fh))
@@ -305,7 +305,7 @@ mount_record_new (GMount *mount)
mount_record->root = g_mount_get_root (mount);
name = g_object_get_data (G_OBJECT (mount), "g-stable-name");
- if (name != NULL)
+ if (name != NULL && *name != 0)
name = g_strdup (name);
else
name = g_mount_get_name (mount);