Debug: Prefer runtime to compile-time check for logging

This is more convenient for both the developer and the user, especially
when it comes to providing logs in a bug report. As for the loss in
terms of performance, it is minimal, and this is normally not an issue
where these functions are used.

19 files changed, 92 insertions, 134 deletions

diff --git a/plugins/cover-thumbnailer/cover-thumbnailer-plugin.c b/plugins/cover-thumbnailer/cover-thumbnailer-plugin.c
index 540899e..860cee2 100644
--- a/plugins/cover-thumbnailer/cover-thumbnailer-plugin.c
+++ b/plugins/cover-thumbnailer/cover-thumbnailer-plugin.c
@@ -60,9 +60,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
       return;
     }
 
-#ifdef DEBUG
-  g_print ("Initializing the Tumbler Cover Thumbnailer plugin\n");
-#endif
+  g_debug ("Initializing the Tumbler Cover Thumbnailer plugin");
 
   /* register the types provided by this plugin */
   cover_thumbnailer_register (plugin);
@@ -77,9 +75,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
 void
 tumbler_plugin_shutdown (void)
 {
-#ifdef DEBUG
-  g_print ("Shutting down the Tumbler Cover Thumbnailer plugin\n");
-#endif
+  g_debug ("Shutting down the Tumbler Cover Thumbnailer plugin");
 }
 
 
diff --git a/plugins/desktop-thumbnailer/desktop-thumbnailer-plugin.c b/plugins/desktop-thumbnailer/desktop-thumbnailer-plugin.c
index f862654..0e46b8b 100644
--- a/plugins/desktop-thumbnailer/desktop-thumbnailer-plugin.c
+++ b/plugins/desktop-thumbnailer/desktop-thumbnailer-plugin.c
@@ -57,9 +57,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
       return;
     }
 
-#ifdef DEBUG
-  g_print ("Initializing the Tumbler Desktop Thumbnailer plugin\n");
-#endif
+  g_debug ("Initializing the Tumbler Desktop Thumbnailer plugin");
 
   /* register the types provided by this plugin */
   desktop_thumbnailer_register (plugin);
@@ -73,9 +71,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
 void
 tumbler_plugin_shutdown (void)
 {
-#ifdef DEBUG
-  g_print ("Shutting down the Tumbler Desktop Thumbnailer plugin\n");
-#endif
+  g_debug ("Shutting down the Tumbler Desktop Thumbnailer plugin");
 }
 
 
diff --git a/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c b/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c
index a942ef2..7cb47bb 100644
--- a/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c
+++ b/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c
@@ -156,7 +156,7 @@ desktop_thumbnailer_get_from_desktop_file (GFile *file,
   g_key_file_free (key_file);
   g_strfreev(mime_types);
 
-  g_print("Registered thumbnailer %s\n", exec);
+  g_debug ("Registered thumbnailer %s", exec);
   g_free(exec);
 
   return thumbnailer;
diff --git a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c
index abff227..1cc0039 100644
--- a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c
+++ b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer-plugin.c
@@ -59,9 +59,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
       return;
     }
 
-#ifdef DEBUG
-  g_print ("Initializing the Tumbler ffmpeg video thumbnailer plugin\n");
-#endif
+  g_debug ("Initializing the Tumbler ffmpeg video thumbnailer plugin");
 
   /* register the types provided by this plugin */
   ffmpeg_thumbnailer_register (plugin);
@@ -76,9 +74,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
 void
 tumbler_plugin_shutdown (void)
 {
-#ifdef DEBUG
-  g_print ("Shutting down the Tumbler ffmpeg video thumbnailer plugin\n");
-#endif
+  g_debug ("Shutting down the Tumbler ffmpeg video thumbnailer plugin");
 }
 
 
diff --git a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer.c b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer.c
index f8c7cbb..7dc1a67 100644
--- a/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer.c
+++ b/plugins/ffmpeg-thumbnailer/ffmpeg-thumbnailer.c
@@ -156,7 +156,7 @@ ffmpeg_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
   uri = tumbler_file_info_get_uri (info);
   if (tumbler_util_guess_is_sparse (info))
   {
-    g_debug ("Video file '%s' is probably sparse, skipping\n", uri);
+    g_debug ("Video file '%s' is probably sparse, skipping", uri);
 
     /* there was an error, emit error signal */
     g_set_error (&error, TUMBLER_ERROR, TUMBLER_ERROR_NO_CONTENT,
diff --git a/plugins/font-thumbnailer/font-thumbnailer-plugin.c b/plugins/font-thumbnailer/font-thumbnailer-plugin.c
index cc09a40..549c490 100644
--- a/plugins/font-thumbnailer/font-thumbnailer-plugin.c
+++ b/plugins/font-thumbnailer/font-thumbnailer-plugin.c
@@ -58,9 +58,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
       return;
     }
 
-#ifdef DEBUG
-  g_print ("Initializing the Tumbler Font Thumbnailer plugin\n");
-#endif
+  g_debug ("Initializing the Tumbler Font Thumbnailer plugin");
 
   /* register the types provided by this plugin */
   font_thumbnailer_register (plugin);
@@ -75,9 +73,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
 void
 tumbler_plugin_shutdown (void)
 {
-#ifdef DEBUG
-  g_print ("Shutting down the Tumbler Font Thumbnailer plugin\n");
-#endif
+  g_debug ("Shutting down the Tumbler Font Thumbnailer plugin");
 }
 
 
diff --git a/plugins/gepub-thumbnailer/gepub-thumbnailer-plugin.c b/plugins/gepub-thumbnailer/gepub-thumbnailer-plugin.c
index 4441f38..0ab6639 100644
--- a/plugins/gepub-thumbnailer/gepub-thumbnailer-plugin.c
+++ b/plugins/gepub-thumbnailer/gepub-thumbnailer-plugin.c
@@ -60,9 +60,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
       return;
     }
 
-#ifdef DEBUG
-  g_print ("Initializing the Tumbler Gepub Thumbnailer plugin\n");
-#endif
+  g_debug ("Initializing the Tumbler Gepub Thumbnailer plugin");
 
   /* register the types provided by this plugin */
   gepub_thumbnailer_register (plugin);
@@ -77,9 +75,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
 void
 tumbler_plugin_shutdown (void)
 {
-#ifdef DEBUG
-  g_print ("Shutting down the Tumbler Gepub Thumbnailer plugin\n");
-#endif
+  g_debug ("Shutting down the Tumbler Gepub Thumbnailer plugin");
 }
 
 
diff --git a/plugins/gst-thumbnailer/gst-thumbnailer-plugin.c b/plugins/gst-thumbnailer/gst-thumbnailer-plugin.c
index 3b513b0..9cc865e 100644
--- a/plugins/gst-thumbnailer/gst-thumbnailer-plugin.c
+++ b/plugins/gst-thumbnailer/gst-thumbnailer-plugin.c
@@ -60,9 +60,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
       return;
     }
 
-#ifdef DEBUG
-  g_print ("Initializing the Tumbler GStreamer Thumbnailer plugin\n");
-#endif
+  g_debug ("Initializing the Tumbler GStreamer Thumbnailer plugin");
 
   /* register the types provided by this plugin */
   gst_thumbnailer_register (plugin);
@@ -77,9 +75,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
 void
 tumbler_plugin_shutdown (void)
 {
-#ifdef DEBUG
-  g_print ("Shutting down the Tumbler GStreamer Thumbnailer plugin\n");
-#endif
+  g_debug ("Shutting down the Tumbler GStreamer Thumbnailer plugin");
 }
 
 
diff --git a/plugins/gst-thumbnailer/gst-thumbnailer.c b/plugins/gst-thumbnailer/gst-thumbnailer.c
index f600799..402f6ac 100644
--- a/plugins/gst-thumbnailer/gst-thumbnailer.c
+++ b/plugins/gst-thumbnailer/gst-thumbnailer.c
@@ -539,7 +539,7 @@ gst_thumbnailer_create (TumblerAbstractThumbnailer *thumbnailer,
   uri = tumbler_file_info_get_uri (info);
   if (tumbler_util_guess_is_sparse (info))
   {
-    g_debug ("Video file '%s' is probably sparse, skipping\n", uri);
+    g_debug ("Video file '%s' is probably sparse, skipping", uri);
 
     /* there was an error, emit error signal */
     g_set_error (&error, TUMBLER_ERROR, TUMBLER_ERROR_NO_CONTENT,
diff --git a/plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c b/plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c
index 7f45577..e680987 100644
--- a/plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c
+++ b/plugins/jpeg-thumbnailer/jpeg-thumbnailer-plugin.c
@@ -58,9 +58,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
       return;
     }
 
-#ifdef DEBUG
-  g_print ("Initializing the Tumbler JPEG Thumbnailer plugin\n");
-#endif
+  g_debug ("Initializing the Tumbler JPEG Thumbnailer plugin");
 
   /* register the types provided by this plugin */
   jpeg_thumbnailer_register (plugin);
@@ -75,9 +73,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
 void
 tumbler_plugin_shutdown (void)
 {
-#ifdef DEBUG
-  g_print ("Shutting down the Tumbler JPEG Thumbnailer plugin\n");
-#endif
+  g_debug ("Shutting down the Tumbler JPEG Thumbnailer plugin");
 }
 
 
diff --git a/plugins/odf-thumbnailer/odf-thumbnailer-plugin.c b/plugins/odf-thumbnailer/odf-thumbnailer-plugin.c
index 8330945..7376c91 100644
--- a/plugins/odf-thumbnailer/odf-thumbnailer-plugin.c
+++ b/plugins/odf-thumbnailer/odf-thumbnailer-plugin.c
@@ -60,9 +60,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
       return;
     }
 
-#ifdef DEBUG
-  g_print ("Initializing the Tumbler ODF Thumbnailer plugin\n");
-#endif
+  g_debug ("Initializing the Tumbler ODF Thumbnailer plugin");
 
   /* register the types provided by this plugin */
   odf_thumbnailer_register (plugin);
@@ -77,9 +75,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
 void
 tumbler_plugin_shutdown (void)
 {
-#ifdef DEBUG
-  g_print ("Shutting down the Tumbler ODF Thumbnailer plugin\n");
-#endif
+  g_debug ("Shutting down the Tumbler ODF Thumbnailer plugin");
 }
 
 
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c
index 167b4db..b14330a 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c
@@ -58,9 +58,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
       return;
     }
 
-#ifdef DEBUG
-  g_print ("Initializing the Tumbler Pixbuf Thumbnailer plugin\n");
-#endif
+  g_debug ("Initializing the Tumbler Pixbuf Thumbnailer plugin");
 
   /* register the types provided by this plugin */
   pixbuf_thumbnailer_register (plugin);
@@ -75,9 +73,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
 void
 tumbler_plugin_shutdown (void)
 {
-#ifdef DEBUG
-  g_print ("Shutting down the Tumbler Pixbuf Thumbnailer plugin\n");
-#endif
+  g_debug ("Shutting down the Tumbler Pixbuf Thumbnailer plugin");
 }
 
 
diff --git a/plugins/poppler-thumbnailer/poppler-thumbnailer-plugin.c b/plugins/poppler-thumbnailer/poppler-thumbnailer-plugin.c
index 3f351e0..2fcd6a9 100644
--- a/plugins/poppler-thumbnailer/poppler-thumbnailer-plugin.c
+++ b/plugins/poppler-thumbnailer/poppler-thumbnailer-plugin.c
@@ -58,9 +58,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
       return;
     }
 
-#ifdef DEBUG
-  g_print ("Initializing the Tumbler Poppler PDF/PS Thumbnailer plugin\n");
-#endif
+  g_debug ("Initializing the Tumbler Poppler PDF/PS Thumbnailer plugin");
 
   /* register the types provided by this plugin */
   poppler_thumbnailer_register (plugin);
@@ -75,9 +73,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
 void
 tumbler_plugin_shutdown (void)
 {
-#ifdef DEBUG
-  g_print ("Shutting down the Tumbler Poppler PDF/PS Thumbnailer plugin\n");
-#endif
+  g_debug ("Shutting down the Tumbler Poppler PDF/PS Thumbnailer plugin");
 }
 
 
diff --git a/plugins/raw-thumbnailer/raw-thumbnailer-plugin.c b/plugins/raw-thumbnailer/raw-thumbnailer-plugin.c
index 5c653bd..52a5a34 100644
--- a/plugins/raw-thumbnailer/raw-thumbnailer-plugin.c
+++ b/plugins/raw-thumbnailer/raw-thumbnailer-plugin.c
@@ -58,9 +58,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
       return;
     }
 
-#ifdef DEBUG
-  g_print ("Initializing the Tumbler RAW Thumbnailer plugin\n");
-#endif
+  g_debug ("Initializing the Tumbler RAW Thumbnailer plugin");
 
   /* register the types provided by this plugin */
   raw_thumbnailer_register (plugin);
@@ -75,9 +73,7 @@ tumbler_plugin_initialize (TumblerProviderPlugin *plugin)
 void
 tumbler_plugin_shutdown (void)
 {
-#ifdef DEBUG
-  g_print ("Shutting down the Tumbler RAW Thumbnailer plugin\n");
-#endif
+  g_debug ("Shutting down the Tumbler RAW Thumbnailer plugin");
 }
 
 
diff --git a/plugins/xdg-cache/xdg-cache-plugin.c b/plugins/xdg-cache/xdg-cache-plugin.c
index ff2de1d..10a0de9 100644
--- a/plugins/xdg-cache/xdg-cache-plugin.c
+++ b/plugins/xdg-cache/xdg-cache-plugin.c
@@ -53,9 +53,7 @@ tumbler_plugin_initialize (TumblerCachePlugin *plugin)
       return;
     }
 
-#ifdef DEBUG
-  g_print ("Initializing the Tumbler XDG cache plugin\n");
-#endif
+  g_debug ("Initializing the Tumbler XDG cache plugin");
 
   /* register the types provided by this plugin */
   xdg_cache_cache_register (plugin);
@@ -67,9 +65,7 @@ tumbler_plugin_initialize (TumblerCachePlugin *plugin)
 void
 tumbler_plugin_shutdown (void)
 {
-#ifdef DEBUG
-  g_print ("Shutting down the Tumbler XDG cache plugin\n");
-#endif
+  g_debug ("Shutting down the Tumbler XDG cache plugin");
 }
 
 
diff --git a/tumbler/tumbler-util.c b/tumbler/tumbler-util.c
index 9d6fad0..c7be630 100644
--- a/tumbler/tumbler-util.c
+++ b/tumbler/tumbler-util.c
@@ -39,6 +39,26 @@
 #define TUMBLER_STAT_BLKSIZE 512.
 
 
+
+/* that's what `! g_log_writer_default_would_drop (G_LOG_LEVEL_DEBUG, log_domain)` leads to:
+ * it is defined only from GLib 2.68, and it might be better to keep this anyway */
+gboolean
+tumbler_util_is_debug_logging_enabled (const gchar *log_domain)
+{
+  const gchar *domains;
+
+  domains = g_getenv ("G_MESSAGES_DEBUG");
+  if (domains == NULL)
+    return FALSE;
+
+  if (strcmp (domains, "all") == 0 || (log_domain != NULL && strstr (domains, log_domain)))
+    return TRUE;
+
+  return FALSE;
+}
+
+
+
 gchar **
 tumbler_util_get_supported_uri_schemes (void)
 {
diff --git a/tumbler/tumbler-util.h b/tumbler/tumbler-util.h
index be030cc..037bcf3 100644
--- a/tumbler/tumbler-util.h
+++ b/tumbler/tumbler-util.h
@@ -28,6 +28,8 @@
 
 G_BEGIN_DECLS
 
+gboolean tumbler_util_is_debug_logging_enabled (const gchar *log_domain);
+
 gchar **tumbler_util_get_supported_uri_schemes (void) G_GNUC_MALLOC;
 
 GKeyFile *tumbler_util_get_settings (void) G_GNUC_MALLOC;
diff --git a/tumblerd/tumbler-manager.c b/tumblerd/tumbler-manager.c
index b2302a9..6f6c310 100644
--- a/tumblerd/tumbler-manager.c
+++ b/tumblerd/tumbler-manager.c
@@ -92,10 +92,9 @@ static ThumbnailerInfo *thumbnailer_info_new              (void);
 static void             thumbnailer_info_free             (ThumbnailerInfo  *info);
 static void             thumbnailer_info_list_free        (gpointer          pointer);
 
-#ifdef DEBUG
+/* debug */
 static void             dump_overrides                    (TumblerManager   *manager);
 static void             dump_thumbnailers                 (TumblerManager   *manager);
-#endif
 
 
 
@@ -146,10 +145,10 @@ struct _OverrideInfo
 struct _ThumbnailerInfo
 {
   TumblerThumbnailer *thumbnailer;
-#ifdef DEBUG
-  GFile              *file;
-#endif
   gint                dir_index;
+
+  /* debug */
+  GFile              *file;
 };
 
 
@@ -779,9 +778,7 @@ tumbler_manager_load_overrides (TumblerManager *manager)
       g_object_unref (file);
     }
 
-#ifdef DEBUG
   dump_overrides (manager);
-#endif
 }
 
 
@@ -1018,9 +1015,8 @@ tumbler_manager_load_thumbnailer (TumblerManager *manager,
 
   /* allocate a new thumbnailer info */
   info = thumbnailer_info_new ();
-#ifdef DEBUG
-  info->file = g_object_ref (file);
-#endif
+  if (tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN))
+    info->file = g_object_ref (file);
 
   /* compute the directory index of the input file */
   directory = g_file_get_parent (file);
@@ -1283,9 +1279,7 @@ tumbler_manager_load (TumblerManager *manager)
   for (iter = manager->directories; iter != NULL; iter = iter->next)
     tumbler_manager_load_thumbnailers (manager, iter->data);
 
-#ifdef DEBUG
   dump_thumbnailers (manager);
-#endif
 
   /* update the overrides cache */
   tumbler_manager_load_overrides (manager);
@@ -1611,39 +1605,31 @@ tumbler_manager_directory_changed (TumblerManager   *manager,
 
   if (event_type == G_FILE_MONITOR_EVENT_DELETED)
     {
-      base_name = g_file_get_basename (file);
+      g_debug ("  %s deleted", g_file_peek_path (file));
 
+      base_name = g_file_get_basename (file);
       if (g_strcmp0 (base_name, "overrides") == 0)
         {
-#ifdef DEBUG
-          g_debug ("  %s deleted", g_file_peek_path (file));
-#endif
           tumbler_mutex_lock (manager->mutex);
           tumbler_manager_unload_overrides_file (manager, file);
           tumbler_registry_update_supported (manager->registry);
-#ifdef DEBUG
+
           dump_overrides (manager);
-#endif
+
           tumbler_mutex_unlock (manager->mutex);
         }
       else if (g_str_has_suffix (base_name, ".service"))
         {
-#ifdef DEBUG
-          g_debug ("  %s deleted", g_file_peek_path (file));
-#endif
           tumbler_mutex_lock (manager->mutex);
           tumbler_manager_thumbnailer_file_deleted (manager, file);
           tumbler_registry_update_supported (manager->registry);
-#ifdef DEBUG
+
           dump_thumbnailers (manager);
-#endif
+
           tumbler_mutex_unlock (manager->mutex);
         }
       else
         {
-#ifdef DEBUG
-          g_debug ("  %s deleted", g_file_peek_path (file));
-#endif
           tumbler_mutex_lock (manager->mutex);
           dir_index = tumbler_manager_get_dir_index (manager, file);
           tumbler_mutex_unlock (manager->mutex);
@@ -1653,10 +1639,10 @@ tumbler_manager_directory_changed (TumblerManager   *manager,
               tumbler_mutex_lock (manager->mutex);
               tumbler_manager_directory_deleted (manager, file, dir_index);
               tumbler_registry_update_supported (manager->registry);
-#ifdef DEBUG
+
               dump_overrides (manager);
               dump_thumbnailers (manager);
-#endif
+
               tumbler_mutex_unlock (manager->mutex);
             }
         }
@@ -1673,29 +1659,27 @@ tumbler_manager_directory_changed (TumblerManager   *manager,
             {
               if (event_type == G_FILE_MONITOR_EVENT_CREATED)
                 {
-#ifdef DEBUG
                   g_debug ("  %s created", g_file_peek_path (file));
-#endif
+
                   tumbler_mutex_lock (manager->mutex);
                   tumbler_manager_load_overrides_file (manager, file);
                   tumbler_registry_update_supported (manager->registry);
-#ifdef DEBUG
+
                   dump_overrides (manager);
-#endif
+
                   tumbler_mutex_unlock (manager->mutex);
                 }
               else if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
                 {
-#ifdef DEBUG
                   g_debug ("  %s changed", g_file_peek_path (file));
-#endif
+
                   tumbler_mutex_lock (manager->mutex);
                   tumbler_manager_unload_overrides_file (manager, file);
                   tumbler_manager_load_overrides_file (manager, file);
                   tumbler_registry_update_supported (manager->registry);
-#ifdef DEBUG
+
                   dump_overrides (manager);
-#endif
+
                   tumbler_mutex_unlock (manager->mutex);
                 }
             }
@@ -1703,29 +1687,27 @@ tumbler_manager_directory_changed (TumblerManager   *manager,
             {
               if (event_type == G_FILE_MONITOR_EVENT_CREATED)
                 {
-#ifdef DEBUG
                   g_debug ("  %s created", g_file_peek_path (file));
-#endif
+
                   tumbler_mutex_lock (manager->mutex);
                   tumbler_manager_load_thumbnailer (manager, file);
                   tumbler_registry_update_supported (manager->registry);
-#ifdef DEBUG
+
                   dump_thumbnailers (manager);
-#endif
+
                   tumbler_mutex_unlock (manager->mutex);
                 }
               else if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
                 {
-#ifdef DEBUG
                   g_debug ("  %s changed", g_file_peek_path (file));
-#endif
+
                   tumbler_mutex_lock (manager->mutex);
                   tumbler_manager_thumbnailer_file_deleted (manager, file);
                   tumbler_manager_load_thumbnailer (manager, file);
                   tumbler_registry_update_supported (manager->registry);
-#ifdef DEBUG
+
                   dump_thumbnailers (manager);
-#endif
+
                   tumbler_mutex_unlock (manager->mutex);
                 }
             }
@@ -1738,17 +1720,15 @@ tumbler_manager_directory_changed (TumblerManager   *manager,
 
           if (dir_index >= 0)
             {
-#ifdef DEBUG
               g_debug ("  %s created", g_file_peek_path (file));
-#endif
 
               tumbler_mutex_lock (manager->mutex);
               tumbler_manager_directory_created (manager, file, dir_index);
               tumbler_registry_update_supported (manager->registry);
-#ifdef DEBUG
+
               dump_overrides (manager);
               dump_thumbnailers (manager);
-#endif
+
               tumbler_mutex_unlock (manager->mutex);
             }
         }
@@ -1811,9 +1791,9 @@ thumbnailer_info_free (ThumbnailerInfo *info)
   if (info == NULL)
     return;
 
-#ifdef DEBUG
-  g_object_unref (info->file);
-#endif
+  if (tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN))
+    g_object_unref (info->file);
+
   g_object_unref (info->thumbnailer);
   g_slice_free (ThumbnailerInfo, info);
 }
@@ -1835,7 +1815,6 @@ thumbnailer_info_list_free (gpointer pointer)
 
 
 
-#ifdef DEBUG
 static void
 dump_overrides (TumblerManager *manager)
 {
@@ -1844,6 +1823,9 @@ dump_overrides (TumblerManager *manager)
   GList        **list;
   GList         *iter;
 
+  if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN))
+    return;
+
   g_print ("Overrides:\n");
 
   g_hash_table_iter_init (&table_iter, manager->overrides);
@@ -1867,6 +1849,9 @@ dump_thumbnailers (TumblerManager *manager)
   GList        **list;
   GList         *iter;
 
+  if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN))
+    return;
+
   g_print ("Thumbnailers:\n");
 
   g_hash_table_iter_init (&table_iter, manager->thumbnailers);
@@ -1879,7 +1864,6 @@ dump_thumbnailers (TumblerManager *manager)
 
   g_print ("\n");
 }
-#endif /* DEBUG */
 
 
 
diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c
index d605190..6f5ad16 100644
--- a/tumblerd/tumbler-registry.c
+++ b/tumblerd/tumbler-registry.c
@@ -45,6 +45,9 @@ static gint                tumbler_registry_compare                   (TumblerTh
 static GList              *tumbler_registry_lookup                    (TumblerRegistry    *registry,
                                                                        const gchar        *hash_key);
 
+/* debug */
+static void                dump_registry                              (TumblerRegistry *registry);
+
 
 
 struct _TumblerRegistryClass
@@ -122,17 +125,18 @@ tumbler_registry_finalize (GObject *object)
 
 
 
-#ifdef DEBUG
 static void
 dump_registry (TumblerRegistry *registry)
 {
+  if (! tumbler_util_is_debug_logging_enabled (G_LOG_DOMAIN))
+    return;
+
   g_print ("Registry:\n");
   g_print ("  Preferred Thumbnailers: %d\n",
            g_hash_table_size (registry->preferred_thumbnailers));
   g_print ("  Registry Thumbnailers: %d\n",g_hash_table_size (registry->thumbnailers));
   g_print ("\n");
 }
-#endif
 
 
 
@@ -380,9 +384,7 @@ tumbler_registry_add (TumblerRegistry    *registry,
 
   g_strfreev (hash_keys);
 
-#ifdef DEBUG
   dump_registry (registry);
-#endif
 
   tumbler_mutex_unlock (registry->mutex);
 }
@@ -710,9 +712,7 @@ tumbler_registry_set_preferred (TumblerRegistry    *registry,
                            g_strdup (hash_key), g_object_ref (thumbnailer));
     }
 
-#ifdef DEBUG
   dump_registry (registry);
-#endif
 
   tumbler_mutex_unlock (registry->mutex);
 }