summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--monitor/proxy/gvfsproxyvolumemonitordaemon.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 053d035a..646e9ae0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-28 David Zeuthen <davidz@redhat.com>
+
+ * monitor/proxy/gproxyvolume.c: (g_proxy_volume_mount):
+ * monitor/proxy/gvfsproxyvolumemonitordaemon.c:
+ (handle_volume_mount): Make sure we really read mount_flags and
+ use_mount_operation. Fixes RH bug 460223.
+
2008-08-27 Bastien Nocera <hadess@hadess.net>
* client/gdaemonvfs.c (get_mountspec_from_uri),
diff --git a/monitor/proxy/gvfsproxyvolumemonitordaemon.c b/monitor/proxy/gvfsproxyvolumemonitordaemon.c
index 4ec905e7..3ee5bbf8 100644
--- a/monitor/proxy/gvfsproxyvolumemonitordaemon.c
+++ b/monitor/proxy/gvfsproxyvolumemonitordaemon.c
@@ -27,6 +27,7 @@
#include <gio/gio.h>
#include <dbus/dbus.h>
#include <glib/gi18n.h>
+#include <stdlib.h>
#include "gdbusutils.h"
#include "gvfsproxyvolumemonitordaemon.h"
@@ -592,13 +593,12 @@ handle_volume_mount (DBusConnection *connection, DBusMessage *message)
GMountOperation *mount_operation;
volume = NULL;
- mount_flags = 0;
ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
dbus_error_init (&dbus_error);
if (!dbus_message_get_args (message, &dbus_error,
DBUS_TYPE_STRING, &id,
- DBUS_TYPE_UINT32 &mount_flags,
+ DBUS_TYPE_UINT32, &mount_flags,
DBUS_TYPE_BOOLEAN, &use_mount_operation,
DBUS_TYPE_INVALID))
{