Merge branch 'master' of gitorious.org:manaplus/manaplus

4 files changed, 11 insertions, 9 deletions

diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index cef4f497a..9468baaa1 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -335,7 +335,8 @@ void BeingHandler::handleBeingActionChangeMessage(Net::MessageIn &msg)
         };
         std::string message(deadMsg[rand() % 13]);
         message.append(std::string(" ") + _("Press OK to respawn."));
-        OkDialog *dlg = new OkDialog(_("You Died"), message, false);
+        OkDialog *dlg = new OkDialog(_("You Died"),
+            message, DIALOG_OK, false);
         dlg->addActionListener(&(ManaServ::respawnListener));
     }
 }
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index 300af5a2b..7977df909 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -181,7 +181,7 @@ void CharHandler::handleCharacterCreateResponse(Net::MessageIn &msg)
                 errorMessage = _("Unknown error.");
                 break;
         }
-        new OkDialog(_("Error"), errorMessage);
+        new OkDialog(_("Error"), errorMessage, DIALOG_ERROR);
 
         if (mCharCreateDialog)
             mCharCreateDialog->unlock();
@@ -224,7 +224,7 @@ void CharHandler::handleCharacterDeleteResponse(Net::MessageIn &msg)
             default:
                 errorMessage = strprintf(_("Unknown error (%d)."), errMsg);
         }
-        new OkDialog(_("Error"), errorMessage);
+        new OkDialog(_("Error"), errorMessage, DIALOG_ERROR);
     }
     mSelectedCharacter = 0;
     unlockCharSelectDialog();
diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h
index 83e636e0e..2019755ea 100644
--- a/src/net/manaserv/gamehandler.h
+++ b/src/net/manaserv/gamehandler.h
@@ -48,7 +48,8 @@ class GameHandler : public MessageHandler, public Net::GameHandler
 
         void quit(bool reconnectAccount);
 
-        void quit() { quit(false); }
+        void quit()
+        { quit(false); }
 
         void ping(int tick);
 
diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp
index 84e71eaf3..05041c56a 100644
--- a/src/net/manaserv/network.cpp
+++ b/src/net/manaserv/network.cpp
@@ -54,7 +54,7 @@ void initialize()
 {
     if (enet_initialize())
     {
-        logger->error("Failed to initialize ENet.");
+        logger->safeError("Failed to initialize ENet.");
     }
 
 #if defined(ENET_VERSION) && ENET_VERSION >= ENET_CUTOFF
@@ -65,7 +65,7 @@ void initialize()
 
     if (!client)
     {
-        logger->error("Failed to create the local host.");
+        logger->safeError("Failed to create the local host.");
     }
 }
 
@@ -76,8 +76,8 @@ void finalize()
 
     if (connections)
     {
-        logger->error("Tried to shutdown the network subsystem while there "
-                "are network connections left!");
+        logger->safeError("Tried to shutdown the network subsystem "
+            "while there are network connections left!");
     }
 
     clearNetworkHandlers();
@@ -88,7 +88,7 @@ Connection *getConnection()
 {
     if (!client)
     {
-        logger->error("Tried to instantiate a network object before "
+        logger->safeError("Tried to instantiate a network object before "
                 "initializing the network subsystem!");
     }