[Xfce4-commits] <tumbler:master> Remove TumblerNaiveScheduler.
Jannis Pohlmann
noreply at xfce.org
Wed Oct 14 12:50:03 CEST 2009
Updating branch refs/heads/master
to 7afa5c9ca5f8718fdbef923e447438f1b8473b65 (commit)
from b79b1e603cf47232b4fd0f36bb2b2deb1e9f64a6 (commit)
commit 7afa5c9ca5f8718fdbef923e447438f1b8473b65
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Wed Oct 14 12:48:45 2009 +0200
Remove TumblerNaiveScheduler.
tumblerd/Makefile.am | 2 -
tumblerd/tumbler-naive-scheduler.c | 209 ------------------------------------
tumblerd/tumbler-naive-scheduler.h | 44 --------
tumblerd/tumbler-service.c | 1 -
4 files changed, 0 insertions(+), 256 deletions(-)
diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am
index fd9d9b0..6526dc0 100644
--- a/tumblerd/Makefile.am
+++ b/tumblerd/Makefile.am
@@ -31,8 +31,6 @@ tumblerd_SOURCES = \
tumbler-cache-service.h \
tumbler-manager.c \
tumbler-manager.h \
- tumbler-naive-scheduler.c \
- tumbler-naive-scheduler.h \
tumbler-registry.c \
tumbler-registry.h \
tumbler-scheduler.c \
diff --git a/tumblerd/tumbler-naive-scheduler.c b/tumblerd/tumbler-naive-scheduler.c
deleted file mode 100644
index e8e0bcc..0000000
--- a/tumblerd/tumbler-naive-scheduler.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/* vi:set et ai sw=2 sts=2 ts=2: */
-/*-
- * Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <tumblerd/tumbler-naive-scheduler.h>
-#include <tumblerd/tumbler-scheduler.h>
-
-
-
-/* Property identifiers */
-enum
-{
- PROP_0,
-};
-
-
-
-static void tumbler_naive_scheduler_iface_init (TumblerSchedulerIface *iface);
-static void tumbler_naive_scheduler_finalize (GObject *object);
-static void tumbler_naive_scheduler_push (TumblerScheduler *scheduler,
- TumblerSchedulerRequest *request);
-static void tumbler_naive_scheduler_thumbnailer_error (TumblerThumbnailer *thumbnailer,
- const gchar *failed_uri,
- gint error_code,
- const gchar *message,
- TumblerSchedulerRequest *request);
-static void tumbler_naive_scheduler_thumbnailer_ready (TumblerThumbnailer *thumbnailer,
- const gchar *uri,
- TumblerSchedulerRequest *request);
-
-
-
-struct _TumblerNaiveSchedulerClass
-{
- GObjectClass __parent__;
-};
-
-struct _TumblerNaiveScheduler
-{
- GObject __parent__;
-};
-
-
-
-G_DEFINE_TYPE_WITH_CODE (TumblerNaiveScheduler, tumbler_naive_scheduler, G_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (TUMBLER_TYPE_SCHEDULER,
- tumbler_naive_scheduler_iface_init));
-
-
-
-static void
-tumbler_naive_scheduler_class_init (TumblerNaiveSchedulerClass *klass)
-{
- GObjectClass *gobject_class;
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = tumbler_naive_scheduler_finalize;
-}
-
-
-
-static void
-tumbler_naive_scheduler_iface_init (TumblerSchedulerIface *iface)
-{
- iface->push = tumbler_naive_scheduler_push;
-}
-
-
-
-static void
-tumbler_naive_scheduler_init (TumblerNaiveScheduler *scheduler)
-{
-}
-
-
-
-static void
-tumbler_naive_scheduler_finalize (GObject *object)
-{
- (*G_OBJECT_CLASS (tumbler_naive_scheduler_parent_class)->finalize) (object);
-}
-
-
-
-static void
-tumbler_naive_scheduler_push (TumblerScheduler *scheduler,
- TumblerSchedulerRequest *request)
-{
- gint n;
-
- g_return_if_fail (TUMBLER_IS_NAIVE_SCHEDULER (scheduler));
- g_return_if_fail (request != NULL);
-
- /* Gain ownership over the request (sets request->scheduler) */
- tumbler_scheduler_take_request (scheduler, request);
-
- /* tell everybody that we've started processing the request */
- g_signal_emit_by_name (scheduler, "started", request->handle);
-
- /* iterate over all elements in the three arrays, assuming they all have
- * the same size */
- for (n = 0; request->uris[n] != NULL; ++n)
- {
- /* check if we have a thumbnailer for the n-th URI */
- if (request->thumbnailers[n] != NULL)
- {
- /* connect to the error signal of the thumbnailer */
- g_signal_connect (request->thumbnailers[n], "error",
- G_CALLBACK (tumbler_naive_scheduler_thumbnailer_error),
- request);
-
- /* connect to the ready signal of the thumbnailer */
- g_signal_connect (request->thumbnailers[n], "ready",
- G_CALLBACK (tumbler_naive_scheduler_thumbnailer_ready),
- request);
-
- /* tell the thumbnailer to generate the thumbnail */
- tumbler_thumbnailer_create (request->thumbnailers[n],
- request->cancellables[n],
- request->uris[n],
- request->mime_hints[n]);
-
- /* disconnect from all signals when we're finished */
- g_signal_handlers_disconnect_matched (request->thumbnailers[n],
- G_SIGNAL_MATCH_DATA,
- 0, 0, NULL, NULL, request);
- }
- else
- {
- /* TODO Emit error signal: unsupported, no thumbnailer for the URI */
- }
- }
-
- /* tell everybody that we are done with this request */
- g_signal_emit_by_name (scheduler, "finished", request->handle);
-
- /* destroy the request */
- tumbler_scheduler_request_free (request);
-}
-
-
-
-static void
-tumbler_naive_scheduler_thumbnailer_error (TumblerThumbnailer *thumbnailer,
- const gchar *failed_uri,
- gint error_code,
- const gchar *message,
- TumblerSchedulerRequest *request)
-{
- const gchar *failed_uris[] = { failed_uri, NULL };
-
- g_return_if_fail (TUMBLER_IS_THUMBNAILER (thumbnailer));
- g_return_if_fail (failed_uri != NULL);
- g_return_if_fail (request != NULL);
- g_return_if_fail (TUMBLER_IS_NAIVE_SCHEDULER (request->scheduler));
-
- /* forward the error signal */
- g_signal_emit_by_name (request->scheduler, "error", request->handle, failed_uris,
- error_code, message);
-}
-
-
-
-static void
-tumbler_naive_scheduler_thumbnailer_ready (TumblerThumbnailer *thumbnailer,
- const gchar *uri,
- TumblerSchedulerRequest *request)
-{
- const gchar *uris[] = { uri, NULL };
-
- g_return_if_fail (TUMBLER_IS_THUMBNAILER (thumbnailer));
- g_return_if_fail (uri != NULL);
- g_return_if_fail (request != NULL);
- g_return_if_fail (TUMBLER_IS_NAIVE_SCHEDULER (request->scheduler));
-
- /* forward the ready signal */
- g_signal_emit_by_name (request->scheduler, "ready", uris);
-}
-
-
-
-TumblerScheduler *
-tumbler_naive_scheduler_new (void)
-{
- return g_object_new (TUMBLER_TYPE_NAIVE_SCHEDULER, NULL);
-}
diff --git a/tumblerd/tumbler-naive-scheduler.h b/tumblerd/tumbler-naive-scheduler.h
deleted file mode 100644
index 4e12a99..0000000
--- a/tumblerd/tumbler-naive-scheduler.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* vi:set et ai sw=2 sts=2 ts=2: */
-/*-
- * Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __TUMBLER_NAIVE_SCHEDULER_H__
-#define __TUMBLER_NAIVE_SCHEDULER_H__
-
-#include <tumblerd/tumbler-scheduler.h>
-
-G_BEGIN_DECLS;
-
-#define TUMBLER_TYPE_NAIVE_SCHEDULER (tumbler_naive_scheduler_get_type ())
-#define TUMBLER_NAIVE_SCHEDULER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TUMBLER_TYPE_NAIVE_SCHEDULER, TumblerNaiveScheduler))
-#define TUMBLER_NAIVE_SCHEDULER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TUMBLER_TYPE_NAIVE_SCHEDULER, TumblerNaiveSchedulerClass))
-#define TUMBLER_IS_NAIVE_SCHEDULER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TUMBLER_TYPE_NAIVE_SCHEDULER))
-#define TUMBLER_IS_NAIVE_SCHEDULER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TUMBLER_TYPE_NAIVE_SCHEDULER)
-#define TUMBLER_NAIVE_SCHEDULER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TUMBLER_TYPE_NAIVE_SCHEDULER, TumblerNaiveSchedulerClass))
-
-typedef struct _TumblerNaiveSchedulerClass TumblerNaiveSchedulerClass;
-typedef struct _TumblerNaiveScheduler TumblerNaiveScheduler;
-
-GType tumbler_naive_scheduler_get_type (void) G_GNUC_CONST;
-
-TumblerScheduler *tumbler_naive_scheduler_new (void) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-
-G_END_DECLS;
-
-#endif /* !__TUMBLER_NAIVE_SCHEDULER_H__ */
diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c
index 2754460..3f1bb54 100644
--- a/tumblerd/tumbler-service.c
+++ b/tumblerd/tumbler-service.c
@@ -32,7 +32,6 @@
#include <tumbler/tumbler.h>
-#include <tumblerd/tumbler-naive-scheduler.h>
#include <tumblerd/tumbler-scheduler.h>
#include <tumblerd/tumbler-service.h>
#include <tumblerd/tumbler-service-dbus-bindings.h>
More information about the Xfce4-commits
mailing list