From 9d5b0fbfd15523b6af8bace86d1e5ca6c90122bc Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Sat, 16 Jun 2007 17:54:32 +0000 Subject: [PATCH] - 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 | 21 +++++++++++++++++++++ clientgui/MainDocument.cpp | 29 +++++++++++------------------ clientgui/MainDocument.h | 1 - win_build/installerv2/BOINC.ism | Bin 207156 -> 207160 bytes win_build/installerv2/BOINCx64.ism | Bin 207176 -> 207176 bytes 5 files changed, 32 insertions(+), 19 deletions(-) diff --git a/checkin_notes b/checkin_notes index b2b2b80f8f..ebc01f11aa 100755 --- a/checkin_notes +++ b/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 diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp index 8dc7ddffea..a4fbd97263 100644 --- a/clientgui/MainDocument.cpp +++ b/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; } diff --git a/clientgui/MainDocument.h b/clientgui/MainDocument.h index 33b5353717..ee557f1ad8 100644 --- a/clientgui/MainDocument.h +++ b/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; diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism index 8ebc2444cf0e6caa717e5ed9d033af4414f5a71a..8c93a50d8c4589fcfc0e29cd17f30fbed4cf4e9a 100644 GIT binary patch delta 2102 zcmZXVdr(x@8Nl!Noy$I8_p+diQ3x!rRncWxToy17*%t(|ydRmSNj5ZDg%qJ()>N8Q z*Gg;>lWFWNoQj#$YC>jET!!1(YdbdLIHN&Zrz0~R$H_F3+V-EuY0cJ_B-MVq2FIrN z%x}*59_RbMbI&>V{_?WnNb$5SyssjQ=6`Yq0e`^V-Qs=B-4$qUXl=1PVsR*Y3fAM1 zBBwl6*dsq&Wl~H%6KwWLzlIMLFtg%+HUujgJ3B)ITRTGA`iCQ-aDD$kXjqx*ea&EQ z?Cc)=KNFuTV5^n=gKfYUZ{jAYe>fc4HvD3^{P}@_;$m)p9L>tjAqjciR@5k(7i*Z2 z68Ho49sY)LUmzeqI%-)iIK$Py{-@yAKM{Eb_xi-3NW( z;a~QFRVN5PGbT|t_k-bSqXn(##378}ah&GO=U}baEJ2j-ItQa)GwRPn0W@>RdDtrn zf-fz}THP!~)htk1UVc+7IcAsgluy^8BKKLQzF8Czun}xdr${%vi!1<6n#-xz+LB1g=o$uE3)Rr_?)FAq!xhXMF^_#S4^>|MVkx zOMjcLLW%>u3zL5Y(B(3dIL)S!>pli+dh=I>3W8emF?7*Y;cs4phAbBdLN&3Os3n@z zKVO4fJC8Ne_LwlHoqPb1$5vr`d=17}JRf(8aFUM{;YFQ=lHa?4JW`DB@u5D@sjExy z6;XYA9X<&vl;ItKJL)qw%mX#shSxD(f%`;kkkq%F_%dy+6Ah}NmUQ4#4?KeX_&zyP z&IhqwZu=(LJb08%)}zQ{er%s?!V*3cM!RYcW0Xw}qWFGn2U;e_lMZ84=LE*=lNU%@ zTtG9A&SN^iG>?`1)>X_?^Dd!WDi?|?`LhXpfi_Z?9Qb&hgdT4ACnk98Gm3EwV-Wv0 zo&`Oa{%4hmB^-r1KJq#4hTDAUb8M2&>KtiD$f=Kye32COjwy(k1f;)#5hX0eUtuZR z&knIdT{=F;lI=>W<%oya6k1t8O8Ti!0n20Z0iB%!=c#8!_5&!l>9V9Uag|svWixK% z#u&sPlTj@~D;<47@JllQQ6Z|OGfO9GP{XdK-pylLR)lF1|NDL@!o&<|JoYbaAJ1XG-57NFysp|Rmm}zPS5*X^ z{z`YSrpi+rbUBobP@DRO7Nvga*PbHryVAj%?9Mx4GhsWu$ z`JBFLo6}e6u+_S1+_oCOuijN(<8^xcoA~JhR#g_fyV|>J?2Pn=BRjtH^`FyV??C_e zL+VK@dkSD9H(S|3T1U*vI$c_!iYos$v5v?g9JHcL>N5!ISCmt)Ayx_^`7q(X@_c@P delta 1931 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 delta 2139 zcmZWp4Nz3q6@KU3x63Z@cHi=Agn@-9L5+)8L)0i`*%jQ)@>3UdNNN#rgPX!KfemV~ zma40yj*akiPsC2D*uo@@Kf{~hHIq&y$s}r$K`ZHu6WanE(@baDPD(aTv7`3BC8T5X z?tJ&&bG~!#z3-lL?v)$KS8gO!ovQhqwt$socQ8LHkZZp%OFHiELg{!^TfgESeXUu(`$ziClcZ zzqq|&375*$S@TC=O5)Qezp;%aaa-MP*}Tf2ld`fW**ixp`i5A_XRDRju8d>Xq;D_jmZcbm9J6`VCxm-rPKjiFQ*Q33~;>6@l$ni+AXu%&_B%ja~cNoSE&s- zd7uvEK7(}44(pV4n>{1XR2bD~w*^3*XzDkld;Ikwf1vfbO@WqRXE@MN5o`@~s@*Nk zCiTm936Xmy4m26iH^$1_aEu%KVKL3*mB;_O@4j8o+%Djwt8lyF{}SZWN=(mBR9IUl=uIU ztz^#x2mdLajm%^ZrGUs2tbWYi1x9Q%E+pfIZ9_wi0B zBRL59hF2v)c$IA9@Q79x1mo7E0t{k1hVe~&o9aJ+$4r%$jTVpPdlu^X0QNsb+b%<{ zAx=}#Wr!rYd3w4HkC{d!diOHq>j@zkEOh%a>`#V61HB1{HXAo1#(Q&CrT!qrqZQrm`E4KF`4d8U^jGz;TJms^pjh-NaOS;GP$QQO{v|Rs*O&fH!XSx`;vF(&H4ml^rn3s})*;oD@B(&gS zd__0RSu({G zM$!cy{u*9m7eV0p+N?hgUw^tr*Xddc8QG^)o51q*!(`IEBalXIMqH+iC9vJ`$4Gn1 z%pNs>QERlY9cUKJe3``@@!Zg2GD|j4Uj`e`+)(W-_igYw>#JQGoprvN%9?8XdV8_f zn#qof(HwSIKc-uAXS3e|ZTkZA>Gd2|Yjbt*Pz5%Z`~5rHJHpK`hDpw4UwC&0?4iK! zuzg3c^N0K;{r?yEVU?@BGaL-HJglq;hMHP~F9m2z0dwhlyEK=b-2;+iXiyB%r)VsN zrO?mv*$?#itE;0X!0EQ=<9LU72*z}mjWkfe8Uilow@x{~`u6rrg7?SBe7SHPAPKkKRX z*ExMYw`bGVZ~4q^vqS(vM-oStKxghj9`!`v{b(UeW0?X_W+5X0x=_eGwKi^)&QTn9 lFbm(|4_%AE0i536=