Merge branch 'master' into strippedstripped1.1.9.18

Conflicts:
	src/guichan/cliprectangle.cpp
	src/guichan/focushandler.cpp
	src/guichan/gui.cpp
	src/guichan/include/guichan/cliprectangle.hpp
	src/guichan/include/guichan/inputevent.hpp
	src/guichan/include/guichan/keyevent.hpp
	src/guichan/include/guichan/mouseevent.hpp
	src/guichan/include/guichan/widgets/button.hpp
	src/guichan/include/guichan/widgets/checkbox.hpp
	src/guichan/include/guichan/widgets/dropdown.hpp
	src/guichan/include/guichan/widgets/radiobutton.hpp
	src/guichan/include/guichan/widgets/slider.hpp
	src/guichan/include/guichan/widgets/tab.hpp
	src/guichan/include/guichan/widgets/tabbedarea.hpp
	src/guichan/include/guichan/widgets/textfield.hpp
	src/guichan/include/guichan/widgets/window.hpp
	src/guichan/inputevent.cpp
	src/guichan/keyevent.cpp
	src/guichan/mouseevent.cpp
	src/guichan/widget.cpp
	src/guichan/widgets/button.cpp
	src/guichan/widgets/checkbox.cpp
	src/guichan/widgets/dropdown.cpp
	src/guichan/widgets/radiobutton.cpp
	src/guichan/widgets/slider.cpp
	src/guichan/widgets/tab.cpp
	src/guichan/widgets/tabbedarea.cpp
	src/guichan/widgets/textfield.cpp
	src/guichan/widgets/window.cpp

1 files changed, 6 insertions, 6 deletions

diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 685562d6f..f38d17a59 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -70,7 +70,7 @@ void BuySellHandler::requestSellList(std::string nick)
     else
     {
         if (chatWindow)
-            chatWindow->whisper(nick, data, BY_PLAYER);
+            chatWindow->addWhisper(nick, data, BY_PLAYER);
     }
 }
 
@@ -89,7 +89,7 @@ void BuySellHandler::requestBuyList(std::string nick)
     else
     {
         if (chatWindow)
-            chatWindow->whisper(nick, data, BY_PLAYER);
+            chatWindow->addWhisper(nick, data, BY_PLAYER);
     }
 }
 
@@ -102,12 +102,12 @@ void BuySellHandler::sendBuyRequest(std::string nick, ShopItem* item,
         return;
     }
     std::string data = strprintf("!buyitem %d %d %d",
-                        item->getId(), item->getPrice(), amount);
+        item->getId(), item->getPrice(), amount);
 
     if (config.getBoolValue("hideShopMessages"))
         Net::getChatHandler()->privateMessage(nick, data);
     else
-        chatWindow->whisper(nick, data, BY_PLAYER);
+        chatWindow->addWhisper(nick, data, BY_PLAYER);
 }
 
 void BuySellHandler::sendSellRequest(std::string nick, ShopItem* item,
@@ -120,12 +120,12 @@ void BuySellHandler::sendSellRequest(std::string nick, ShopItem* item,
     }
 
     std::string data = strprintf("!sellitem %d %d %d",
-                       item->getId(), item->getPrice(), amount);
+        item->getId(), item->getPrice(), amount);
 
     if (config.getBoolValue("hideShopMessages"))
         Net::getChatHandler()->privateMessage(nick, data);
     else
-        chatWindow->whisper(nick, data, BY_PLAYER);
+        chatWindow->addWhisper(nick, data, BY_PLAYER);
 }
 
 void BuySellHandler::processNpcBuySellChoice(Net::MessageIn &msg)