[Xfce4-commits] <tumbler:master> Rename PixbufThumbnailerThumbnailer to PixbufThumbnailer. More renames.
Jannis Pohlmann
noreply at xfce.org
Wed Sep 30 02:24:03 CEST 2009
Updating branch refs/heads/master
to bf87845cd35e6db1abe4e497c502993a5296baee (commit)
from 0fdef5f7449026d9d2bb0da25ef7c3c1846609e2 (commit)
commit bf87845cd35e6db1abe4e497c502993a5296baee
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Wed Sep 30 00:07:28 2009 +0200
Rename PixbufThumbnailerThumbnailer to PixbufThumbnailer. More renames.
plugins/pixbuf-thumbnailer/Makefile.am | 4 +-
.../pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c | 6 +-
.../pixbuf-thumbnailer-provider.c | 26 ++++++------
.../pixbuf-thumbnailer-provider.h | 12 +++---
.../pixbuf-thumbnailer-thumbnailer.h | 43 --------------------
...mbnailer-thumbnailer.c => pixbuf-thumbnailer.c} | 36 ++++++++--------
plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.h | 43 ++++++++++++++++++++
7 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/plugins/pixbuf-thumbnailer/Makefile.am b/plugins/pixbuf-thumbnailer/Makefile.am
index c37e99c..1eefd30 100644
--- a/plugins/pixbuf-thumbnailer/Makefile.am
+++ b/plugins/pixbuf-thumbnailer/Makefile.am
@@ -27,8 +27,8 @@ tumbler_pixbuf_thumbnailer_la_SOURCES = \
pixbuf-thumbnailer-plugin.c \
pixbuf-thumbnailer-provider.c \
pixbuf-thumbnailer-provider.h \
- pixbuf-thumbnailer-thumbnailer.c \
- pixbuf-thumbnailer-thumbnailer.h
+ pixbuf-thumbnailer.c \
+ pixbuf-thumbnailer.h
tumbler_pixbuf_thumbnailer_la_CFLAGS = \
-I$(top_builddir) \
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c
index d4beb77..0cf1fc3 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c
@@ -29,7 +29,7 @@
#include <tumbler/tumbler.h>
#include <pixbuf-thumbnailer/pixbuf-thumbnailer-provider.h>
-#include <pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.h>
+#include <pixbuf-thumbnailer/pixbuf-thumbnailer.h>
@@ -63,11 +63,11 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
#endif
/* register the types provided by this plugin */
- pixbuf_thumbnailer_thumbnailer_register (plugin);
+ pixbuf_thumbnailer_register (plugin);
pixbuf_thumbnailer_provider_register (plugin);
/* set up the plugin provider type list */
- type_list[0] = PIXBUF_THUMBNAILER_TYPE_PROVIDER;
+ type_list[0] = TYPE_PIXBUF_THUMBNAILER_PROVIDER;
}
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
index 49b6b2d..0726029 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
@@ -30,7 +30,7 @@
#include <tumbler/tumbler.h>
#include <pixbuf-thumbnailer/pixbuf-thumbnailer-provider.h>
-#include <pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.h>
+#include <pixbuf-thumbnailer/pixbuf-thumbnailer.h>
@@ -103,17 +103,17 @@ pixbuf_thumbnailer_provider_init (PixbufThumbnailerProvider *provider)
static GList *
pixbuf_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provider)
{
- PixbufThumbnailerThumbnailer *thumbnailer;
- static const gchar *uri_schemes[] = { "file", "sftp", "http", NULL, };
- GHashTable *types;
- GSList *formats;
- GSList *fp;
- GList *keys;
- GList *lp;
- GList *thumbnailers = NULL;
- GStrv format_types;
- GStrv mime_types;
- gint n;
+ PixbufThumbnailer *thumbnailer;
+ static const gchar *uri_schemes[] = { "file", "sftp", "http", NULL, };
+ GHashTable *types;
+ GSList *formats;
+ GSList *fp;
+ GList *keys;
+ GList *lp;
+ GList *thumbnailers = NULL;
+ GStrv format_types;
+ GStrv mime_types;
+ gint n;
/* create a hash table to collect unique MIME types */
types = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@@ -156,7 +156,7 @@ pixbuf_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provid
mime_types[n] = NULL;
/* create the pixbuf thumbnailer */
- thumbnailer = g_object_new (PIXBUF_THUMBNAILER_TYPE_THUMBNAILER,
+ thumbnailer = g_object_new (TYPE_PIXBUF_THUMBNAILER,
"uri-schemes", uri_schemes, "mime-types", mime_types,
NULL);
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.h b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.h
index c364f02..e41f380 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.h
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.h
@@ -25,12 +25,12 @@
G_BEGIN_DECLS;
-#define PIXBUF_THUMBNAILER_TYPE_PROVIDER (pixbuf_thumbnailer_provider_get_type ())
-#define PIXBUF_THUMBNAILER_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIXBUF_THUMBNAILER_TYPE_PROVIDER, PixbufThumbnailerProvider))
-#define PIXBUF_THUMBNAILER_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIXBUF_THUMBNAILER_TYPE_PROVIDER, PixbufThumbnailerProviderClass))
-#define PIXBUF_THUMBNAILER_IS_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIXBUF_THUMBNAILER_TYPE_PROVIDER))
-#define PIXBUF_THUMBNAILER_IS_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIXBUF_THUMBNAILER_TYPE_PROVIDER)
-#define PIXBUF_THUMBNAILER_PROVIDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIXBUF_THUMBNAILER_TYPE_PROVIDER, PixbufThumbnailerProviderClass))
+#define TYPE_PIXBUF_THUMBNAILER_PROVIDER (pixbuf_thumbnailer_provider_get_type ())
+#define PIXBUF_THUMBNAILER_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXBUF_THUMBNAILER_PROVIDER, PixbufThumbnailerProvider))
+#define PIXBUF_THUMBNAILER_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXBUF_THUMBNAILER_PROVIDER, PixbufThumbnailerProviderClass))
+#define IS_PIXBUF_THUMBNAILER_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXBUF_THUMBNAILER_PROVIDER))
+#define IS_PIXBUF_THUMBNAILER_PROVIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXBUF_THUMBNAILER_PROVIDER)
+#define PIXBUF_THUMBNAILER_PROVIDER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXBUF_THUMBNAILER_PROVIDER, PixbufThumbnailerProviderClass))
typedef struct _PixbufThumbnailerProviderClass PixbufThumbnailerProviderClass;
typedef struct _PixbufThumbnailerProvider PixbufThumbnailerProvider;
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.h b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.h
deleted file mode 100644
index 3570c00..0000000
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.h
+++ /dev/null
@@ -1,43 +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 __PIXBUF_THUMBNAILER_THUMBNAILER_H__
-#define __PIXBUF_THUMBNAILER_THUMBNAILER_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS;
-
-#define PIXBUF_THUMBNAILER_TYPE_THUMBNAILER (pixbuf_thumbnailer_thumbnailer_get_type ())
-#define PIXBUF_THUMBNAILER_THUMBNAILER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIXBUF_THUMBNAILER_TYPE_THUMBNAILER, PixbufThumbnailerThumbnailer))
-#define PIXBUF_THUMBNAILER_THUMBNAILER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PIXBUF_THUMBNAILER_TYPE_THUMBNAILER, PixbufThumbnailerThumbnailerClass))
-#define PIXBUF_THUMBNAILER_IS_THUMBNAILER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIXBUF_THUMBNAILER_TYPE_THUMBNAILER))
-#define PIXBUF_THUMBNAILER_IS_THUMBNAILER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIXBUF_THUMBNAILER_TYPE_THUMBNAILER)
-#define PIXBUF_THUMBNAILER_THUMBNAILER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PIXBUF_THUMBNAILER_TYPE_THUMBNAILER, PixbufThumbnailerThumbnailerClass))
-
-typedef struct _PixbufThumbnailerThumbnailerClass PixbufThumbnailerThumbnailerClass;
-typedef struct _PixbufThumbnailerThumbnailer PixbufThumbnailerThumbnailer;
-
-GType pixbuf_thumbnailer_thumbnailer_get_type (void) G_GNUC_CONST;
-void pixbuf_thumbnailer_thumbnailer_register (TumblerProviderPlugin *plugin);
-
-G_END_DECLS;
-
-#endif /* !__PIXBUF_THUMBNAILER_THUMBNAILER_H__ */
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.c b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
similarity index 83%
rename from plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.c
rename to plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
index db83f27..109a375 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c
@@ -31,62 +31,62 @@
#include <tumbler/tumbler.h>
-#include <pixbuf-thumbnailer/pixbuf-thumbnailer-thumbnailer.h>
+#include <pixbuf-thumbnailer/pixbuf-thumbnailer.h>
-static void pixbuf_thumbnailer_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
- const gchar *uri,
- const gchar *mime_hint);
+static void pixbuf_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
+ const gchar *uri,
+ const gchar *mime_hint);
-struct _PixbufThumbnailerThumbnailerClass
+struct _PixbufThumbnailerClass
{
TumblerAbstractThumbnailerClass __parent__;
};
-struct _PixbufThumbnailerThumbnailer
+struct _PixbufThumbnailer
{
TumblerAbstractThumbnailer __parent__;
};
-G_DEFINE_DYNAMIC_TYPE (PixbufThumbnailerThumbnailer,
- pixbuf_thumbnailer_thumbnailer,
+G_DEFINE_DYNAMIC_TYPE (PixbufThumbnailer,
+ pixbuf_thumbnailer,
TUMBLER_TYPE_ABSTRACT_THUMBNAILER);
void
-pixbuf_thumbnailer_thumbnailer_register (TumblerProviderPlugin *plugin)
+pixbuf_thumbnailer_register (TumblerProviderPlugin *plugin)
{
- pixbuf_thumbnailer_thumbnailer_register_type (G_TYPE_MODULE (plugin));
+ pixbuf_thumbnailer_register_type (G_TYPE_MODULE (plugin));
}
static void
-pixbuf_thumbnailer_thumbnailer_class_init (PixbufThumbnailerThumbnailerClass *klass)
+pixbuf_thumbnailer_class_init (PixbufThumbnailerClass *klass)
{
TumblerAbstractThumbnailerClass *abstractthumbnailer_class;
abstractthumbnailer_class = TUMBLER_ABSTRACT_THUMBNAILER_CLASS (klass);
- abstractthumbnailer_class->create = pixbuf_thumbnailer_thumbnailer_create;
+ abstractthumbnailer_class->create = pixbuf_thumbnailer_create;
}
static void
-pixbuf_thumbnailer_thumbnailer_class_finalize (PixbufThumbnailerThumbnailerClass *klass)
+pixbuf_thumbnailer_class_finalize (PixbufThumbnailerClass *klass)
{
}
static void
-pixbuf_thumbnailer_thumbnailer_init (PixbufThumbnailerThumbnailer *thumbnailer)
+pixbuf_thumbnailer_init (PixbufThumbnailer *thumbnailer)
{
}
@@ -139,9 +139,9 @@ generate_pixbuf (GdkPixbuf *source,
static void
-pixbuf_thumbnailer_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
- const gchar *uri,
- const gchar *mime_hint)
+pixbuf_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
+ const gchar *uri,
+ const gchar *mime_hint)
{
TumblerThumbnailFlavor *flavors;
TumblerThumbnailFlavor flavor;
@@ -157,7 +157,7 @@ pixbuf_thumbnailer_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
GList *thumbnails;
guint n;
- g_return_if_fail (PIXBUF_THUMBNAILER_IS_THUMBNAILER (thumbnailer));
+ g_return_if_fail (IS_PIXBUF_THUMBNAILER (thumbnailer));
g_return_if_fail (uri != NULL && *uri != '\0');
/* create the file info for this URI */
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.h b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.h
new file mode 100644
index 0000000..ec77338
--- /dev/null
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.h
@@ -0,0 +1,43 @@
+/* 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 __PIXBUF_THUMBNAILER_H__
+#define __PIXBUF_THUMBNAILER_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS;
+
+#define TYPE_PIXBUF_THUMBNAILER (pixbuf_thumbnailer_get_type ())
+#define PIXBUF_THUMBNAILER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXBUF_THUMBNAILER, PixbufThumbnailer))
+#define PIXBUF_THUMBNAILER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXBUF_THUMBNAILER, PixbufThumbnailerClass))
+#define IS_PIXBUF_THUMBNAILER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXBUF_THUMBNAILER))
+#define IS_PIXBUF_THUMBNAILER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXBUF_THUMBNAILER)
+#define PIXBUF_THUMBNAILER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXBUF_THUMBNAILER, PixbufThumbnailerClass))
+
+typedef struct _PixbufThumbnailerClass PixbufThumbnailerClass;
+typedef struct _PixbufThumbnailer PixbufThumbnailer;
+
+GType pixbuf_thumbnailer_get_type (void) G_GNUC_CONST;
+void pixbuf_thumbnailer_register (TumblerProviderPlugin *plugin);
+
+G_END_DECLS;
+
+#endif /* !__PIXBUF_THUMBNAILER_H__ */
More information about the Xfce4-commits
mailing list