Fix compilation warnings

16 files changed, 60 insertions, 52 deletions

diff --git a/plugins/cover-thumbnailer/cover-thumbnailer-provider.c b/plugins/cover-thumbnailer/cover-thumbnailer-provider.c
index d646dee..c3015aa 100644
--- a/plugins/cover-thumbnailer/cover-thumbnailer-provider.c
+++ b/plugins/cover-thumbnailer/cover-thumbnailer-provider.c
@@ -57,8 +57,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (CoverThumbnailerProvider,
                                 cover_thumbnailer_provider,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
-                                                       cover_thumbnailer_provider_thumbnailer_provider_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
+                                                               cover_thumbnailer_provider_thumbnailer_provider_init));
 
 
 
diff --git a/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c b/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c
index 1054adc..6de3480 100644
--- a/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c
+++ b/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c
@@ -54,8 +54,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (DesktopThumbnailerProvider,
                                 desktop_thumbnailer_provider,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
-                                                       desktop_thumbnailer_provider_thumbnailer_provider_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
+                                                               desktop_thumbnailer_provider_thumbnailer_provider_init));
 
 
 
diff --git a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-provider.c b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-provider.c
index 23b1c87..a143546 100644
--- a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-provider.c
+++ b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-provider.c
@@ -56,8 +56,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (FfmpegThumbnailerProvider,
                                 ffmpeg_thumbnailer_provider,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
-                                                       ffmpeg_thumbnailer_provider_thumbnailer_provider_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
+                                                               ffmpeg_thumbnailer_provider_thumbnailer_provider_init));
 
 
 
diff --git a/plugins/font-thumbnailer/font-thumbnailer-provider.c b/plugins/font-thumbnailer/font-thumbnailer-provider.c
index cc7a873..e8f7571 100644
--- a/plugins/font-thumbnailer/font-thumbnailer-provider.c
+++ b/plugins/font-thumbnailer/font-thumbnailer-provider.c
@@ -55,8 +55,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (FontThumbnailerProvider,
                                 font_thumbnailer_provider,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
-                                                       font_thumbnailer_provider_thumbnailer_provider_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
+                                                               font_thumbnailer_provider_thumbnailer_provider_init));
 
 
 
diff --git a/plugins/font-thumbnailer/font-thumbnailer.c b/plugins/font-thumbnailer/font-thumbnailer.c
index d975298..bd02c8e 100644
--- a/plugins/font-thumbnailer/font-thumbnailer.c
+++ b/plugins/font-thumbnailer/font-thumbnailer.c
@@ -174,12 +174,12 @@ render_glyph (GdkPixbuf *pixbuf,
   height = gdk_pixbuf_get_height (pixbuf);
   rowstride = gdk_pixbuf_get_rowstride (pixbuf);
 
-  for (j = 0; j < slot->bitmap.rows; ++j)
+  for (j = 0; (guint) j < slot->bitmap.rows; ++j)
     {
       if (j + off_y < 0 || j + off_y >= height)
         continue;
 
-      for (i = 0; i < slot->bitmap.width; ++i)
+      for (i = 0; (guint) i < slot->bitmap.width; ++i)
         {
           if (i + off_x < 0 || i + off_x >= width)
             continue;
diff --git a/plugins/gepub-thumbnailer/gepub-thumbnailer-provider.c b/plugins/gepub-thumbnailer/gepub-thumbnailer-provider.c
index 2204bd3..bba2323 100644
--- a/plugins/gepub-thumbnailer/gepub-thumbnailer-provider.c
+++ b/plugins/gepub-thumbnailer/gepub-thumbnailer-provider.c
@@ -54,8 +54,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (GepubThumbnailerProvider,
                                 gepub_thumbnailer_provider,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
-                                                       gepub_thumbnailer_provider_thumbnailer_provider_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
+                                                               gepub_thumbnailer_provider_thumbnailer_provider_init));
 
 
 
diff --git a/plugins/gepub-thumbnailer/gepub-thumbnailer.c b/plugins/gepub-thumbnailer/gepub-thumbnailer.c
index acd0fd3..ca2175b 100644
--- a/plugins/gepub-thumbnailer/gepub-thumbnailer.c
+++ b/plugins/gepub-thumbnailer/gepub-thumbnailer.c
@@ -252,29 +252,30 @@ gepub_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
       pixbuf = gepub_thumbnailer_create_from_mime (cover_mime, content,
                                                    thumbnail,
                                                    &error);
+      if (pixbuf != NULL)
+        {
+          data.data = gdk_pixbuf_get_pixels (pixbuf);
+          data.has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
+          data.bits_per_sample = gdk_pixbuf_get_bits_per_sample (pixbuf);
+          data.width = gdk_pixbuf_get_width (pixbuf);
+          data.height = gdk_pixbuf_get_height (pixbuf);
+          data.rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+          data.colorspace = (TumblerColorspace) gdk_pixbuf_get_colorspace (pixbuf);
+
+          tumbler_thumbnail_save_image_data (thumbnail, &data,
+                                             tumbler_file_info_get_mtime (info),
+                                             NULL, &error);
+
+          g_object_unref (pixbuf);
+        }
+
       g_free (cover_mime);
       g_free (path);
       g_object_unref (doc);
+      g_object_unref (thumbnail);
     }
   g_object_unref (file);
 
-  if (pixbuf != NULL)
-    {
-      data.data = gdk_pixbuf_get_pixels (pixbuf);
-      data.has_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
-      data.bits_per_sample = gdk_pixbuf_get_bits_per_sample (pixbuf);
-      data.width = gdk_pixbuf_get_width (pixbuf);
-      data.height = gdk_pixbuf_get_height (pixbuf);
-      data.rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-      data.colorspace = (TumblerColorspace) gdk_pixbuf_get_colorspace (pixbuf);
-
-      tumbler_thumbnail_save_image_data (thumbnail, &data,
-                                         tumbler_file_info_get_mtime (info),
-                                         NULL, &error);
-
-      g_object_unref (pixbuf);
-    }
-
   if (error != NULL)
     {
       g_signal_emit_by_name (thumbnailer, "error", uri, error->code,
@@ -285,6 +286,4 @@ gepub_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
     {
       g_signal_emit_by_name (thumbnailer, "ready", uri);
     }
-
-  g_object_unref (thumbnail);
 }
diff --git a/plugins/gst-thumbnailer/gst-thumbnailer-provider.c b/plugins/gst-thumbnailer/gst-thumbnailer-provider.c
index f658110..dd3d66a 100644
--- a/plugins/gst-thumbnailer/gst-thumbnailer-provider.c
+++ b/plugins/gst-thumbnailer/gst-thumbnailer-provider.c
@@ -56,8 +56,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (GstThumbnailerProvider,
                                 gst_thumbnailer_provider,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
-                                                       gst_thumbnailer_provider_thumbnailer_provider_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
+                                                               gst_thumbnailer_provider_thumbnailer_provider_init));
 
 
 
diff --git a/plugins/jpeg-thumbnailer/jpeg-thumbnailer-provider.c b/plugins/jpeg-thumbnailer/jpeg-thumbnailer-provider.c
index 773957c..e53c123 100644
--- a/plugins/jpeg-thumbnailer/jpeg-thumbnailer-provider.c
+++ b/plugins/jpeg-thumbnailer/jpeg-thumbnailer-provider.c
@@ -55,8 +55,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (JPEGThumbnailerProvider,
                                 jpeg_thumbnailer_provider,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
-                                                       jpeg_thumbnailer_provider_thumbnailer_provider_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
+                                                               jpeg_thumbnailer_provider_thumbnailer_provider_init));
 
 
 
diff --git a/plugins/jpeg-thumbnailer/jpeg-thumbnailer.c b/plugins/jpeg-thumbnailer/jpeg-thumbnailer.c
index e3c6348..7c90aba 100644
--- a/plugins/jpeg-thumbnailer/jpeg-thumbnailer.c
+++ b/plugins/jpeg-thumbnailer/jpeg-thumbnailer.c
@@ -75,6 +75,8 @@
 
 
 static void fatal_error_handler     (j_common_ptr                cinfo) G_GNUC_NORETURN;
+static void tvtj_free               (guchar                     *pixels,
+                                     gpointer                    data);
 static void jpeg_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
                                      GCancellable               *cancellable,
                                      TumblerFileInfo            *info);
@@ -156,6 +158,15 @@ fatal_error_handler (j_common_ptr cinfo)
 
 
 
+static void
+tvtj_free (guchar   *pixels,
+           gpointer  data)
+{
+  g_free (pixels);
+}
+
+
+
 static gboolean
 tvtj_fill_input_buffer (j_decompress_ptr cinfo)
 {
@@ -361,7 +372,7 @@ tvtj_jpeg_load (const JOCTET *content,
                                    (cinfo.out_color_components == 4), 8,
                                    cinfo.output_width, cinfo.output_height,
                                    cinfo.output_width * out_num_components,
-                                   (GdkPixbufDestroyNotify) g_free, NULL);
+                                   tvtj_free, NULL);
 
 error:
   jpeg_destroy_decompress (&cinfo);
@@ -673,7 +684,7 @@ tvtj_exif_extract_thumbnail (const guchar *data,
               thumb = gdk_pixbuf_new_from_data (g_memdup (data + exif.thumb_tiff.offset, exif.thumb_tiff.length),
                                                 GDK_COLORSPACE_RGB, FALSE, 8, exif.thumb_tiff.width,
                                                 exif.thumb_tiff.height, exif.thumb_tiff.width,
-                                                (GdkPixbufDestroyNotify) g_free, NULL);
+                                                tvtj_free, NULL);
             }
         }
 
diff --git a/plugins/odf-thumbnailer/odf-thumbnailer-provider.c b/plugins/odf-thumbnailer/odf-thumbnailer-provider.c
index c1bac4d..b76c93d 100644
--- a/plugins/odf-thumbnailer/odf-thumbnailer-provider.c
+++ b/plugins/odf-thumbnailer/odf-thumbnailer-provider.c
@@ -56,8 +56,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (OdfThumbnailerProvider,
                                 odf_thumbnailer_provider,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
-                                                       odf_thumbnailer_provider_thumbnailer_provider_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
+                                                               odf_thumbnailer_provider_thumbnailer_provider_init));
 
 
 
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
index 7b9e133..2e12a20 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
@@ -55,8 +55,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (PixbufThumbnailerProvider,
                                 pixbuf_thumbnailer_provider,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
-                                                       pixbuf_thumbnailer_provider_thumbnailer_provider_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
+                                                               pixbuf_thumbnailer_provider_thumbnailer_provider_init));
 
 
 
diff --git a/plugins/poppler-thumbnailer/poppler-thumbnailer-provider.c b/plugins/poppler-thumbnailer/poppler-thumbnailer-provider.c
index ac509dc..6abd02e 100644
--- a/plugins/poppler-thumbnailer/poppler-thumbnailer-provider.c
+++ b/plugins/poppler-thumbnailer/poppler-thumbnailer-provider.c
@@ -55,8 +55,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (PopplerThumbnailerProvider,
                                 poppler_thumbnailer_provider,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
-                                                       poppler_thumbnailer_provider_thumbnailer_provider_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
+                                                               poppler_thumbnailer_provider_thumbnailer_provider_init));
 
 
 
diff --git a/plugins/raw-thumbnailer/raw-thumbnailer-provider.c b/plugins/raw-thumbnailer/raw-thumbnailer-provider.c
index 1e48a81..5677a66 100644
--- a/plugins/raw-thumbnailer/raw-thumbnailer-provider.c
+++ b/plugins/raw-thumbnailer/raw-thumbnailer-provider.c
@@ -55,8 +55,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (RawThumbnailerProvider,
                                 raw_thumbnailer_provider,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
-                                                       raw_thumbnailer_provider_thumbnailer_provider_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_THUMBNAILER_PROVIDER,
+                                                               raw_thumbnailer_provider_thumbnailer_provider_init));
 
 
 
diff --git a/plugins/xdg-cache/xdg-cache-cache.c b/plugins/xdg-cache/xdg-cache-cache.c
index d68db3e..14fd33f 100644
--- a/plugins/xdg-cache/xdg-cache-cache.c
+++ b/plugins/xdg-cache/xdg-cache-cache.c
@@ -82,8 +82,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (XDGCacheCache,
                                 xdg_cache_cache,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_CACHE,
-                                                       xdg_cache_cache_iface_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_CACHE,
+                                                               xdg_cache_cache_iface_init));
 
 
 
@@ -146,8 +146,7 @@ xdg_cache_cache_finalize (GObject *object)
 {
   XDGCacheCache *cache = XDG_CACHE_CACHE (object);
 
-  g_list_foreach (cache->flavors, (GFunc) g_object_unref, NULL);
-  g_list_free (cache->flavors);
+  g_list_free_full (cache->flavors, g_object_unref);
 }
 
 
diff --git a/plugins/xdg-cache/xdg-cache-thumbnail.c b/plugins/xdg-cache/xdg-cache-thumbnail.c
index e5d8344..441212e 100644
--- a/plugins/xdg-cache/xdg-cache-thumbnail.c
+++ b/plugins/xdg-cache/xdg-cache-thumbnail.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <glib-object.h>
 #include <gio/gio.h>
@@ -98,8 +97,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (XDGCacheThumbnail,
                                 xdg_cache_thumbnail,
                                 G_TYPE_OBJECT,
                                 0,
-                                TUMBLER_ADD_INTERFACE (TUMBLER_TYPE_THUMBNAIL,
-                                                       xdg_cache_thumbnail_thumbnail_init));
+                                G_IMPLEMENT_INTERFACE_DYNAMIC (TUMBLER_TYPE_THUMBNAIL,
+                                                               xdg_cache_thumbnail_thumbnail_init));