- WINSETUP: Remove the VBS Script custom action and put back

the shortcut to BOINC Manager.
        
    win_build/installerv2/
        BOINC.ism
        BOINCx64.ism

    - MGR: Revert back out the change to cache the host type
        (local/remote). Somehow it was messing up controlling
        remote machines.

    clientgui/
        MainDocument.cpp, .h

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

checkin_notes

@@ -6262,6 +6262,11 @@ David  14 June 2007
         sched_hr.C
         sched_config.C,h
 
+
+Rom    14 June 2007
+    - Branch for 5.10 release, all platforms
+      boinc_core_release_5_10
+
 David  14 June 2007
     - scheduler: support per-app HR type, specified in the DB;
         this supercedes the global HR type specified in config.xml
@@ -6309,3 +6314,19 @@ David  14 June 2007
             create_account_form.php (removed)
             create_account_action.php (removed)
             show_log.php
+
+Rom    16 June 2007
+    - WINSETUP: Remove the VBS Script custom action and put back
+        the shortcut to BOINC Manager.
+        
+    win_build/installerv2/
+        BOINC.ism
+        BOINCx64.ism
+
+Rom    16 June 2007
+    - MGR: Revert back out the change to cache the host type
+        (local/remote). Somehow it was messing up controlling
+        remote machines.
+
+    clientgui/
+        MainDocument.cpp, .h

clientgui/MainDocument.cpp

@@ -53,7 +53,6 @@ CNetworkConnection::CNetworkConnection(CMainDocument* pDocument) :
     m_bReconnectOnError = false;
     m_bNewConnection = false;
     m_bUsedDefaultPassword = false;
-    m_bIdentifyHostType = true;
 }
 
 
@@ -187,24 +186,18 @@ int CNetworkConnection::GetConnectingComputerName(wxString& strMachine) {
 
 
 bool CNetworkConnection::IsComputerNameLocal(const wxString& strMachine) {
-    static bool bLocalHostName = true;
-
-    if (m_bIdentifyHostType) {
-        if (strMachine.empty()) {
-            bLocalHostName = true;
-        } else if (wxT("localhost") == strMachine.Lower()) {
-            bLocalHostName = true;
-        } else if (wxT("localhost.localdomain") == strMachine.Lower()) {
-            bLocalHostName = true;
-        } else if (::wxGetHostName().Lower() == strMachine.Lower()) {
-            bLocalHostName = true;
-        } else if (::wxGetFullHostName().Lower() == strMachine.Lower()) {
-            bLocalHostName = true;
-        }
-        m_bIdentifyHostType = false;
+    if (strMachine.empty()) {
+        return true;
+    } else if (wxT("localhost") == strMachine.Lower()) {
+        return true;
+    } else if (wxT("localhost.localdomain") == strMachine.Lower()) {
+        return true;
+    } else if (::wxGetHostName().Lower() == strMachine.Lower()) {
+        return true;
+    } else if (::wxGetFullHostName().Lower() == strMachine.Lower()) {
+        return true;
     }
-
-    return bLocalHostName;
+    return false;
 }
 
 

clientgui/MainDocument.h

@@ -64,7 +64,6 @@ private:
     bool           m_bUseDefaultPassword;
     bool           m_bUsedDefaultPassword;
     bool           m_bNewConnection;
-    bool           m_bIdentifyHostType;
     wxString       m_strNewComputerName;
     wxString       m_strNewComputerPassword;
     wxString       m_strConnectedComputerName;