1 files changed, 14 insertions, 11 deletions

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 75f67435..c0d1babf 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -24,14 +24,13 @@
 #include "gui/focushandler.h"
 #include "gui/palette.h"
 #include "gui/sdlinput.h"
-#include "gui/theme.h"
 #include "gui/truetypefont.h"
 
 #include "gui/widgets/window.h"
 #include "gui/widgets/windowcontainer.h"
 
-#include "configlistener.h"
 #include "configuration.h"
+#include "listener.h"
 #include "graphics.h"
 #include "log.h"
 
@@ -39,6 +38,7 @@
 #include "resources/imageset.h"
 #include "resources/imageloader.h"
 #include "resources/resourcemanager.h"
+#include "resources/theme.h"
 
 #include <guichan/exception.hpp>
 #include <guichan/image.hpp>
@@ -50,19 +50,23 @@ SDLInput *guiInput = 0;
 // Bolded font
 gcn::Font *boldFont = 0;
 
-class GuiConfigListener : public ConfigListener
+class GuiConfigListener : public Mana::Listener
 {
     public:
         GuiConfigListener(Gui *g):
             mGui(g)
         {}
 
-        void optionChanged(const std::string &name)
+        void event(Channels channel, const Mana::Event &event)
         {
-            if (name == "customcursor")
+            if (channel == CHANNEL_CONFIG)
             {
-                bool bCustomCursor = config.getValue("customcursor", 1) == 1;
-                mGui->setUseCustomCursor(bCustomCursor);
+                if (event.getName() == EVENT_CONFIGOPTIONCHANGED &&
+                    event.getString("option") == "customcursor")
+                {
+                    bool bCustomCursor = config.getBoolValue("customcursor");
+                    mGui->setUseCustomCursor(bCustomCursor);
+                }
             }
         }
     private:
@@ -104,7 +108,7 @@ Gui::Gui(Graphics *graphics):
     ResourceManager *resman = ResourceManager::getInstance();
 
     // Set global font
-    const int fontSize = (int) config.getValue("fontSize", 11);
+    const int fontSize = config.getValue("fontSize", 11);
     std::string fontFile = branding.getValue("font", "fonts/dejavusans.ttf");
     std::string path = resman->getPath(fontFile);
 
@@ -135,14 +139,13 @@ Gui::Gui(Graphics *graphics):
     gcn::Widget::setGlobalFont(mGuiFont);
 
     // Initialize mouse cursor and listen for changes to the option
-    setUseCustomCursor(config.getValue("customcursor", 1) == 1);
+    setUseCustomCursor(config.getBoolValue("customcursor"));
     mConfigListener = new GuiConfigListener(this);
-    config.addListener("customcursor", mConfigListener);
+    mConfigListener->listen(CHANNEL_CONFIG);
 }
 
 Gui::~Gui()
 {
-    config.removeListener("customcursor", mConfigListener);
     delete mConfigListener;
 
     if (mMouseCursors)