Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=10061
This commit is contained in:
Rom Walton 2006-04-28 19:07:21 +00:00
parent a9ebba7ca1
commit 8ea1637954
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
checkin_notes
View File

@ -4286,3 +4286,14 @@ David 28 Apr 2006
sample_index.php
tools/
backend_lib.C
Rom 28 Apr 2006 (by Frank S. Thomas)
- Bug Fix: The shutdown procedure should be passing ANSI strings to
the GUI RPC's instead of Unicode strings.
- Bug Fix: Remove the --no-unicode flags from configure.ac when trying
to determine which wxWidget libraries to use.
/
configure.ac
clientgui/
BOINCGUIApp.cpp

6
clientgui/BOINCGUIApp.cpp
View File

@ -733,7 +733,7 @@ void CBOINCGUIApp::ShutdownBOINCCore() {
RPC_CLIENT rpc;
if (!rpc.init("localhost")) {
m_pDocument->m_pNetworkConnection->GetLocalPassword(strPassword);
rpc.authorize(strPassword.c_str());
rpc.authorize((const char*)strPassword.mb_str());
if (GetExitCodeProcess(m_hBOINCCoreProcess, &dwExitCode)) {
if (STILL_ACTIVE == dwExitCode) {
rpc.quit();
@ -834,7 +834,7 @@ void CBOINCGUIApp::ShutdownBOINCCore() {
RPC_CLIENT rpc;
if (!rpc.init("localhost")) {
m_pDocument->m_pNetworkConnection->GetLocalPassword(strPassword);
rpc.authorize(strPassword.c_str());
rpc.authorize((const char*)strPassword.mb_str());
if (ProcessExists(m_lBOINCCoreProcessId)) {
rpc.quit();
for (iCount = 0; iCount <= 10; iCount++) {
@ -876,7 +876,7 @@ void CBOINCGUIApp::ShutdownBOINCCore() {
RPC_CLIENT rpc;
if (!rpc.init("localhost")) {
m_pDocument->m_pNetworkConnection->GetLocalPassword(strPassword);
rpc.authorize(strPassword.c_str());
rpc.authorize((const char*)strPassword.mb_str());
if (wxProcess::Exists(m_lBOINCCoreProcessId)) {
rpc.quit();
for (iCount = 0; iCount <= 10; iCount++) {

8
configure.ac
View File

@ -469,15 +469,15 @@ dnl check for wxWidgets
if test "${enable_client_release}" = yes ; then
echo 'Portable client-build: checking for *static* wx-libs ...'
if test "${enable_debug}" = yes ; then
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=yes)
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --debug=yes)
else
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --unicode=no --debug=no)
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --static=yes --debug=no)
fi
else
if test "${enable_debug}" = yes ; then
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=no --debug=yes)
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --debug=yes)
else
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --unicode=no --debug=no)
AM_PATH_WXCONFIG([2.6.0], [wxWin=1], [wxWin=0], --debug=no)
fi
fi