Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several updates

from the 0.1.0 branch.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/net/playerhandler.cpp b/src/net/playerhandler.cpp
index 94788333..3786cd0b 100644
--- a/src/net/playerhandler.cpp
+++ b/src/net/playerhandler.cpp
@@ -46,7 +46,7 @@ OkDialog *deathNotice = NULL;
 namespace {
     struct WeightListener : public gcn::ActionListener
     {
-        void action(const std::string &eventId) { weightNotice = NULL; }
+        void action(const std::string& eventId, gcn::Widget* widget) { weightNotice = NULL; }
     } weightListener;
 }
 
@@ -56,7 +56,7 @@ namespace {
 // TODO Move somewhere else
 namespace {
     struct DeathListener : public gcn::ActionListener {
-        void action(const std::string &eventId) {
+        void action(const std::string& eventId, gcn::Widget* widget) {
             player_node->revive();
             deathNotice = NULL;
         }
diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index 5bce0574..8f9788a2 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -41,7 +41,7 @@ std::string tradePartnerName;
 namespace {
     struct RequestTradeListener : public gcn::ActionListener
     {
-        void action(const std::string& eventId)
+        void action(const std::string& eventId, gcn::Widget* widget)
         {
             player_node->tradeReply(eventId == "yes");
         };