6 files changed, 9 insertions, 22 deletions
diff --git a/plugins/unityshell/src/CompoundGestureRecognizer.cpp b/plugins/unityshell/src/CompoundGestureRecognizer.cpp
index bbbbc88cc..8d9150d97 100644
--- a/plugins/unityshell/src/CompoundGestureRecognizer.cpp
+++ b/plugins/unityshell/src/CompoundGestureRecognizer.cpp
@@ -24,10 +24,7 @@
 #include <NuxCore/Logger.h>
 #include <NuxGraphics/GestureEvent.h>
 
-namespace
-{
- nux::logging::Logger logger("unity.compound_gesture_recognizer");
-}
+DECLARE_LOGGER(logger, "unity.gesture.recognizer");
 
 namespace unity
 {
diff --git a/plugins/unityshell/src/DebugDBusInterface.cpp b/plugins/unityshell/src/DebugDBusInterface.cpp
index 42e55de39..9a267ea21 100644
--- a/plugins/unityshell/src/DebugDBusInterface.cpp
+++ b/plugins/unityshell/src/DebugDBusInterface.cpp
@@ -38,10 +38,9 @@ const std::string DBUS_BUS_NAME = "com.canonical.Unity";
 
 namespace debug
 {
+DECLARE_LOGGER(logger, "unity.debug.interface");
 namespace
 {
-nux::logging::Logger logger("unity.debug.DebugDBusInterface");
-
 namespace local
 {
 std::ofstream output_file;
@@ -266,9 +265,10 @@ void LogMessage(std::string const& severity,
 std::string const& message)
 {
 nux::logging::Level level = nux::logging::get_logging_level(severity);
- if (logger.GetEffectiveLogLevel() <= level)
+ nux::logging::Logger const& log_ref = Unwrap(logger);
+ if (log_ref.GetEffectiveLogLevel() <= level)
 {
- nux::logging::LogStream(level, logger.module(), __FILE__, __LINE__).stream()
+ nux::logging::LogStream(level, log_ref.module(), __FILE__, __LINE__).stream()
 << message;
 }
 }
diff --git a/plugins/unityshell/src/GesturalWindowSwitcher.cpp b/plugins/unityshell/src/GesturalWindowSwitcher.cpp
index 910762139..b27468707 100644
--- a/plugins/unityshell/src/GesturalWindowSwitcher.cpp
+++ b/plugins/unityshell/src/GesturalWindowSwitcher.cpp
@@ -25,10 +25,7 @@
 #include <NuxCore/Logger.h>
 #include "unityshell.h"
 
-namespace
-{
- nux::logging::Logger logger("unity.gestural_window_switcher");
-}
+DECLARE_LOGGER(logger, "unity.gesture.switcher");
 
 using namespace nux;
 using namespace unity;
diff --git a/plugins/unityshell/src/WindowMinimizeSpeedController.cpp b/plugins/unityshell/src/WindowMinimizeSpeedController.cpp
index ec0b4b872..a605b93f2 100644
--- a/plugins/unityshell/src/WindowMinimizeSpeedController.cpp
+++ b/plugins/unityshell/src/WindowMinimizeSpeedController.cpp
@@ -24,11 +24,9 @@
 
 #include "WindowMinimizeSpeedController.h"
 
+DECLARE_LOGGER(logger, "unity.shell.compiz.minimizer");
 namespace
 {
-
-nux::logging::Logger logger ("unity.WindowMinimizeSpeedController");
-
 namespace local
 {
 const std::string UNITY_SCHEMA = "com.canonical.Unity";
diff --git a/plugins/unityshell/src/XPathQueryPart.cpp b/plugins/unityshell/src/XPathQueryPart.cpp
index a42a65c34..3608a50b4 100644
--- a/plugins/unityshell/src/XPathQueryPart.cpp
+++ b/plugins/unityshell/src/XPathQueryPart.cpp
@@ -31,10 +31,7 @@ namespace unity
 
 namespace debug
 {
-namespace
-{
- nux::logging::Logger logger("unity.debug.DebugDBusInterface");
-}
+DECLARE_LOGGER(logger, "unity.debug.xpath");
 
 // Stores a part of an XPath query.
 XPathQueryPart::XPathQueryPart(std::string const& query_part)
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 08c91a643..78029fff9 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -80,11 +80,9 @@ using ui::LayoutWindow;
 using ui::LayoutWindowList;
 using util::Timer;
 
+DECLARE_LOGGER(logger, "unity.shell.compiz");
 namespace
 {
-
-nux::logging::Logger logger("unity.shell");
-
 UnityScreen* uScreen = 0;
 
 void reset_glib_logging();