Use guint32 for request handle (4a256469) · Commits · Xfce / tumbler

tumblerd/tumbler-group-scheduler.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ static void tumbler_group_scheduler_set_property (GObject
		static void tumbler_group_scheduler_push (TumblerScheduler *scheduler,
		TumblerSchedulerRequest *request);
		static void tumbler_group_scheduler_dequeue (TumblerScheduler *scheduler,
		guint handle);
		guint32 handle);
		static void tumbler_group_scheduler_cancel_by_mount (TumblerScheduler *scheduler,
		GMount *mount);
		static void tumbler_group_scheduler_finish_request (TumblerGroupScheduler *scheduler,
		@@ -265,7 +265,7 @@ tumbler_group_scheduler_push (TumblerScheduler *scheduler,

		static void
		tumbler_group_scheduler_dequeue (TumblerScheduler *scheduler,
		guint handle)
		guint32 handle)
		{
		TumblerGroupScheduler *group_scheduler =
		TUMBLER_GROUP_SCHEDULER (scheduler);

tumblerd/tumbler-lifo-scheduler.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ static void tumbler_lifo_scheduler_set_property (GObject
		static void tumbler_lifo_scheduler_push (TumblerScheduler *scheduler,
		TumblerSchedulerRequest *request);
		static void tumbler_lifo_scheduler_dequeue (TumblerScheduler *scheduler,
		guint handle);
		guint32 handle);
		static void tumbler_lifo_scheduler_cancel_by_mount (TumblerScheduler *scheduler,
		GMount *mount);
		static void tumbler_lifo_scheduler_finish_request (TumblerLifoScheduler *scheduler,
		@@ -244,7 +244,7 @@ tumbler_lifo_scheduler_push (TumblerScheduler *scheduler,

		static void
		tumbler_lifo_scheduler_dequeue (TumblerScheduler *scheduler,
		guint handle)
		guint32 handle)
		{
		TumblerLifoScheduler *lifo_scheduler = TUMBLER_LIFO_SCHEDULER (scheduler);

tumblerd/tumbler-scheduler.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -189,7 +189,7 @@ tumbler_scheduler_push (TumblerScheduler *scheduler,

		void
		tumbler_scheduler_dequeue (TumblerScheduler *scheduler,
		guint handle)
		guint32 handle)
		{
		g_return_if_fail (TUMBLER_IS_SCHEDULER (scheduler));
		g_return_if_fail (handle != 0);
		@@ -261,7 +261,7 @@ tumbler_scheduler_request_new (TumblerFileInfo **infos,
		const gchar *origin)
		{
		TumblerSchedulerRequest *request = NULL;
		static guint handle = 0;
		static guint32 handle = 0;
		guint n;

		g_return_val_if_fail (infos != NULL, NULL);

tumblerd/tumbler-scheduler.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -43,22 +43,22 @@ struct _TumblerSchedulerIface

		/* signals */
		void (error) (TumblerScheduler scheduler,
		guint handle,
		guint32 handle,
		const gchar const failed_uris,
		gint error_code,
		const gchar *message);
		void (finished) (TumblerScheduler scheduler,
		guint handle);
		guint32 handle);
		void (ready) (TumblerScheduler scheduler,
		const gchar const uris);
		void (started) (TumblerScheduler scheduler,
		guint handle);
		guint32 handle);

		/* virtual methods */
		void (push) (TumblerScheduler scheduler,
		TumblerSchedulerRequest *request);
		void (dequeue) (TumblerScheduler scheduler,
		guint handle);
		guint32 handle);
		void (cancel_by_mount) (TumblerScheduler scheduler,
		GMount *mount);
		};
		@@ -68,7 +68,7 @@ GType tumbler_scheduler_get_type (void) G_GNUC_C
		void tumbler_scheduler_push (TumblerScheduler *scheduler,
		TumblerSchedulerRequest *request);
		void tumbler_scheduler_dequeue (TumblerScheduler *scheduler,
		guint handle);
		guint32 handle);
		void tumbler_scheduler_cancel_by_mount (TumblerScheduler *scheduler,
		GMount *mount);
		gchar* tumbler_scheduler_get_name (TumblerScheduler *scheduler);
		@@ -96,7 +96,7 @@ struct _TumblerSchedulerRequest
		TumblerFileInfo **infos;
		GCancellable **cancellables;
		gboolean dequeued;
		guint handle;
		guint32 handle;
		gchar *origin;
		guint length;
		};

tumblerd/tumbler-service.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -93,23 +93,23 @@ static gboolean tumbler_service_get_flavors_cb (TumblerExportedService *skelet
		GDBusMethodInvocation *invocation,
		TumblerService *service);
		static void tumbler_service_scheduler_error (TumblerScheduler *scheduler,
		guint handle,
		guint32 handle,
		const gchar const failed_uris,
		gint error_code,
		const gchar *message,
		const gchar *origin,
		TumblerService *service);
		static void tumbler_service_scheduler_finished (TumblerScheduler *scheduler,
		guint handle,
		guint32 handle,
		const gchar *origin,
		TumblerService *service);
		static void tumbler_service_scheduler_ready (TumblerScheduler *scheduler,
		guint handle,
		guint32 handle,
		const gchar const uris,
		const gchar *origin,
		TumblerService *service);
		static void tumbler_service_scheduler_started (TumblerScheduler *scheduler,
		guint handle,
		guint32 handle,
		const gchar *origin,
		TumblerService *service);
		static void tumbler_service_pre_unmount (TumblerService *service,
		@@ -417,7 +417,7 @@ tumbler_service_error_idle (gpointer user_data)

		static void
		tumbler_service_scheduler_error (TumblerScheduler *scheduler,
		guint handle,
		guint32 handle,
		const gchar const failed_uris,
		gint error_code,
		const gchar *message,
		@@ -482,7 +482,7 @@ tumbler_service_finished_idle (gpointer user_data)

		static void
		tumbler_service_scheduler_finished (TumblerScheduler *scheduler,
		guint handle,
		guint32 handle,
		const gchar *origin,
		TumblerService *service)
		{
		@@ -538,7 +538,7 @@ tumbler_service_ready_idle (gpointer user_data)

		static void
		tumbler_service_scheduler_ready (TumblerScheduler *scheduler,
		guint handle,
		guint32 handle,
		const gchar const uris,
		const gchar *origin,
		TumblerService *service)
		@@ -594,7 +594,7 @@ tumbler_service_started_idle (gpointer user_data)

		static void
		tumbler_service_scheduler_started (TumblerScheduler *scheduler,
		guint handle,
		guint32 handle,
		const gchar *origin,
		TumblerService *service)
		{
		@@ -678,7 +678,7 @@ tumbler_service_queue_cb (TumblerExportedService *skeleton,
		const gchar const mime_hints,
		const gchar *flavor_name,
		const gchar *scheduler_name,
		guint handle_to_dequeue,
		guint32 handle_to_dequeue,
		TumblerService *service)
		{
		TumblerSchedulerRequest *scheduler_request;
		@@ -690,7 +690,7 @@ tumbler_service_queue_cb (TumblerExportedService *skeleton,
		GList *iter;
		gchar *name;
		const gchar *origin;
		guint handle;
		guint32 handle;
		guint length;

		g_dbus_async_return_val_if_fail (TUMBLER_IS_SERVICE (service), invocation, FALSE);
		@@ -800,7 +800,7 @@ tumbler_service_queue_cb (TumblerExportedService *skeleton,
		static gboolean
		tumbler_service_dequeue_cb (TumblerExportedService *skeleton,
		GDBusMethodInvocation *invocation,
		guint handle,
		guint32 handle,
		TumblerService *service)
		{
		GList *iter;