luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-11 19:54:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

mount-op: use gint64 instead of guint64 for time_left and bytes_left

Browse Source 
Since those can be -1, they need to be signed.

https://bugzilla.gnome.org/show_bug.cgi?id=682284
This commit is contained in:
Cosimo Cecchi
2012-08-20 19:46:33 +02:00
parent ac8c13d25c
commit 0d8a81b722
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gio/gmountoperation.c
View File

@@ -243,8 +243,8 @@ show_processes (GMountOperation *op,
static void static void
show_unmount_progress (GMountOperation *op, show_unmount_progress (GMountOperation *op,
const gchar *message, const gchar *message,
guint64 time_left, gint64 time_left,
guint64 bytes_left) gint64 bytes_left)
{ {
/* nothing to do */ /* nothing to do */
} }
@@ -387,7 +387,8 @@ g_mount_operation_class_init (GMountOperationClass *klass)
* GMountOperation::show-unmount-progress: * GMountOperation::show-unmount-progress:
* @op: a #GMountOperation: * @op: a #GMountOperation:
* @message: string containing a mesage to display to the user * @message: string containing a mesage to display to the user
* @time_left: the estimated time left before the operation completes, or -1 * @time_left: the estimated time left before the operation completes,
* in microseconds, or -1
* @bytes_left: the amount of bytes to be written before the operation * @bytes_left: the amount of bytes to be written before the operation
* completes (or -1 if such amount is not known), or zero if the operation * completes (or -1 if such amount is not known), or zero if the operation
* is completed * is completed
@@ -418,7 +419,7 @@ g_mount_operation_class_init (GMountOperationClass *klass)
G_STRUCT_OFFSET (GMountOperationClass, show_unmount_progress), G_STRUCT_OFFSET (GMountOperationClass, show_unmount_progress),
NULL, NULL, NULL, NULL, NULL, NULL,
G_TYPE_NONE, 3, G_TYPE_NONE, 3,
G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_UINT64); G_TYPE_STRING, G_TYPE_INT64, G_TYPE_INT64);
/** /**
* GMountOperation:username: * GMountOperation:username:

4
gio/gmountoperation.h
View File

@@ -82,8 +82,8 @@ struct _GMountOperationClass
void (* show_unmount_progress) (GMountOperation *op, void (* show_unmount_progress) (GMountOperation *op,
const gchar *message, const gchar *message,
guint64 time_left, gint64 time_left,
guint64 bytes_left); gint64 bytes_left);
/*< private >*/ /*< private >*/
/* Padding for future expansion */ /* Padding for future expansion */