From b595d7af76fff193b7fd7f3120c2ee850ea87b48 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Mon, 29 Sep 2008 17:29:03 +0000
Subject: [PATCH] build break fixes and some cleanup

svn path=/trunk/boinc/; revision=16088
---
 clientgui/AsyncRPC.cpp               |  15 +++++++++------
 clientgui/AsyncRPC.h                 |  16 +++++-----------
 clientgui/{browser.C => browser.cpp} |   0
 clientgui/stdwx.h                    |   4 +---
 win_build/installerv2/BOINC.ism      | Bin 211404 -> 211404 bytes
 win_build/installerv2/BOINCx64.ism   | Bin 211404 -> 211404 bytes
 6 files changed, 15 insertions(+), 20 deletions(-)
 rename clientgui/{browser.C => browser.cpp} (100%)

diff --git a/clientgui/AsyncRPC.cpp b/clientgui/AsyncRPC.cpp
index 9216e51d80..0aebba35df 100755
--- a/clientgui/AsyncRPC.cpp
+++ b/clientgui/AsyncRPC.cpp
@@ -19,14 +19,13 @@
 #pragma implementation "AsyncRPC.h"
 #endif
 
-#include <vector>
-
 #include "stdwx.h"
 #include "BOINCGUIApp.h"
 #include "MainDocument.h"
 #include "AsyncRPC.h"
 #include "BOINCBaseFrame.h"
 
+
 // Delay in milliseconds before showing AsyncRPCDlg
 #define RPC_WAIT_DLG_DELAY 1500
 
@@ -41,13 +40,13 @@ ASYNC_RPC_REQUEST::~ASYNC_RPC_REQUEST() {
 
 
 void ASYNC_RPC_REQUEST::clear() {
+    rpcType = (ASYNC_RPC_TYPE) 0;
     which_rpc = (RPC_SELECTOR) 0;
-    arg1 = NULL;
     exchangeBuf = NULL;
+    arg1 = NULL;
     arg2 = NULL;
     arg3 = NULL;
     arg4 = NULL;
-    rpcType = (ASYNC_RPC_TYPE) 0;
     completionTime = NULL;
     resultPtr = NULL;
     retval = 0;
@@ -133,13 +132,13 @@ void *RPCThread::Entry() {
             continue;
         }
 
-       if (! m_Doc->IsConnected()) {
+        if (! m_Doc->IsConnected()) {
             Yield();
         }
 
         retval = ProcessRPCRequest();
         wxPostEvent( wxTheApp, RPC_done_event );
-        }
+    }
 
 #ifndef __WXMSW__       // Deadlocks on Windows
 
@@ -147,6 +146,7 @@ void *RPCThread::Entry() {
     // manager shutdown due to a rare race condition 
     m_Doc->m_critsect.Enter();
     m_Doc->m_critsect.Leave();
+
 #endif //  !!__WXMSW__       // Deadlocks on Windows
 
     return NULL;
@@ -202,7 +202,9 @@ int RPCThread::ProcessRPCRequest() {
         break;
     case RPC_GET_PROJECT_STATUS1:
         if (current_request->exchangeBuf) {
+
             ((CC_STATE*)(current_request->arg1))->projects.clear();
+
             int n = (int)((CC_STATE*)(current_request->exchangeBuf))->projects.size();
             for (int i=0; i<n; i++) {
                 PROJECT* p = new PROJECT();
@@ -210,6 +212,7 @@ int RPCThread::ProcessRPCRequest() {
                 p->master_url = ((CC_STATE*)(current_request->exchangeBuf))->projects[i]->master_url;
                 ((CC_STATE*)(current_request->arg1))->projects.push_back(p);
             }
+
         }
         retval = (m_Doc->rpcClient).get_project_status(*(CC_STATE*)(current_request->arg1));
         break;
diff --git a/clientgui/AsyncRPC.h b/clientgui/AsyncRPC.h
index 85eba4e85f..98bf34bd16 100644
--- a/clientgui/AsyncRPC.h
+++ b/clientgui/AsyncRPC.h
@@ -22,12 +22,6 @@
 #pragma interface "AsyncRPC.cpp"
 #endif
 
-#include "wx/thread.h"
-
-//#include "BOINCBaseFrame.h"
-
-//#include "common_defs.h"
-//#include "gui_rpc_client.h"
 
 class CBOINCGUIApp;     // Forward declaration
 class CMainDocument;    // Forward declaration
@@ -155,11 +149,11 @@ public:
     AsyncRPC(CMainDocument *pDoc);
     ~AsyncRPC();
 
-    int                         RPC_Wait(
-                                    RPC_SELECTOR which_rpc, void* arg1 = NULL, void* 
-                                    arg2 = NULL, void* arg3 = NULL, void* arg4 = NULL, 
-                                    bool hasPriority = false
-                                );
+    int RPC_Wait(
+            RPC_SELECTOR which_rpc, void* arg1 = NULL, void* 
+            arg2 = NULL, void* arg3 = NULL, void* arg4 = NULL, 
+            bool hasPriority = false
+    );
 
     // Manager must do all RPC data transfers through AsyncRPC calls, so 
     // this class must have methods corresponding to all RPC_CLIENT data 
diff --git a/clientgui/browser.C b/clientgui/browser.cpp
similarity index 100%
rename from clientgui/browser.C
rename to clientgui/browser.cpp
diff --git a/clientgui/stdwx.h b/clientgui/stdwx.h
index 89e4ea0f53..e13ac22065 100644
--- a/clientgui/stdwx.h
+++ b/clientgui/stdwx.h
@@ -107,10 +107,8 @@
 #include <wx/sysopt.h>
 #include <wx/cshelp.h>
 #include <wx/grid.h>
-
-#if wxCHECK_VERSION(2,8,0)
+#include <wx/thread.h>
 #include <wx/imaglist.h>
-#endif
 
 #ifdef _WIN32
 
diff --git a/win_build/installerv2/BOINC.ism b/win_build/installerv2/BOINC.ism
index 99215be9895de2e200fe2c2eb32caf2bd5c7d242..a3fe43ca14a1e4c369125e3af76bd86c6c59f835 100644
GIT binary patch
delta 419
zcmV;U0bKsf^9;=M46tkj2EZ?bE<qo&as)=H0|o#Av%9T$0R}cMGcGYQlm2!em+wXa
z1+!PLqZ*>h1OsekbeGT^0Ufg%&fpuO>I9SA=^V2b?&Ke)4gmxPAZ=l8bz!y=0s0@N
zG64hzWFU8GbZE9V0s0fRN&yOa3Z4xQ2oVSk2<`;86vF{X8v;%aw_e@>qAvzROD0Zb
zc(x7#9|5;K4+6vpmKp*VrWgVOw-*`$=>e8R0vEO%0;DDb0002Dr$Pc*0k;=K0_h`{
zS!V(lrf32LmvCnS8n-cQ0?#9tca#DbrjP;zw-=NG=`WWc&H@UT3djNtro;jS17d7t
zmqEh<6SpnM0>d08dqFceGD0{vIW0v&HAF2mLpL)mIWsUeEjTndG&MysHZwCeG<~=B
z<N^T)w(J6U0s$tsdF}#-0SRbjY;ZX>E@W)B@B;S-w)g@85D0E#E@gOSdTh1`1NQ-@
z3IhZQE<;jOE^T3MX|@gnW&s^yZ)t90Up6i?E-^A+cWG{9Z+CNFX>N37Y<M^}w~P-1
NtR(>*w>dQflLVUZhp_+v

delta 454
zcmX@}ndi)Bo((xHYyz<d|Gt*lT*TtGl9_>lVe{^_6^xVrmC0|8SieGwEhn`^PeEbP
zDVE8%<fJz%p1Uv2mXwy6lj^qU70YI}cfaJ>6mk>uN)wmyF|urD6Ji7kq$reUmSik5
z0tuKg{t{+$_Ez&tt=Q(p$W_VZ$H&hh$id4ok9WJsVMY&Wrj?xA<L)so(%;U;$0W}v
zo0OlKmmF`VXRK#v7+;>5my%yz9G{t2lA2RtVYXeBpXmt4G6^Oo<`RXH>FYw7B(}3i
zF+FA6Cd0Hujaim~ar<&7rbtHd%=C;LATCKwQ7FsLDa}nS)=@~#$lvC|^ip|Q1{2G4
zha4uO?b10+=aiRC0CE$iFv)CZox=1)f7uZx7Qv!apcis-6p~Vt^K(-bO7o^iUt*G(
zo@dF(y<PDH(+(Lnhy%C(f5ODb&Y6*#Q($STmy)yX4O0aZBir`McTDY!+c`fleP`zc
zdPgs{BDE@K+Ycs2f$dxz%-<L}^_+u3^nl@(xr~dMWjiMya~h*swVQ>dfvcOLk*=A!
tse!JEi;J<YlcS51u7Rbgg^8Q1p`(kTN$vI?e&#i*jB490O_?XN000PBlW+h4

diff --git a/win_build/installerv2/BOINCx64.ism b/win_build/installerv2/BOINCx64.ism
index f1a2bad16b03c80876b2550bd7132ccba20b3ecc..9097e3db41a0aded1a80066a53d73f0d3e58a9da 100644
GIT binary patch
delta 532
zcmXAkPe_wt9LM+kp4WHpY<p)4OMPq`2`{qP^queC&Evbh4b~w#Nn|uqBc-7^L5ql>
zV~4a&pXc05y;O&>e8J~ZSlB^jc<Zu5czHWSir^)Ppm%ipe!hPW-_}{Mbrx(^1o891
zUuwjhs_<gKAyF6CCW&=PbI7EN>&H!E-RyTr)w3<KwbB@H_Sdpdi;}I{Tp0U&zWV)F
zn+~yDf2~2R_ku$jE@6Lyh*$?69J-`-Lad*jJaJ>R7ZF=V0w=x5jn(}{naMf|+3Aj@
zBe##rK(?=<?ni-LIV_!*LQ<ah?V=KacL9F;JF-SOk)edh^y2)&Oj%Ejr_^+Lb$(%X
zado-;FsGMwjXw{=ibMxNvHJn=gF7><83Dr0LHLNM3Ci{myjBq5Z}KpOxMD(km^CY2
zeGUY!R6L{`9<6t11KOkP(>I8**dF-puOP7XeTcFjhaj`3EfD#QJ$O4zPrbpf&fpZ<
zekx(b{tZ3icsey(sj!!AxX4Qq=7`E((v5|#dv~i7nflVL2s31SP5gg^ugQ1`(Fl&)
zJy_)N2tMj!UlKUZK0HGvO+b)eAHvN5k1O~HQ7^DZFz|Q+YiQ(gx}fINjG-m7T2W7G
vdcKg%jj3wVFifp*MH^GiV)jYFU^_{CfiGXin*l8P5I>i}NI(h;P2in>o0zK{

delta 649
zcmYk3&rcIk5Xbx8TcE|#B18)=+80PxgBH4FyIs5im82X5YoduJHY+Xd#${Kw1+2gR
z0wTr=?@Xhc=z)+n=^i<hgE2%8T+ANKUV2eNNJ!M9Z{tDcGV}S)H<Ovn{)vD8#J{65
z?Z<l;#lwNR!My5c%ZirAr9uv8a|`maTEdTIBd3*cRxxUqTBtfGup`&!3_ULjFZt(g
zVaSVkT2XUFEDE(d)N-${LS}Hi&2Ug{WxJn!s4LohMjRO%;rYy}qGk2fV&;h?W<;UB
zy`F%zH-#W#J)rVvYlFR=xsguKrZapjIz%It{4dn1t&ZwPhCL<55^;X)l&`kkVymAS
z;`jkw;ETgne=xqMIjk?ZH&y&c;d<B6x3C!i42u=5SdvxMJ$Q09b#n^q8kX^0x?rOR
zw8CZ#Fm1Y#%^75g2j?n-)4f)Y2o8E1GoZ8V```<D&w9JOO{=#FQY^HQ_24_Gj<Q)g
z=NgtZH>+h_)|c_Ttl>pjlN$k;0^GAWKc0w7<6{wtPfSGwAvzJ66htW!i%L>bN<`yQ
zEcU|62H}d=?1PZlA;>i@KpQj$;5!a**853#9}t_RauV7@W&tu}El){x=`|&Lozh!q
zkD7ZfH6cg79>9<l`UIOp=Ao<oq>f`~cbI=*H?e<H@**3Uorv~)h}#Sx#nJ<437Fle
zoj5^+8|RVJMsBTv<mNE+TXO?w$49n?X@f%!Fs~p;oXZH4@Gls!0>g*{-hW@8njpIo
Z6tap}(S{FsJRa*z903Njldf^J`xlP_)YSk0