diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2012-08-20 19:47:45 +0200 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2012-08-21 11:17:56 +0200 |
| commit | 6294de0ae00594c27527fbe22fd877254775fc9c (patch) | |
| tree | 6d272fc9c276502bdbbcffb5beb9065434573991 /monitor | |
| parent | 9961654b7f24c0d6349946c9c79b62a770aafee2 (diff) | |
| download | gvfs-6294de0ae00594c27527fbe22fd877254775fc9c.tar.gz | |
mount-op: adapt to guint64->gint64 API change
https://bugzilla.gnome.org/show_bug.cgi?id=682284
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/proxy/dbus-interfaces.xml | 4 | ||||
| -rw-r--r-- | monitor/proxy/gproxymountoperation.c | 4 | ||||
| -rw-r--r-- | monitor/proxy/gproxymountoperation.h | 4 | ||||
| -rw-r--r-- | monitor/proxy/gproxyvolumemonitor.c | 6 | ||||
| -rw-r--r-- | monitor/proxy/gvfsproxyvolumemonitordaemon.c | 10 |
5 files changed, 14 insertions, 14 deletions
diff --git a/monitor/proxy/dbus-interfaces.xml b/monitor/proxy/dbus-interfaces.xml index ab5ea8d5..6fb445c0 100644 --- a/monitor/proxy/dbus-interfaces.xml +++ b/monitor/proxy/dbus-interfaces.xml @@ -112,8 +112,8 @@ <arg type='s' name='dbus_name'/> <arg type='s' name='id'/> <arg type='s' name='message_to_show'/> - <arg type='t' name='time_left'/> - <arg type='t' name='bytes_left'/> + <arg type='x' name='time_left'/> + <arg type='x' name='bytes_left'/> </signal> <signal name="MountOpAborted"> <arg type='s' name='dbus_name'/> diff --git a/monitor/proxy/gproxymountoperation.c b/monitor/proxy/gproxymountoperation.c index 13dc58f3..ac61046e 100644 --- a/monitor/proxy/gproxymountoperation.c +++ b/monitor/proxy/gproxymountoperation.c @@ -309,8 +309,8 @@ g_proxy_mount_operation_handle_show_processes (const gchar *wrapped_id, void g_proxy_mount_operation_handle_show_unmount_progress (const gchar *wrapped_id, const gchar *message, - guint64 time_left, - guint64 bytes_left) + gint64 time_left, + gint64 bytes_left) { ProxyMountOpData *data; diff --git a/monitor/proxy/gproxymountoperation.h b/monitor/proxy/gproxymountoperation.h index b842882f..52a71462 100644 --- a/monitor/proxy/gproxymountoperation.h +++ b/monitor/proxy/gproxymountoperation.h @@ -51,8 +51,8 @@ void g_proxy_mount_operation_handle_show_processes (const gchar *wrapped void g_proxy_mount_operation_handle_show_unmount_progress (const gchar *wrapped_id, const gchar *message, - guint64 time_left, - guint64 bytes_left); + gint64 time_left, + gint64 bytes_left); void g_proxy_mount_operation_handle_aborted (const gchar *wrapped_id); diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c index a8593541..bc2a1a65 100644 --- a/monitor/proxy/gproxyvolumemonitor.c +++ b/monitor/proxy/gproxyvolumemonitor.c @@ -730,9 +730,9 @@ mount_op_show_unmount_progress (GVfsRemoteVolumeMonitor *object, const gchar *arg_dbus_name, const gchar *arg_id, const gchar *arg_message_to_show, - guint64 arg_time_left, - guint64 arg_bytes_left, - gpointer user_data) + gint64 arg_time_left, + gint64 arg_bytes_left, + gpointer user_data) { GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data); GProxyVolumeMonitorClass *klass; diff --git a/monitor/proxy/gvfsproxyvolumemonitordaemon.c b/monitor/proxy/gvfsproxyvolumemonitordaemon.c index 00b498cf..83ff1909 100644 --- a/monitor/proxy/gvfsproxyvolumemonitordaemon.c +++ b/monitor/proxy/gvfsproxyvolumemonitordaemon.c @@ -127,8 +127,8 @@ g_proxy_mount_operation_show_processes (GMountOperation *op, static void g_proxy_mount_operation_show_unmount_progress (GMountOperation *op, const gchar *message, - guint64 time_left, - guint64 bytes_left) + gint64 time_left, + gint64 bytes_left) { /* do nothing */ } @@ -316,8 +316,8 @@ show_processes_cb (GMountOperation *mount_operation, static void show_unmount_progress_cb (GMountOperation *mount_operation, const gchar *message_to_show, - guint64 time_left, - guint64 bytes_left, + gint64 time_left, + gint64 bytes_left, GVfsRemoteVolumeMonitor *monitor) { const gchar *mount_op_id; @@ -344,7 +344,7 @@ show_unmount_progress_cb (GMountOperation *mount_operation, "/org/gtk/Private/RemoteVolumeMonitor", "org.gtk.Private.RemoteVolumeMonitor", "MountOpShowUnmountProgress", - g_variant_new ("(ssstt)", + g_variant_new ("(sssxx)", the_dbus_name, mount_op_id, message_to_show, |