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

from the 0.1.0 branch.

1 files changed, 7 insertions, 4 deletions

diff --git a/src/main.cpp b/src/main.cpp
index eb20c169..d2190de4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -102,7 +102,7 @@ Logger *logger;               /**< Log object */
 namespace {
     struct ErrorListener : public gcn::ActionListener
     {
-        void action(const std::string& eventId) { state = LOGIN_STATE; }
+        void action(const std::string& eventId, gcn::Widget* widget) { state = LOGIN_STATE; }
     } errorListener;
 }
 
@@ -604,7 +604,8 @@ int main(int argc, char *argv[])
 
             oldstate = state;
 
-            if (currentDialog && state != ACCOUNT_STATE && state != CHAR_CONNECT_STATE) {
+            if (currentDialog && state != ACCOUNT_STATE &&
+                    state != CHAR_CONNECT_STATE) {
                 delete currentDialog;
                 currentDialog = NULL;
             }
@@ -628,7 +629,8 @@ int main(int argc, char *argv[])
                     logger->log("State: CHAR_SERVER");
                     currentDialog = new ServerSelectDialog(&loginData);
                     if (options.chooseDefault) {
-                        ((ServerSelectDialog*)currentDialog)->action("ok");
+                        ((ServerSelectDialog*)currentDialog)->action("ok",
+                                                                     NULL);
                     }
                     break;
 
@@ -637,7 +639,8 @@ int main(int argc, char *argv[])
                     currentDialog = new CharSelectDialog(network, &charInfo,
                                                          1 - loginData.sex);
                     if (options.chooseDefault) {
-                        ((CharSelectDialog*)currentDialog)->action("ok");
+                        ((CharSelectDialog*)currentDialog)->action("ok",
+                                                                   NULL);
                     }
                     break;