[gvfs] mount-op: adapt to guint64->gint64 API change
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] mount-op: adapt to guint64->gint64 API change
- Date: Tue, 21 Aug 2012 09:19:37 +0000 (UTC)
commit 6294de0ae00594c27527fbe22fd877254775fc9c
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Mon Aug 20 19:47:45 2012 +0200
mount-op: adapt to guint64->gint64 API change
https://bugzilla.gnome.org/show_bug.cgi?id=682284
common/gmountoperationdbus.c | 4 ++--
common/gmountsource.c | 8 ++++----
common/gmountsource.h | 4 ++--
common/org.gtk.vfs.xml | 4 ++--
monitor/proxy/dbus-interfaces.xml | 4 ++--
monitor/proxy/gproxymountoperation.c | 4 ++--
monitor/proxy/gproxymountoperation.h | 4 ++--
monitor/proxy/gproxyvolumemonitor.c | 6 +++---
monitor/proxy/gvfsproxyvolumemonitordaemon.c | 10 +++++-----
9 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/common/gmountoperationdbus.c b/common/gmountoperationdbus.c
index 10f1267..cfd99ef 100644
--- a/common/gmountoperationdbus.c
+++ b/common/gmountoperationdbus.c
@@ -228,8 +228,8 @@ static gboolean
handle_show_unmount_progress (GVfsDBusMountOperation *object,
GDBusMethodInvocation *invocation,
const gchar *arg_message_string,
- guint64 arg_time_left,
- guint64 arg_bytes_left,
+ gint64 arg_time_left,
+ gint64 arg_bytes_left,
gpointer data)
{
GMountOperationDBus *op_dbus = data;
diff --git a/common/gmountsource.c b/common/gmountsource.c
index f75461c..a249237 100644
--- a/common/gmountsource.c
+++ b/common/gmountsource.c
@@ -945,8 +945,8 @@ show_unmount_progress_reply (GVfsDBusMountOperation *proxy,
void
g_mount_source_show_unmount_progress (GMountSource *source,
const char *message_string,
- guint64 time_left,
- guint64 bytes_left)
+ gint64 time_left,
+ gint64 bytes_left)
{
GVfsDBusMountOperation *proxy;
@@ -978,8 +978,8 @@ g_mount_source_show_unmount_progress (GMountSource *source,
static void
op_show_unmount_progress (GMountOperation *op,
const char *message,
- guint64 time_left,
- guint64 bytes_left,
+ gint64 time_left,
+ gint64 bytes_left,
GMountSource *mount_source)
{
g_mount_source_show_unmount_progress (mount_source,
diff --git a/common/gmountsource.h b/common/gmountsource.h
index d2a9eae..58f7f7f 100644
--- a/common/gmountsource.h
+++ b/common/gmountsource.h
@@ -127,8 +127,8 @@ gboolean g_mount_source_show_processes_finish (GMountSource
void g_mount_source_show_unmount_progress (GMountSource *mount_source,
const char *message,
- guint64 time_left,
- guint64 bytes_left);
+ gint64 time_left,
+ gint64 bytes_left);
gboolean g_mount_source_abort (GMountSource *source);
diff --git a/common/org.gtk.vfs.xml b/common/org.gtk.vfs.xml
index 3931c12..e13347c 100644
--- a/common/org.gtk.vfs.xml
+++ b/common/org.gtk.vfs.xml
@@ -159,8 +159,8 @@
</method>
<method name="ShowUnmountProgress">
<arg type='s' name='message_string' direction='in'/>
- <arg type='t' name='time_left' direction='in'/>
- <arg type='t' name='bytes_left' direction='in'/>
+ <arg type='x' name='time_left' direction='in'/>
+ <arg type='x' name='bytes_left' direction='in'/>
</method>
<method name="Aborted">
</method>
diff --git a/monitor/proxy/dbus-interfaces.xml b/monitor/proxy/dbus-interfaces.xml
index ab5ea8d..6fb445c 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 13dc58f..ac61046 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 b842882..52a7146 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 a859354..bc2a1a6 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 00b498c..83ff190 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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]