mail[Wesnoth-commits] r43953 - in /trunk/src: gui/widgets/settings.cpp network_manager_ana.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by billybiset on July 06, 2010 - 06:41:
Author: billynux
Date: Tue Jul  6 06:40:59 2010
New Revision: 43953

URL: http://svn.gna.org/viewcvs/wesnoth?rev=43953&view=rev
Log:
Fixes a compilation issue with ana due to a removed method and updates an 
error message to inform about new option: --data-dir instead of -datadir.

Modified:
    trunk/src/gui/widgets/settings.cpp
    trunk/src/network_manager_ana.cpp

Modified: trunk/src/gui/widgets/settings.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/gui/widgets/settings.cpp?rev=43953&r1=43952&r2=43953&view=diff
==============================================================================
--- trunk/src/gui/widgets/settings.cpp (original)
+++ trunk/src/gui/widgets/settings.cpp Tue Jul  6 06:40:59 2010
@@ -281,9 +281,9 @@
 
             const std::string error_msg("Window not defined in WML: '" +
                                          *itor +
-                                         "'. Perhaps a mismatch between data 
and source versions. Try -datadir <trunk-dir>" );
-                       VALIDATE(window_types.find(*itor) != 
window_types.end()
-                                       , error_msg.c_str() );
+                                         "'. Perhaps a mismatch between data 
and source versions."
+                                         " Try --data-dir <trunk-dir>" );
+                       VALIDATE(window_types.find(*itor) != 
window_types.end(), error_msg );
                }
        }
 

Modified: trunk/src/network_manager_ana.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/network_manager_ana.cpp?rev=43953&r1=43952&r2=43953&view=diff
==============================================================================
--- trunk/src/network_manager_ana.cpp (original)
+++ trunk/src/network_manager_ana.cpp Tue Jul  6 06:40:59 2010
@@ -101,7 +101,6 @@
 void ana_connect_handler::handle_connect(ana::error_code error_code, 
ana::net_id /*client*/)
 {
     connected_ = true;
-    timer_->cancel();
 
     if (! error_code)
         std::cout << "DEBUG: Connected.\n";
@@ -306,6 +305,9 @@
 
         client->set_listener_handler( this );
         client->run();
+
+        client->set_raw_data_mode();
+
         client->start_logging();
 
         handler.wait_completion(); // just wait for handler to finish
@@ -315,8 +317,8 @@
         if( ! handler.error() )
         {
             //Send handshake
-            const std::string empty_str;
-            client->send( ana::buffer( empty_str ), this );
+//             const std::string empty_str;
+//             client->send( ana::buffer( empty_str ), this );
 
             uint32_t my_id;
             ana::serializer::bistream bis;




Related Messages


Powered by MHonArc, Updated Tue Jul 06 10:00:13 2010