- client: if you put <host_venue> in global_prefs_override.xml,

it should select the venue from the network prefs.
    Now it does.


svn path=/trunk/boinc/; revision=17389

checkin_notes

@@ -1822,11 +1822,11 @@ David  20 Feb 2009
         work_fetch.cpp,h
 
 David  20 Feb 2009
-	- client: fix bug that can cause no GPU jobs to be scheduled
-		even when a GPU is free
+    - client: fix bug that can cause no GPU jobs to be scheduled
+        even when a GPU is free
 
-	client/
-		cpu_sched.cpp
+    client/
+        cpu_sched.cpp
 
 Charlie 20 Feb 2009
     - Update various source filed to GPL 3.  Note: I've only updated those 
@@ -2037,6 +2037,7 @@ Rom    25 Feb 2009
     clientgui/
         BOINCGUIApp.cpp
 
+
 Eric K 25 Feb 2009
     - Added checks for net/*.h, arpa/*.h, netinet/*.h and code to figure out
       which of those files to include
@@ -2071,9 +2072,6 @@ Eric K 25 Feb 2009
     - Added FCGI::perror() which calls FCGI_perror(). (boinc_fcgi.{h,cpp})
     - Fixed library Makefiles so that all required headers get installed.
 
-
-
-
     version.h
     configure.ac
     api/
@@ -2206,3 +2204,12 @@ Eric K 25 Feb 2009
         updater.cpp
     zip/
         Makefile.am
+
+David  25 Feb 2009
+    - client: if you put <host_venue> in global_prefs_override.xml,
+        it should select the venue from the network prefs.
+        Now it does.
+
+    client/
+        gui_rpc_server.cpp
+        cs_prefs.cpp

client/cs_prefs.cpp

@@ -334,6 +334,7 @@ int PROJECT::parse_preferences_for_user_files() {
 //
 void CLIENT_STATE::read_global_prefs() {
     bool found_venue;
+    bool venue_specified_in_override = false;
     int retval;
     FILE* f;
     string foo;
@@ -341,6 +342,9 @@ void CLIENT_STATE::read_global_prefs() {
     retval = read_file_string(GLOBAL_PREFS_OVERRIDE_FILE, foo);
     if (!retval) {
         parse_str(foo.c_str(), "<host_venue>", main_host_venue, sizeof(main_host_venue));
+        if (strlen(main_host_venue)) {
+            venue_specified_in_override = true;
+        }
     }
 
     retval = global_prefs.parse_file(
@@ -359,14 +363,16 @@ void CLIENT_STATE::read_global_prefs() {
         }
         global_prefs.init();
     } else {
-        // check that the source project's venue matches main_host_venue.
-        // If not, read file again.
-        // This is a fix for cases where main_host_venue is out of synch
-        //
-        PROJECT* p = global_prefs_source_project();
-        if (p && strcmp(main_host_venue, p->host_venue)) {
-            strcpy(main_host_venue, p->host_venue);
-            global_prefs.parse_file(GLOBAL_PREFS_FILE_NAME, main_host_venue, found_venue);
+        if (!venue_specified_in_override) {
+            // check that the source project's venue matches main_host_venue.
+            // If not, read file again.
+            // This is a fix for cases where main_host_venue is out of synch
+            //
+            PROJECT* p = global_prefs_source_project();
+            if (p && strcmp(main_host_venue, p->host_venue)) {
+                strcpy(main_host_venue, p->host_venue);
+                global_prefs.parse_file(GLOBAL_PREFS_FILE_NAME, main_host_venue, found_venue);
+            }
         }
         show_global_prefs_source(found_venue);
     }

client/gui_rpc_server.cpp

@@ -257,7 +257,7 @@ int GUI_RPC_CONN_SET::init(bool last_time) {
 #endif
         if (last_time) {
             msg_printf(NULL, MSG_INTERNAL_ERROR,
-                "GUI RPC bind to port %d failed: %d", addr.sin_port, retval
+                "GUI RPC bind to port %d failed: %d", htons(addr.sin_port), retval
             );
         }
         boinc_close_socket(lsock);