Updating branch refs/heads/master
to c4c67778eb43a51f73f2a299edb2b59bc559e06c (commit)
from 82993e2b0540a17dbe1b9b45c0cf61f05d56a049 (commit)
commit c4c67778eb43a51f73f2a299edb2b59bc559e06c
Author: Philip Van Hoof <phi...@codeminded.be>
Date: Sun Oct 25 19:22:20 2009 +0100
Unqueue is not an English word, Dequeue is.
The spec has been adapted for this too.
Signed-off-by: Jannis Pohlmann <jan...@xfce.org>
tumblerd/tumbler-group-scheduler.c | 30 +++++++++++++++---------------
tumblerd/tumbler-lifo-scheduler.c | 30 +++++++++++++++---------------
tumblerd/tumbler-scheduler.c | 8 ++++----
tumblerd/tumbler-scheduler.h | 6 +++---
tumblerd/tumbler-service-dbus.xml | 2 +-
tumblerd/tumbler-service.c | 14 +++++++-------
tumblerd/tumbler-service.h | 4 ++--
7 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/tumblerd/tumbler-group-scheduler.c
b/tumblerd/tumbler-group-scheduler.c
index 6cbfd2d..94c5878 100644
--- a/tumblerd/tumbler-group-scheduler.c
+++ b/tumblerd/tumbler-group-scheduler.c
@@ -62,13 +62,13 @@ static void tumbler_group_scheduler_set_property
(GObject
GParamSpec
*pspec);
static void tumbler_group_scheduler_push (TumblerScheduler
*scheduler,
TumblerSchedulerRequest
*request);
-static void tumbler_group_scheduler_unqueue (TumblerScheduler
*scheduler,
+static void tumbler_group_scheduler_dequeue (TumblerScheduler
*scheduler,
guint
handle);
static void tumbler_group_scheduler_cancel_by_mount (TumblerScheduler
*scheduler,
GMount
*mount);
static void tumbler_group_scheduler_finish_request (TumblerGroupScheduler
*scheduler,
TumblerSchedulerRequest
*request);
-static void tumbler_group_scheduler_unqueue_request (TumblerSchedulerRequest
*request,
+static void tumbler_group_scheduler_dequeue_request (TumblerSchedulerRequest
*request,
gpointer
user_data);
static void tumbler_group_scheduler_thread (gpointer
data,
gpointer
user_data);
@@ -142,7 +142,7 @@ static void
tumbler_group_scheduler_iface_init (TumblerSchedulerIface *iface)
{
iface->push = tumbler_group_scheduler_push;
- iface->unqueue = tumbler_group_scheduler_unqueue;
+ iface->dequeue = tumbler_group_scheduler_dequeue;
iface->cancel_by_mount = tumbler_group_scheduler_cancel_by_mount;
}
@@ -263,7 +263,7 @@ tumbler_group_scheduler_push (TumblerScheduler
*scheduler,
static void
-tumbler_group_scheduler_unqueue (TumblerScheduler *scheduler,
+tumbler_group_scheduler_dequeue (TumblerScheduler *scheduler,
guint handle)
{
TumblerGroupScheduler *group_scheduler =
@@ -274,9 +274,9 @@ tumbler_group_scheduler_unqueue (TumblerScheduler
*scheduler,
g_mutex_lock (group_scheduler->mutex);
- /* unqueue all requests (usually only one) with this handle */
+ /* dequeue all requests (usually only one) with this handle */
g_list_foreach (group_scheduler->requests,
- (GFunc) tumbler_group_scheduler_unqueue_request,
+ (GFunc) tumbler_group_scheduler_dequeue_request,
GUINT_TO_POINTER (handle));
g_mutex_unlock (group_scheduler->mutex);
@@ -351,7 +351,7 @@ tumbler_group_scheduler_finish_request
(TumblerGroupScheduler *scheduler,
static void
-tumbler_group_scheduler_unqueue_request (TumblerSchedulerRequest *request,
+tumbler_group_scheduler_dequeue_request (TumblerSchedulerRequest *request,
gpointer user_data)
{
guint handle = GPOINTER_TO_UINT (user_data);
@@ -360,10 +360,10 @@ tumbler_group_scheduler_unqueue_request
(TumblerSchedulerRequest *request,
g_return_if_fail (request != NULL);
g_return_if_fail (handle != 0);
- /* mark the request as unqueued if the handles match */
+ /* mark the request as dequeued if the handles match */
if (request->handle == handle)
{
- request->unqueued = TRUE;
+ request->dequeued = TRUE;
/* try cancel all thumbnails that are part of the request */
for (n = 0; n < request->length; ++n)
@@ -441,9 +441,9 @@ tumbler_group_scheduler_thread (gpointer data,
g_signal_emit_by_name (request->scheduler, "started", request->handle,
request->origin);
- /* finish the request if it was unqueued */
+ /* finish the request if it was dequeued */
g_mutex_lock (scheduler->mutex);
- if (request->unqueued)
+ if (request->dequeued)
{
tumbler_group_scheduler_finish_request (scheduler, request);
g_mutex_unlock (scheduler->mutex);
@@ -454,9 +454,9 @@ tumbler_group_scheduler_thread (gpointer data,
/* process URI by URI */
for (n = 0; request->uris[n] != NULL; ++n)
{
- /* finish the request if it was unqueued */
+ /* finish the request if it was dequeued */
g_mutex_lock (scheduler->mutex);
- if (request->unqueued)
+ if (request->dequeued)
{
tumbler_group_scheduler_finish_request (scheduler, request);
g_mutex_unlock (scheduler->mutex);
@@ -563,9 +563,9 @@ tumbler_group_scheduler_thread (gpointer data,
{
n = GPOINTER_TO_INT (lp->data);
- /* finish the request if it was unqueued */
+ /* finish the request if it was dequeued */
g_mutex_lock (scheduler->mutex);
- if (request->unqueued)
+ if (request->dequeued)
{
tumbler_group_scheduler_finish_request (scheduler, request);
return;
diff --git a/tumblerd/tumbler-lifo-scheduler.c
b/tumblerd/tumbler-lifo-scheduler.c
index 19fb31e..c8e39cf 100644
--- a/tumblerd/tumbler-lifo-scheduler.c
+++ b/tumblerd/tumbler-lifo-scheduler.c
@@ -55,13 +55,13 @@ static void tumbler_lifo_scheduler_set_property
(GObject
GParamSpec
*pspec);
static void tumbler_lifo_scheduler_push (TumblerScheduler
*scheduler,
TumblerSchedulerRequest
*request);
-static void tumbler_lifo_scheduler_unqueue (TumblerScheduler
*scheduler,
+static void tumbler_lifo_scheduler_dequeue (TumblerScheduler
*scheduler,
guint
handle);
static void tumbler_lifo_scheduler_cancel_by_mount (TumblerScheduler
*scheduler,
GMount
*mount);
static void tumbler_lifo_scheduler_finish_request (TumblerLifoScheduler
*scheduler,
TumblerSchedulerRequest
*request);
-static void tumbler_lifo_scheduler_unqueue_request (TumblerSchedulerRequest
*request,
+static void tumbler_lifo_scheduler_dequeue_request (TumblerSchedulerRequest
*request,
gpointer
user_data);
static void tumbler_lifo_scheduler_thread (gpointer
data,
gpointer
user_data);
@@ -124,7 +124,7 @@ static void
tumbler_lifo_scheduler_iface_init (TumblerSchedulerIface *iface)
{
iface->push = tumbler_lifo_scheduler_push;
- iface->unqueue = tumbler_lifo_scheduler_unqueue;
+ iface->dequeue = tumbler_lifo_scheduler_dequeue;
iface->cancel_by_mount = tumbler_lifo_scheduler_cancel_by_mount;
}
@@ -239,7 +239,7 @@ tumbler_lifo_scheduler_push (TumblerScheduler
*scheduler,
static void
-tumbler_lifo_scheduler_unqueue (TumblerScheduler *scheduler,
+tumbler_lifo_scheduler_dequeue (TumblerScheduler *scheduler,
guint handle)
{
TumblerLifoScheduler *lifo_scheduler = TUMBLER_LIFO_SCHEDULER (scheduler);
@@ -249,9 +249,9 @@ tumbler_lifo_scheduler_unqueue (TumblerScheduler *scheduler,
g_mutex_lock (lifo_scheduler->mutex);
- /* unqueue all requests (usually only one) with this handle */
+ /* dequeue all requests (usually only one) with this handle */
g_list_foreach (lifo_scheduler->requests,
- (GFunc) tumbler_lifo_scheduler_unqueue_request,
+ (GFunc) tumbler_lifo_scheduler_dequeue_request,
GUINT_TO_POINTER (handle));
g_mutex_unlock (lifo_scheduler->mutex);
@@ -327,7 +327,7 @@ tumbler_lifo_scheduler_finish_request (TumblerLifoScheduler
*scheduler,
static void
-tumbler_lifo_scheduler_unqueue_request (TumblerSchedulerRequest *request,
+tumbler_lifo_scheduler_dequeue_request (TumblerSchedulerRequest *request,
gpointer user_data)
{
guint handle = GPOINTER_TO_UINT (user_data);
@@ -336,10 +336,10 @@ tumbler_lifo_scheduler_unqueue_request
(TumblerSchedulerRequest *request,
g_return_if_fail (request != NULL);
g_return_if_fail (handle != 0);
- /* mark the request as unqueued if the handles match */
+ /* mark the request as dequeued if the handles match */
if (request->handle == handle)
{
- request->unqueued = TRUE;
+ request->dequeued = TRUE;
/* cancel all thumbnails that are part of the request */
for (n = 0; n < request->length; ++n)
@@ -374,9 +374,9 @@ tumbler_lifo_scheduler_thread (gpointer data,
g_signal_emit_by_name (request->scheduler, "started", request->handle,
request->origin);
- /* finish the request if it was already unqueued */
+ /* finish the request if it was already dequeued */
g_mutex_lock (scheduler->mutex);
- if (request->unqueued)
+ if (request->dequeued)
{
tumbler_lifo_scheduler_finish_request (scheduler, request);
g_mutex_unlock (scheduler->mutex);
@@ -387,9 +387,9 @@ tumbler_lifo_scheduler_thread (gpointer data,
/* process URI by URI */
for (n = 0; request->uris[n] != NULL; ++n)
{
- /* finish the request if it was unqueued */
+ /* finish the request if it was dequeued */
g_mutex_lock (scheduler->mutex);
- if (request->unqueued)
+ if (request->dequeued)
{
tumbler_lifo_scheduler_finish_request (scheduler, request);
g_mutex_unlock (scheduler->mutex);
@@ -491,8 +491,8 @@ tumbler_lifo_scheduler_thread (gpointer data,
{
n = GPOINTER_TO_INT (lp->data);
- /* finish the request if it was unqueued */
- if (request->unqueued)
+ /* finish the request if it was dequeued */
+ if (request->dequeued)
{
g_mutex_lock (scheduler->mutex);
tumbler_lifo_scheduler_finish_request (scheduler, request);
diff --git a/tumblerd/tumbler-scheduler.c b/tumblerd/tumbler-scheduler.c
index de3e69c..11fbdb1 100644
--- a/tumblerd/tumbler-scheduler.c
+++ b/tumblerd/tumbler-scheduler.c
@@ -188,14 +188,14 @@ tumbler_scheduler_push (TumblerScheduler
*scheduler,
void
-tumbler_scheduler_unqueue (TumblerScheduler *scheduler,
+tumbler_scheduler_dequeue (TumblerScheduler *scheduler,
guint handle)
{
g_return_if_fail (TUMBLER_IS_SCHEDULER (scheduler));
g_return_if_fail (handle != 0);
- g_return_if_fail (TUMBLER_SCHEDULER_GET_IFACE (scheduler)->unqueue != NULL);
+ g_return_if_fail (TUMBLER_SCHEDULER_GET_IFACE (scheduler)->dequeue != NULL);
- TUMBLER_SCHEDULER_GET_IFACE (scheduler)->unqueue (scheduler, handle);
+ TUMBLER_SCHEDULER_GET_IFACE (scheduler)->dequeue (scheduler, handle);
}
@@ -272,7 +272,7 @@ tumbler_scheduler_request_new (const GStrv uris,
request = g_new0 (TumblerSchedulerRequest, 1);
if (origin)
request->origin = g_strdup (origin);
- request->unqueued = FALSE;
+ request->dequeued = FALSE;
request->scheduler = NULL;
request->handle = handle++;
request->uris = g_strdupv (uris);
diff --git a/tumblerd/tumbler-scheduler.h b/tumblerd/tumbler-scheduler.h
index d92a0c7..bdfc1fa 100644
--- a/tumblerd/tumbler-scheduler.h
+++ b/tumblerd/tumbler-scheduler.h
@@ -56,7 +56,7 @@ struct _TumblerSchedulerIface
/* virtual methods */
void (*push) (TumblerScheduler *scheduler,
TumblerSchedulerRequest *request);
- void (*unqueue) (TumblerScheduler *scheduler,
+ void (*dequeue) (TumblerScheduler *scheduler,
guint handle);
void (*cancel_by_mount) (TumblerScheduler *scheduler,
GMount *mount);
@@ -66,7 +66,7 @@ GType tumbler_scheduler_get_type
(void) G_GNUC_C
void tumbler_scheduler_push
(TumblerScheduler *scheduler,
TumblerSchedulerRequest *request);
-void tumbler_scheduler_unqueue
(TumblerScheduler *scheduler,
+void tumbler_scheduler_dequeue
(TumblerScheduler *scheduler,
guint
handle);
void tumbler_scheduler_cancel_by_mount
(TumblerScheduler *scheduler,
GMount
*mount);
@@ -93,7 +93,7 @@ struct _TumblerSchedulerRequest
{
TumblerThumbnailer **thumbnailers;
TumblerScheduler *scheduler;
- gboolean unqueued;
+ gboolean dequeued;
GStrv mime_hints;
GStrv uris;
guint handle;
diff --git a/tumblerd/tumbler-service-dbus.xml
b/tumblerd/tumbler-service-dbus.xml
index 59891ac..149b648 100644
--- a/tumblerd/tumbler-service-dbus.xml
+++ b/tumblerd/tumbler-service-dbus.xml
@@ -10,7 +10,7 @@
<arg type="u" name="handle" direction="out" />
</method>
- <method name="Unqueue">
+ <method name="Dequeue">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
<arg type="u" name="handle" direction="in" />
</method>
diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index 3873e6d..55f6377 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -597,7 +597,7 @@ tumbler_service_queue (TumblerService *service,
const GStrv uris,
const GStrv mime_hints,
const gchar *desired_scheduler,
- guint handle_to_unqueue,
+ guint handle_to_dequeue,
DBusGMethodInvocation *context)
{
TumblerScheduler *scheduler = NULL;
@@ -638,10 +638,10 @@ tumbler_service_queue (TumblerService *service,
/* iterate over all schedulers */
for (iter = service->schedulers; iter != NULL; iter = iter->next)
{
- /* unqueue the request with the given unqueue handle, in case this
+ /* dequeue the request with the given dequeue handle, in case this
* scheduler is responsible for the given handle */
- if (handle_to_unqueue != 0)
- tumbler_scheduler_unqueue (TUMBLER_SCHEDULER (iter->data),
handle_to_unqueue);
+ if (handle_to_dequeue != 0)
+ tumbler_scheduler_dequeue (TUMBLER_SCHEDULER (iter->data),
handle_to_dequeue);
/* determine the scheduler name */
name = tumbler_scheduler_get_name (TUMBLER_SCHEDULER (iter->data));
@@ -673,7 +673,7 @@ tumbler_service_queue (TumblerService *service,
void
-tumbler_service_unqueue (TumblerService *service,
+tumbler_service_dequeue (TumblerService *service,
guint handle,
DBusGMethodInvocation *context)
{
@@ -688,9 +688,9 @@ tumbler_service_unqueue (TumblerService *service,
/* iterate over all available schedulers */
for (iter = service->schedulers; iter != NULL; iter = iter->next)
{
- /* unqueue the request with the given unqueue handle, in case this
+ /* dequeue the request with the given dequeue handle, in case this
* scheduler is responsible for the given handle */
- tumbler_scheduler_unqueue (TUMBLER_SCHEDULER (iter->data), handle);
+ tumbler_scheduler_dequeue (TUMBLER_SCHEDULER (iter->data), handle);
}
}
diff --git a/tumblerd/tumbler-service.h b/tumblerd/tumbler-service.h
index dc35ef1..324047b 100644
--- a/tumblerd/tumbler-service.h
+++ b/tumblerd/tumbler-service.h
@@ -47,9 +47,9 @@ void tumbler_service_queue
(TumblerService *service,
const GStrv uris,
const GStrv
mime_hints,
const gchar
*s_scheduler,
- guint
handle_to_unqueue,
+ guint
handle_to_dequeue,
DBusGMethodInvocation
*context);
-void tumbler_service_unqueue (TumblerService
*service,
+void tumbler_service_dequeue (TumblerService
*service,
guint handle,
DBusGMethodInvocation
*context);
void tumbler_service_get_schedulers (TumblerService *service,
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
