Cleanup, remove private structs and use G_DEFINE_TYPE where possible.

This commit also contains a few fixes though.

1 files changed, 15 insertions, 12 deletions

diff --git a/tumbler/tumbler-thumbnailer-provider.c b/tumbler/tumbler-thumbnailer-provider.c
index 920f71c..ddb6161 100644
--- a/tumbler/tumbler-thumbnailer-provider.c
+++ b/tumbler/tumbler-thumbnailer-provider.c
@@ -29,22 +29,25 @@
 GType
 tumbler_thumbnailer_provider_get_type (void)
 {
-  static GType type = G_TYPE_INVALID;
+  static volatile gsize g_define_type_id__volatile = 0;
   
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
+  if (g_once_init_enter (&g_define_type_id__volatile))
     {
-      type = g_type_register_static_simple (G_TYPE_INTERFACE,
-                                            "TumblerThumbnailerProvider",
-                                            sizeof (TumblerThumbnailerProviderIface),
-                                            NULL,
-                                            0,
-                                            NULL,
-                                            0);
-
-      g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
+      GType g_define_type_id =
+        g_type_register_static_simple (G_TYPE_INTERFACE,
+                                       "TumblerThumbnailerProvider",
+                                       sizeof (TumblerThumbnailerProviderIface),
+                                       NULL,
+                                       0,
+                                       NULL,
+                                       0);
+
+      g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_OBJECT);
+
+      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
     }
 
-  return type;
+  return g_define_type_id__volatile;
 }