diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rwxr-xr-x | autogen.sh | 25 | ||||
| -rw-r--r-- | configure.in.in | 2 | ||||
| -rw-r--r-- | docs/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/reference/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/reference/tumbler/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/reference/tumbler/tumbler-sections.txt | 168 | ||||
| -rw-r--r-- | plugins/font-thumbnailer/font-thumbnailer.c | 1 | ||||
| -rw-r--r-- | po/LINGUAS | 0 | ||||
| -rw-r--r-- | po/POTFILES.in | 61 | ||||
| -rw-r--r-- | po/ast.po | 10 | ||||
| -rw-r--r-- | po/da.po | 10 | ||||
| -rw-r--r-- | po/en_GB.po | 10 | ||||
| -rw-r--r-- | po/tr.po | 10 | ||||
| -rw-r--r-- | po/tumbler.pot | 10 | ||||
| -rw-r--r-- | tumbler/Makefile.am | 1 | ||||
| -rw-r--r-- | tumbler/tumbler-provider-plugin.c | 2 | ||||
| -rw-r--r-- | tumbler/tumbler-provider-plugin.h | 2 | ||||
| -rw-r--r-- | tumblerd/Makefile.am | 2 |
19 files changed, 152 insertions, 172 deletions
diff --git a/Makefile.am b/Makefile.am index c9c6d97..b471695 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,11 +18,11 @@ # Boston, MA 02110-1301, USA. SUBDIRS = \ - docs \ po \ tumbler \ plugins \ - tumblerd + tumblerd \ + docs DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc @@ -29,26 +29,7 @@ EOF exit 1 } -# verify that po/LINGUAS is present -(test -f po/LINGUAS) >/dev/null 2>&1 || { - cat >&2 <<EOF -autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot - or try to checkout again. -EOF - exit 1 -} - -# substitute linguas -linguas=`sed -e '/^#/d' po/LINGUAS` - -# TODO substitute revision -revision= - -sed -e "s/@LINGUAS@/${linguas}/g" \ - -e "s/@REVISION@/${revision}/g" \ - < "configure.in.in" > "configure.in" - -# initialize GTK-Doc -gtkdocize || exit 1 +# # initialize GTK-Doc +# gtkdocize || exit 1 -exec xdt-autogen $@ +XDT_AUTOGEN_REQUIRED_VERSION="4.7.2" exec xdt-autogen $@ diff --git a/configure.in.in b/configure.in.in index 7e97787..3304013 100644 --- a/configure.in.in +++ b/configure.in.in @@ -281,8 +281,8 @@ plugins/pixbuf-thumbnailer/Makefile plugins/xdg-cache/Makefile po/Makefile.in tumbler/Makefile +tumbler/tumbler-1.pc tumbler/tumbler-config.h -tumbler/tumbler-$TUMBLER_VERSION_API.pc tumblerd/Makefile ]) diff --git a/docs/Makefile.am b/docs/Makefile.am index 848babc..de40f05 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -17,5 +17,5 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -SUBIDRS = \ +SUBDIRS = \ reference diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index f5eef03..48f84c6 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -17,5 +17,5 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, # Boston, MA 02110-1301, USA. -SUBIDRS = \ +SUBDIRS = \ tumbler diff --git a/docs/reference/tumbler/Makefile.am b/docs/reference/tumbler/Makefile.am index 8f2994f..3502ede 100644 --- a/docs/reference/tumbler/Makefile.am +++ b/docs/reference/tumbler/Makefile.am @@ -76,7 +76,7 @@ GTKDOC_LIBS = \ $(GTHREAD_LIBS) \ $(GLIB_LIBS) \ $(PNG_LIBS) \ - $(top_srcdir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la + $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la include $(top_srcdir)/gtk-doc.make diff --git a/docs/reference/tumbler/tumbler-sections.txt b/docs/reference/tumbler/tumbler-sections.txt index 38142b6..cf270e8 100644 --- a/docs/reference/tumbler/tumbler-sections.txt +++ b/docs/reference/tumbler/tumbler-sections.txt @@ -1,19 +1,17 @@ <SECTION> -<FILE>tumbler-thumbnailer</FILE> -TumblerThumbnailer -TumblerThumbnailerIface -tumbler_thumbnailer_create -tumbler_thumbnailer_get_hash_keys -tumbler_thumbnailer_get_mime_types -tumbler_thumbnailer_get_uri_schemes -tumbler_thumbnailer_array_copy -tumbler_thumbnailer_array_free +<FILE>tumbler-provider-plugin</FILE> +TumblerProviderPluginClass +TumblerProviderPlugin +tumbler_provider_plugin_new +tumbler_provider_plugin_get_types <SUBSECTION Standard> -TUMBLER_THUMBNAILER -TUMBLER_IS_THUMBNAILER -TUMBLER_TYPE_THUMBNAILER -tumbler_thumbnailer_get_type -TUMBLER_THUMBNAILER_GET_IFACE +TUMBLER_PROVIDER_PLUGIN +TUMBLER_IS_PROVIDER_PLUGIN +TUMBLER_TYPE_PROVIDER_PLUGIN +tumbler_provider_plugin_get_type +TUMBLER_PROVIDER_PLUGIN_CLASS +TUMBLER_IS_PROVIDER_PLUGIN_CLASS +TUMBLER_PROVIDER_PLUGIN_GET_CLASS </SECTION> <SECTION> @@ -50,25 +48,7 @@ TUMBLER_THUMBNAIL_GET_IFACE </SECTION> <SECTION> -<FILE>tumbler-provider-plugin</FILE> -TumblerProviderPluginPrivate -TumblerProviderPluginClass -TumblerProviderPlugin -tumbler_provider_plugin_new -tumbler_provider_plugin_get_types -<SUBSECTION Standard> -TUMBLER_PROVIDER_PLUGIN -TUMBLER_IS_PROVIDER_PLUGIN -TUMBLER_TYPE_PROVIDER_PLUGIN -tumbler_provider_plugin_get_type -TUMBLER_PROVIDER_PLUGIN_CLASS -TUMBLER_IS_PROVIDER_PLUGIN_CLASS -TUMBLER_PROVIDER_PLUGIN_GET_CLASS -</SECTION> - -<SECTION> <FILE>tumbler-provider-factory</FILE> -TumblerProviderFactoryPrivate TumblerProviderFactoryClass TumblerProviderFactory tumbler_provider_factory_get_default @@ -84,8 +64,71 @@ TUMBLER_PROVIDER_FACTORY_GET_CLASS </SECTION> <SECTION> +<FILE>tumbler-cache-provider</FILE> +TumblerCacheProvider +TumblerCacheProviderIface +tumbler_cache_provider_get_caches +<SUBSECTION Standard> +TUMBLER_CACHE_PROVIDER +TUMBLER_IS_CACHE_PROVIDER +TUMBLER_TYPE_CACHE_PROVIDER +tumbler_cache_provider_get_type +TUMBLER_CACHE_PROVIDER_GET_IFACE +</SECTION> + +<SECTION> +<FILE>tumbler-thumbnailer</FILE> +TumblerThumbnailer +TumblerThumbnailerIface +tumbler_thumbnailer_create +tumbler_thumbnailer_get_hash_keys +tumbler_thumbnailer_get_mime_types +tumbler_thumbnailer_get_uri_schemes +tumbler_thumbnailer_array_copy +tumbler_thumbnailer_array_free +<SUBSECTION Standard> +TUMBLER_THUMBNAILER +TUMBLER_IS_THUMBNAILER +TUMBLER_TYPE_THUMBNAILER +tumbler_thumbnailer_get_type +TUMBLER_THUMBNAILER_GET_IFACE +</SECTION> + +<SECTION> +<FILE>tumbler-abstract-thumbnailer</FILE> +TumblerAbstractThumbnailerPrivate +<TITLE>TumblerAbstractThumbnailer</TITLE> +TumblerAbstractThumbnailer +<SUBSECTION Standard> +TUMBLER_ABSTRACT_THUMBNAILER +TUMBLER_IS_ABSTRACT_THUMBNAILER +TUMBLER_TYPE_ABSTRACT_THUMBNAILER +tumbler_abstract_thumbnailer_get_type +TUMBLER_ABSTRACT_THUMBNAILER_CLASS +TUMBLER_IS_ABSTRACT_THUMBNAILER_CLASS +TUMBLER_ABSTRACT_THUMBNAILER_GET_CLASS +</SECTION> + +<SECTION> +<FILE>tumbler-cache</FILE> +TumblerCache +TumblerCacheIface +tumbler_cache_get_thumbnails +tumbler_cache_cleanup +tumbler_cache_delete +tumbler_cache_copy +tumbler_cache_move +tumbler_cache_is_thumbnail +<SUBSECTION Standard> +TUMBLER_CACHE +TUMBLER_IS_CACHE +TUMBLER_TYPE_CACHE +tumbler_cache_get_type +TUMBLER_CACHE_GET_IFACE +</SECTION> + +<SECTION> <FILE>tumbler-file-info</FILE> -TumblerFileInfoPrivate TumblerFileInfoClass TumblerFileInfo tumbler_file_info_new @@ -105,44 +148,19 @@ TUMBLER_FILE_INFO_GET_CLASS </SECTION> <SECTION> -<FILE>tumbler-cache</FILE> -TumblerCache -TumblerCacheIface -tumbler_cache_get_thumbnails -<SUBSECTION Standard> -TUMBLER_CACHE -TUMBLER_IS_CACHE -TUMBLER_TYPE_CACHE -tumbler_cache_get_type -TUMBLER_CACHE_GET_IFACE +<FILE>stamp-tumbler-marshal</FILE> </SECTION> <SECTION> -<FILE>tumbler-cache-provider</FILE> -TumblerCacheProvider -TumblerCacheProviderIface -tumbler_cache_provider_get_caches -<SUBSECTION Standard> -TUMBLER_CACHE_PROVIDER -TUMBLER_IS_CACHE_PROVIDER -TUMBLER_TYPE_CACHE_PROVIDER -tumbler_cache_provider_get_type -TUMBLER_CACHE_PROVIDER_GET_IFACE +<FILE>tumbler-glib-extensions</FILE> +TUMBLER_ADD_INTERFACE </SECTION> <SECTION> -<FILE>tumbler-abstract-thumbnailer</FILE> -TumblerAbstractThumbnailerPrivate -<TITLE>TumblerAbstractThumbnailer</TITLE> -TumblerAbstractThumbnailer -<SUBSECTION Standard> -TUMBLER_ABSTRACT_THUMBNAILER -TUMBLER_IS_ABSTRACT_THUMBNAILER -TUMBLER_TYPE_ABSTRACT_THUMBNAILER -tumbler_abstract_thumbnailer_get_type -TUMBLER_ABSTRACT_THUMBNAILER_CLASS -TUMBLER_IS_ABSTRACT_THUMBNAILER_CLASS -TUMBLER_ABSTRACT_THUMBNAILER_GET_CLASS +<FILE>tumbler-error</FILE> +TUMBLER_ERROR_DOMAIN +TUMBLER_ERROR +TumblerErrorEnum </SECTION> <SECTION> @@ -160,7 +178,8 @@ G_GNUC_WARN_UNUSED_RESULT </SECTION> <SECTION> -<FILE>stamp-tumbler-marshal</FILE> +<FILE>tumbler</FILE> +TUMBLER_INSIDE_TUMBLER_H </SECTION> <SECTION> @@ -170,23 +189,6 @@ tumbler_marshal_VOID__UINT_POINTER_INT_STRING </SECTION> <SECTION> -<FILE>tumbler</FILE> -TUMBLER_INSIDE_TUMBLER_H -</SECTION> - -<SECTION> -<FILE>tumbler-glib-extensions</FILE> -TUMBLER_ADD_INTERFACE -</SECTION> - -<SECTION> -<FILE>tumbler-error</FILE> -TUMBLER_ERROR_DOMAIN -TUMBLER_ERROR -TumblerErrorEnum -</SECTION> - -<SECTION> <FILE>tumbler-enum-types</FILE> TUMBLER_TYPE_THUMBNAIL_FLAVOR TumblerThumbnailFlavor diff --git a/plugins/font-thumbnailer/font-thumbnailer.c b/plugins/font-thumbnailer/font-thumbnailer.c index 4473839..c4a5fad 100644 --- a/plugins/font-thumbnailer/font-thumbnailer.c +++ b/plugins/font-thumbnailer/font-thumbnailer.c @@ -443,7 +443,6 @@ font_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer, FontThumbnailer *font_thumbnailer = FONT_THUMBNAILER (thumbnailer); GHashTable *pixbufs; GdkPixbuf *pixbuf; - GdkPixbuf *font; FT_Error ft_error; FT_Face face; guint64 mtime; diff --git a/po/LINGUAS b/po/LINGUAS deleted file mode 100644 index e69de29..0000000 --- a/po/LINGUAS +++ /dev/null diff --git a/po/POTFILES.in b/po/POTFILES.in index 59c7701..92ae67e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,31 +1,30 @@ -./tumblerd/tumbler-cache-service.c -./tumblerd/tumbler-service.c -./tumblerd/tumbler-specialized-thumbnailer.c -./tumblerd/tumbler-threshold-scheduler.c -./tumblerd/tumbler-manager.c -./tumblerd/tumbler-scheduler.c -./tumblerd/main.c -./tumblerd/tumbler-registry.c -./tumblerd/tumbler-naive-scheduler.c -./tumbler/tumbler-enum-types.c -./tumbler/tumbler-config.c -./tumbler/tumbler-1.pc -./tumbler/tumbler-cache-provider.c -./tumbler/tumbler-thumbnailer-provider.c -./tumbler/tumbler-provider-factory.c -./tumbler/tumbler-cache.c -./tumbler/tumbler-abstract-thumbnailer.c -./tumbler/tumbler-thumbnail.c -./tumbler/tumbler-file-info.c -./tumbler/tumbler-thumbnailer.c -./tumbler/tumbler-provider-plugin.c -./plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c -./plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c -./plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c -./plugins/font-thumbnailer/font-thumbnailer-plugin.c -./plugins/font-thumbnailer/font-thumbnailer.c -./plugins/font-thumbnailer/font-thumbnailer-provider.c -./plugins/xdg-cache/xdg-cache-provider.c -./plugins/xdg-cache/xdg-cache-thumbnail.c -./plugins/xdg-cache/xdg-cache-plugin.c -./plugins/xdg-cache/xdg-cache-cache.c +tumblerd/tumbler-cache-service.c +tumblerd/tumbler-service.c +tumblerd/tumbler-specialized-thumbnailer.c +tumblerd/tumbler-threshold-scheduler.c +tumblerd/tumbler-manager.c +tumblerd/tumbler-scheduler.c +tumblerd/main.c +tumblerd/tumbler-registry.c +tumblerd/tumbler-naive-scheduler.c +tumbler/tumbler-enum-types.c +tumbler/tumbler-config.c +tumbler/tumbler-cache-provider.c +tumbler/tumbler-thumbnailer-provider.c +tumbler/tumbler-provider-factory.c +tumbler/tumbler-cache.c +tumbler/tumbler-abstract-thumbnailer.c +tumbler/tumbler-thumbnail.c +tumbler/tumbler-file-info.c +tumbler/tumbler-thumbnailer.c +tumbler/tumbler-provider-plugin.c +plugins/pixbuf-thumbnailer/pixbuf-thumbnailer.c +plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c +plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c +plugins/font-thumbnailer/font-thumbnailer-plugin.c +plugins/font-thumbnailer/font-thumbnailer.c +plugins/font-thumbnailer/font-thumbnailer-provider.c +plugins/xdg-cache/xdg-cache-provider.c +plugins/xdg-cache/xdg-cache-thumbnail.c +plugins/xdg-cache/xdg-cache-plugin.c +plugins/xdg-cache/xdg-cache-cache.c @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tumbler\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-30 02:22+0200\n" +"POT-Creation-Date: 2009-09-30 02:45+0200\n" "PO-Revision-Date: 2009-09-02 16:29+0100\n" "Last-Translator: astur <malditoastur@gmail.com>\n" "Language-Team: en_GB\n" @@ -126,25 +126,25 @@ msgid "Shutting down the Tumbler Font Thumbnailer plugin" msgstr "Apagar el complementu Tumbler Pixbuf Thumbnailer" #. there was an error in the freetype initialization, abort -#: .././plugins/font-thumbnailer/font-thumbnailer.c:465 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:464 #, c-format msgid "Could not initialize freetype: %s" msgstr "" #. the font file could not be loaded, emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:498 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:497 #, fuzzy, c-format msgid "Could not open font file: %s" msgstr "Nun puede guardase miniatura en \"%s\"" #. emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:526 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:525 #, c-format msgid "Could not set the character map: %s" msgstr "" #. emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:556 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:555 #, c-format msgid "Could not render glyphs: %s" msgstr "" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Tumbler 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-30 02:22+0200\n" +"POT-Creation-Date: 2009-09-30 02:45+0200\n" "PO-Revision-Date: 2009-08-22 18:22+0100\n" "Last-Translator: Per Kongstad <p_kongstad@op.pl>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" @@ -129,25 +129,25 @@ msgid "Shutting down the Tumbler Font Thumbnailer plugin" msgstr "Lukker udvidelsesmodulet Tumbler Pixbuf Thumbnailer ned" #. there was an error in the freetype initialization, abort -#: .././plugins/font-thumbnailer/font-thumbnailer.c:465 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:464 #, c-format msgid "Could not initialize freetype: %s" msgstr "" #. the font file could not be loaded, emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:498 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:497 #, fuzzy, c-format msgid "Could not open font file: %s" msgstr "Kunne ikke gemme miniature til \"%s\"" #. emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:526 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:525 #, c-format msgid "Could not set the character map: %s" msgstr "" #. emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:556 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:555 #, c-format msgid "Could not render glyphs: %s" msgstr "" diff --git a/po/en_GB.po b/po/en_GB.po index d585ef6..4c63c7c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: tumbler\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-30 02:22+0200\n" +"POT-Creation-Date: 2009-09-30 02:45+0200\n" "PO-Revision-Date: 2009-08-18 21:35+1000\n" "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n" "Language-Team: en_GB\n" @@ -126,25 +126,25 @@ msgid "Shutting down the Tumbler Font Thumbnailer plugin" msgstr "Shutting down the Tumbler Pixbuf Thumbnailer plugin" #. there was an error in the freetype initialization, abort -#: .././plugins/font-thumbnailer/font-thumbnailer.c:465 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:464 #, c-format msgid "Could not initialize freetype: %s" msgstr "" #. the font file could not be loaded, emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:498 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:497 #, fuzzy, c-format msgid "Could not open font file: %s" msgstr "Could not save thumbnail to \"%s\"" #. emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:526 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:525 #, c-format msgid "Could not set the character map: %s" msgstr "" #. emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:556 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:555 #, c-format msgid "Could not render glyphs: %s" msgstr "" @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Xfce Tumbler Turkish Translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-30 02:22+0200\n" +"POT-Creation-Date: 2009-09-30 02:45+0200\n" "PO-Revision-Date: \n" "Last-Translator: Samed Beyribey <ras0ir@eventualis.org>\n" "Language-Team: Xfce-TR <xfce-tr@googlegroups.com>\n" @@ -121,25 +121,25 @@ msgid "Shutting down the Tumbler Font Thumbnailer plugin" msgstr "Tumbler Pixbuf Önizleyici eklentisi kapatılıyor" #. there was an error in the freetype initialization, abort -#: .././plugins/font-thumbnailer/font-thumbnailer.c:465 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:464 #, c-format msgid "Could not initialize freetype: %s" msgstr "" #. the font file could not be loaded, emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:498 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:497 #, fuzzy, c-format msgid "Could not open font file: %s" msgstr "Önizleme \"%s\" konumuna kaydedilemedi" #. emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:526 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:525 #, c-format msgid "Could not set the character map: %s" msgstr "" #. emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:556 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:555 #, c-format msgid "Could not render glyphs: %s" msgstr "" diff --git a/po/tumbler.pot b/po/tumbler.pot index 7ff7cc0..18cd4e1 100644 --- a/po/tumbler.pot +++ b/po/tumbler.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-30 02:22+0200\n" +"POT-Creation-Date: 2009-09-30 02:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -125,25 +125,25 @@ msgid "Shutting down the Tumbler Font Thumbnailer plugin" msgstr "" #. there was an error in the freetype initialization, abort -#: .././plugins/font-thumbnailer/font-thumbnailer.c:465 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:464 #, c-format msgid "Could not initialize freetype: %s" msgstr "" #. the font file could not be loaded, emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:498 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:497 #, c-format msgid "Could not open font file: %s" msgstr "" #. emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:526 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:525 #, c-format msgid "Could not set the character map: %s" msgstr "" #. emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:556 +#: .././plugins/font-thumbnailer/font-thumbnailer.c:555 #, c-format msgid "Could not render glyphs: %s" msgstr "" diff --git a/tumbler/Makefile.am b/tumbler/Makefile.am index e8c9eb7..393e99e 100644 --- a/tumbler/Makefile.am +++ b/tumbler/Makefile.am @@ -105,7 +105,6 @@ if MAINTAINER_MODE DISTCLEANFILES = \ stamp-tumbler-marshal.h \ - tumbler-1.pc \ tumbler-config.h \ $(libtumbler_built_sources) diff --git a/tumbler/tumbler-provider-plugin.c b/tumbler/tumbler-provider-plugin.c index 6c91afa..f22babd 100644 --- a/tumbler/tumbler-provider-plugin.c +++ b/tumbler/tumbler-provider-plugin.c @@ -64,7 +64,7 @@ struct _TumblerProviderPlugin -G_DEFINE_TYPE (TumblerProviderPlugin, tumbler_provider_plugin, G_TYPE_TYPE_MODULE); +G_DEFINE_TYPE (TumblerProviderPlugin, tumbler_provider_plugin, G_TYPE_TYPE_MODULE) diff --git a/tumbler/tumbler-provider-plugin.h b/tumbler/tumbler-provider-plugin.h index 1a82bd8..04cc680 100644 --- a/tumbler/tumbler-provider-plugin.h +++ b/tumbler/tumbler-provider-plugin.h @@ -39,7 +39,7 @@ G_BEGIN_DECLS; typedef struct _TumblerProviderPluginClass TumblerProviderPluginClass; typedef struct _TumblerProviderPlugin TumblerProviderPlugin; -GType tumbler_provider_plugin_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL; +GType tumbler_provider_plugin_get_type (void) G_GNUC_CONST; TumblerProviderPlugin *tumbler_provider_plugin_new (const gchar *filename) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT G_GNUC_INTERNAL; void tumbler_provider_plugin_get_types (const TumblerProviderPlugin *plugin, diff --git a/tumblerd/Makefile.am b/tumblerd/Makefile.am index fcabce0..aeaa0f9 100644 --- a/tumblerd/Makefile.am +++ b/tumblerd/Makefile.am @@ -44,7 +44,7 @@ tumblerd_SOURCES = \ tumbler-threshold-scheduler.c \ tumbler-threshold-scheduler.h \ tumbler-utils.h \ - $(tumbler_built_sources) + $(tumblerd_built_sources) tumblerd_CFLAGS = \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ |