1 files changed, 6 insertions, 20 deletions
diff --git a/mission-control-plugins/loader.c b/mission-control-plugins/loader.c
index 78765f46..4336c082 100644
--- a/mission-control-plugins/loader.c
+++ b/mission-control-plugins/loader.c
@@ -43,10 +43,15 @@
 
 #include <gmodule.h>
 #include <mission-control-plugins/mission-control-plugins.h>
-#include <mission-control-plugins/debug-internal.h>
+#include <mission-control-plugins/debug.h>
 
 static gboolean debugging = FALSE;
 
+#undef  DEBUG
+#define DEBUG(format, ...) \
+  G_STMT_START { if (debugging || mcp_is_debugging (MCP_DEBUG_LOADER))  \
+      g_debug ("%s" format, G_STRLOC, ##__VA_ARGS__); } G_STMT_END
+
 /**
  * mcp_set_debug:
  * @debug: whether to log debug output
@@ -60,25 +65,6 @@ mcp_set_debug (gboolean debug)
   debugging = debug;
 }
 
-gboolean
-_mcp_is_debugging (void)
-{
-  return debugging;
-}
-
-void
-_mcp_debug (const gchar *format, ...)
-{
-  if (debugging)
-    {
-      va_list args;
-
-      va_start (args, format);
-      g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format, args);
-      va_end (args);
-    }
-}
-
 static GList *plugins = NULL;
 
 /**