Updating branch refs/heads/master to b8a4d8b76c631032d0f3d3ea1e2a56da1a05a0ba (commit) from aa56247bf15c3166a69ed114ca3349b7209a03cd (commit)
commit b8a4d8b76c631032d0f3d3ea1e2a56da1a05a0ba Author: Nick Schermer <n...@xfce.org> Date: Thu Aug 26 20:52:55 2010 +0200 Fix compiler warnings in the poppler and xdg plugins. .../poppler-thumbnailer-provider.c | 1 - plugins/poppler-thumbnailer/poppler-thumbnailer.c | 3 --- plugins/xdg-cache/xdg-cache-cache.c | 2 +- plugins/xdg-cache/xdg-cache-thumbnail.c | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/poppler-thumbnailer/poppler-thumbnailer-provider.c b/plugins/poppler-thumbnailer/poppler-thumbnailer-provider.c index a049cee..af20603 100644 --- a/plugins/poppler-thumbnailer/poppler-thumbnailer-provider.c +++ b/plugins/poppler-thumbnailer/poppler-thumbnailer-provider.c @@ -112,7 +112,6 @@ poppler_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provi NULL }; GStrv uri_schemes; - guint n; /* determine which URI schemes are supported by GIO */ uri_schemes = tumbler_util_get_supported_uri_schemes (); diff --git a/plugins/poppler-thumbnailer/poppler-thumbnailer.c b/plugins/poppler-thumbnailer/poppler-thumbnailer.c index 153a9cc..c50d25c 100644 --- a/plugins/poppler-thumbnailer/poppler-thumbnailer.c +++ b/plugins/poppler-thumbnailer/poppler-thumbnailer.c @@ -141,7 +141,6 @@ poppler_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer, TumblerFileInfo *info) { TumblerThumbnailFlavor *flavor; - GFileInputStream *stream; TumblerImageData data; TumblerThumbnail *thumbnail; PopplerDocument *document; @@ -153,8 +152,6 @@ poppler_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer, gdouble page_width; gdouble page_height; GFile *file; - gint width; - gint height; gchar *contents = NULL; gsize length; diff --git a/plugins/xdg-cache/xdg-cache-cache.c b/plugins/xdg-cache/xdg-cache-cache.c index 10bfd09..22a15a4 100644 --- a/plugins/xdg-cache/xdg-cache-cache.c +++ b/plugins/xdg-cache/xdg-cache-cache.c @@ -643,7 +643,7 @@ xdg_cache_cache_write_thumbnail_info (const gchar *filename, { if (!g_cancellable_set_error_if_cancelled (cancellable, &err)) { - mtime_str = g_strdup_printf ("%llu", mtime); + mtime_str = g_strdup_printf ("%" G_GUINT64_FORMAT, mtime); gdk_pixbuf_save (pixbuf, filename, "png", &err, "tEXt::Thumb::URI", uri, diff --git a/plugins/xdg-cache/xdg-cache-thumbnail.c b/plugins/xdg-cache/xdg-cache-thumbnail.c index 8c843d3..71448a8 100644 --- a/plugins/xdg-cache/xdg-cache-thumbnail.c +++ b/plugins/xdg-cache/xdg-cache-thumbnail.c @@ -358,7 +358,7 @@ xdg_cache_thumbnail_save_image_data (TumblerThumbnail *thumbnail, if (stream != NULL) { /* convert the modified time of the source URI to a string */ - mtime_str = g_strdup_printf ("%lld", mtime); + mtime_str = g_strdup_printf ("%" G_GUINT64_FORMAT, mtime); /* try to save the pixbuf */ if (gdk_pixbuf_save_to_stream (dest_pixbuf, G_OUTPUT_STREAM (stream), "png", _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits