[Xfce4-commits] <tumbler:master> Remove obsolete provider files. Fix include in tumbler-file-info.c.
Jannis Pohlmann
noreply at xfce.org
Tue Oct 27 18:08:01 CET 2009
Updating branch refs/heads/master
to 58225d511ab19cea99944e496d493b7d3a3b1026 (commit)
from ae5d1fcdbd406efa945a9ff631991bc08b1fa31e (commit)
commit 58225d511ab19cea99944e496d493b7d3a3b1026
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Tue Oct 27 18:06:09 2009 +0100
Remove obsolete provider files. Fix include in tumbler-file-info.c.
plugins/xdg-cache/xdg-cache-provider.c | 116 --------------------------------
plugins/xdg-cache/xdg-cache-provider.h | 45 ------------
tumbler/tumbler-file-info.c | 19 ++---
3 files changed, 8 insertions(+), 172 deletions(-)
diff --git a/plugins/xdg-cache/xdg-cache-provider.c b/plugins/xdg-cache/xdg-cache-provider.c
deleted file mode 100644
index 21a279a..0000000
--- a/plugins/xdg-cache/xdg-cache-provider.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* vi:set et ai sw=2 sts=2 ts=2: */
-/*-
- * Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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 Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General
- * Public License along with this library; 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 <tumbler/tumbler.h>
-
-#include <xdg-cache/xdg-cache-cache.h>
-#include <xdg-cache/xdg-cache-provider.h>
-
-
-
-static void xdg_cache_provider_cache_provider_init (TumblerCacheProviderIface *iface);
-static GList *xdg_cache_provider_get_caches (TumblerCacheProvider *provider);
-
-
-
-struct _XDGCacheProviderClass
-{
- GObjectClass __parent__;
-};
-
-struct _XDGCacheProvider
-{
- GObject __parent__;
-};
-
-
-
-G_DEFINE_DYNAMIC_TYPE_EXTENDED (XDGCacheProvider,
- xdg_cache_provider,
- G_TYPE_OBJECT,
- 0,
- TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_CACHE_PROVIDER,
- xdg_cache_provider_cache_provider_init));
-
-
-
-void
-xdg_cache_provider_register (TumblerProviderPlugin *plugin)
-{
- xdg_cache_provider_register_type (G_TYPE_MODULE (plugin));
-}
-
-
-
-static void
-xdg_cache_provider_class_init (XDGCacheProviderClass *klass)
-{
- GObjectClass *gobject_class;
-
- /* Determine the parent type class */
- xdg_cache_provider_parent_class = g_type_class_peek_parent (klass);
-
- gobject_class = G_OBJECT_CLASS (klass);
-}
-
-
-
-static void
-xdg_cache_provider_class_finalize (XDGCacheProviderClass *klass)
-{
-}
-
-
-
-static void
-xdg_cache_provider_cache_provider_init (TumblerCacheProviderIface *iface)
-{
- iface->get_caches = xdg_cache_provider_get_caches;
-}
-
-
-
-static void
-xdg_cache_provider_init (XDGCacheProvider *provider)
-{
-}
-
-
-
-static GList *
-xdg_cache_provider_get_caches (TumblerCacheProvider *provider)
-{
- XDGCacheCache *cache;
- GList *caches = NULL;
-
- g_return_val_if_fail (XDG_CACHE_IS_PROVIDER (provider), NULL);
-
- cache = g_object_new (XDG_CACHE_TYPE_CACHE, NULL);
- caches = g_list_append (caches, cache);
-
- return caches;
-}
diff --git a/plugins/xdg-cache/xdg-cache-provider.h b/plugins/xdg-cache/xdg-cache-provider.h
deleted file mode 100644
index e6938f9..0000000
--- a/plugins/xdg-cache/xdg-cache-provider.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* vi:set et ai sw=2 sts=2 ts=2: */
-/*-
- * Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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 Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __XDG_CACHE_PROVIDER_H__
-#define __XDG_CACHE_PROVIDER_H__
-
-#include <glib-object.h>
-
-#include <tumbler/tumbler.h>
-
-G_BEGIN_DECLS;
-
-#define XDG_CACHE_TYPE_PROVIDER (xdg_cache_provider_get_type ())
-#define XDG_CACHE_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XDG_CACHE_TYPE_PROVIDER, XDGCacheProvider))
-#define XDG_CACHE_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XDG_CACHE_TYPE_PROVIDER, XDGCacheProviderClass))
-#define XDG_CACHE_IS_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XDG_CACHE_TYPE_PROVIDER))
-#define XDG_CACHE_IS_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XDG_CACHE_TYPE_PROVIDER)
-#define XDG_CACHE_PROVIDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XDG_CACHE_TYPE_PROVIDER, XDGCacheProviderClass))
-
-typedef struct _XDGCacheProviderClass XDGCacheProviderClass;
-typedef struct _XDGCacheProvider XDGCacheProvider;
-
-GType xdg_cache_provider_get_type (void) G_GNUC_CONST;
-void xdg_cache_provider_register (TumblerProviderPlugin *plugin);
-
-G_END_DECLS;
-
-#endif /* !__XDG_CACHE_PROVIDER_H__ */
diff --git a/tumbler/tumbler-file-info.c b/tumbler/tumbler-file-info.c
index aaac622..ece1bd1 100644
--- a/tumbler/tumbler-file-info.c
+++ b/tumbler/tumbler-file-info.c
@@ -29,8 +29,6 @@
#include <tumbler/tumbler-cache.h>
#include <tumbler/tumbler-error.h>
#include <tumbler/tumbler-file-info.h>
-#include <tumbler/tumbler-provider-factory.h>
-#include <tumbler/tumbler-cache-provider.h>
#include <tumbler/tumbler-thumbnail.h>
#include <tumbler/tumbler-thumbnail-flavor.h>
@@ -237,15 +235,14 @@ tumbler_file_info_load (TumblerFileInfo *info,
GCancellable *cancellable,
GError **error)
{
- TumblerProviderFactory *provider_factory;
- TumblerCache *cache;
- GFileInfo *file_info;
- GError *err = NULL;
- GFile *file;
- GList *cp;
- GList *lp;
- GList *thumbnails;
- GList *tp;
+ TumblerCache *cache;
+ GFileInfo *file_info;
+ GError *err = NULL;
+ GFile *file;
+ GList *cp;
+ GList *lp;
+ GList *thumbnails;
+ GList *tp;
g_return_val_if_fail (TUMBLER_IS_FILE_INFO (info), FALSE);
g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), FALSE);
More information about the Xfce4-commits
mailing list