From 3a54d949a72ff3b4d977211c4b8aa992f98f0d03 Mon Sep 17 00:00:00 2001
From: Benedikt Meurer <benny@xfce.org>
Date: Tue, 23 May 2006 15:11:26 +0000
Subject: [PATCH] 2006-05-23 Benedikt Meurer <benny@xfce.org>
* thunar-vfs/thunar-vfs-volume-hal.c(thunar_vfs_volume_hal_mount):
pmount-hal returns an error if the volume is already mounted.
Bug #1833.
(Old svn revision: 21799)
---
ChangeLog | 6 ++++++
thunar-vfs/thunar-vfs-volume-hal.c | 7 +++++++
2 files changed, 13 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index a4ffe8097..0b398db54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-23 Benedikt Meurer <benny@xfce.org>
+
+ * thunar-vfs/thunar-vfs-volume-hal.c(thunar_vfs_volume_hal_mount):
+ pmount-hal returns an error if the volume is already mounted.
+ Bug #1833.
+
2006-05-23 Daichi Kawahata <daichi@xfce.org>
* configure.in.in, docs/manual/Makefile.am,
diff --git a/thunar-vfs/thunar-vfs-volume-hal.c b/thunar-vfs/thunar-vfs-volume-hal.c
index 607df788f..e42c1ce48 100644
--- a/thunar-vfs/thunar-vfs-volume-hal.c
+++ b/thunar-vfs/thunar-vfs-volume-hal.c
@@ -270,6 +270,13 @@ thunar_vfs_volume_hal_mount (ThunarVfsVolume *volume,
result = thunar_vfs_exec_sync ("%s %s", error, program, quoted);
g_free (program);
g_free (quoted);
+
+ /* pmount-hal returns error if already mounted, so
+ * we set result to TRUE, which means it will always
+ * be looked up in /proc/mounts below.
+ * See http://bugzilla.xfce.org/show_bug.cgi?id=1833.
+ */
+ result = TRUE;
}
else
{
--
GitLab