[pkg-boinc-commits] r396 - in trunk/boinc/debian: . extra patches
Frank S. Thomas
fst-guest at costa.debian.org
Thu Apr 13 10:32:10 UTC 2006
Author: fst-guest
Date: 2006-04-13 10:32:09 +0000 (Thu, 13 Apr 2006)
New Revision: 396
Added:
trunk/boinc/debian/extra/global_prefs_override.xml
Modified:
trunk/boinc/debian/boinc-client.init
trunk/boinc/debian/boinc-client.install
trunk/boinc/debian/boinc-client.postinst
trunk/boinc/debian/changelog
trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
trunk/boinc/debian/patches/07_use-sensible-browser.dpatch
Log:
* Updated to new upstream version 5.4.2.
* Updated the wx-unicode and sensible-browser-patches.
* Use -daemon as option in the init script.
* Added /etc/boinc-client/global_prefs_override.xml.
Modified: trunk/boinc/debian/boinc-client.init
===================================================================
--- trunk/boinc/debian/boinc-client.init 2006-04-13 10:14:29 UTC (rev 395)
+++ trunk/boinc/debian/boinc-client.init 2006-04-13 10:32:09 UTC (rev 396)
@@ -51,7 +51,7 @@
PIDFILE=/var/run/boinc.pid
DESC="BOINC core client"
NAME=`basename $BOINC_CLIENT`
-BOINC_OPTS="-redirectio -dir $BOINC_DIR $BOINC_OPTS"
+BOINC_OPTS="-daemon -redirectio -dir $BOINC_DIR $BOINC_OPTS"
is_running()
{
Modified: trunk/boinc/debian/boinc-client.install
===================================================================
--- trunk/boinc/debian/boinc-client.install 2006-04-13 10:14:29 UTC (rev 395)
+++ trunk/boinc/debian/boinc-client.install 2006-04-13 10:32:09 UTC (rev 396)
@@ -1,3 +1,4 @@
+debian/extra/global_prefs_override.xml etc/boinc-client
debian/extra/gui_rpc_auth.cfg etc/boinc-client
debian/extra/remote_hosts.cfg etc/boinc-client
debian/tmp/usr/bin/boinc_cmd usr/bin
Modified: trunk/boinc/debian/boinc-client.postinst
===================================================================
--- trunk/boinc/debian/boinc-client.postinst 2006-04-13 10:14:29 UTC (rev 395)
+++ trunk/boinc/debian/boinc-client.postinst 2006-04-13 10:32:09 UTC (rev 396)
@@ -6,6 +6,15 @@
BOINC_DIR=/var/lib/boinc-client
CONF_DIR=/etc/boinc-client
+move_configfile_and_symlink()
+{
+ if [ ! -L $BOINC_DIR/$1 -a -f $BOINC_DIR/$1 ]; then
+ mv -f $BOINC_DIR/$1 $CONF_DIR/$1
+ fi
+ ln -sf $CONF_DIR/$1 $BOINC_DIR/$1
+ chown boinc:boinc $BOINC_DIR/$1
+}
+
case "$1" in
configure)
if ! getent passwd boinc >/dev/null; then
@@ -18,24 +27,11 @@
mkdir $BOINC_DIR 2>/dev/null || true
chown boinc:boinc $BOINC_DIR 2>/dev/null || true
- # Move old gui_rpc_auth.cfg and remote_hosts.cfg files to
- # /etc/boinc-client/ and create symlinks for the BOINC core client.
-
- if [ ! -L $BOINC_DIR/gui_rpc_auth.cfg -a \
- -f $BOINC_DIR/gui_rpc_auth.cfg ]; then
- mv -f $BOINC_DIR/gui_rpc_auth.cfg $CONF_DIR/gui_rpc_auth.cfg
- fi
-
- if [ ! -L $BOINC_DIR/remote_hosts.cfg -a \
- -f $BOINC_DIR/remote_hosts.cfg ]; then
- mv -f $BOINC_DIR/remote_hosts.cfg $CONF_DIR/remote_hosts.cfg
- fi
-
- ln -sf $CONF_DIR/gui_rpc_auth.cfg $BOINC_DIR/gui_rpc_auth.cfg
- ln -sf $CONF_DIR/remote_hosts.cfg $BOINC_DIR/remote_hosts.cfg
-
- chown boinc:boinc $BOINC_DIR/gui_rpc_auth.cfg \
- $BOINC_DIR/remote_hosts.cfg
+ # Move old configuration files to /etc/boinc-client/ and
+ # create symlinks for the BOINC core client.
+ move_configfile_and_symlink global_prefs_override.xml
+ move_configfile_and_symlink gui_rpc_auth.cfg
+ move_configfile_and_symlink remote_hosts.cfg
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/boinc/debian/changelog
===================================================================
--- trunk/boinc/debian/changelog 2006-04-13 10:14:29 UTC (rev 395)
+++ trunk/boinc/debian/changelog 2006-04-13 10:32:09 UTC (rev 396)
@@ -1,14 +1,24 @@
-boinc (5.4.0-1) UNRELEASED; urgency=low
+boinc (5.4.2-1) unstable; urgency=low
* New upstream release.
- BOINC Manager: Allow a connection request to reset a connection attempt
- to the local computer or another computer. (closes: #360143)
+ to the local computer or another computer. Thanks to Zlatko Calusic for
+ the report. (closes: #360143)
[ Frank S. Thomas ]
* debian/control:
- - Improved the short description of all three packages. (closes: #359332)
+ - Improved the short description of all three packages. Thanks to
+ Martin Schulze for his suggestions. (closes: #359332)
+ * debian/patches/:
+ - Removed 01_amd64-gcc4-fixes.dpatch, it was applied upstream.
+ - Updated 03_wx2.6-with-unicode.dpatch and 07_use-sensible-browser.dpatch
+ for the new upstream release.
+ * Added -daemon option to boinc-client's init script.
+ * Added conffile /etc/boinc-client/global_prefs_override.xml which can be
+ used to edit preferences locally. For more information about this file,
+ see http://boinc.berkeley.edu/prefs_override.php
- -- Frank S. Thomas <frank at thomas-alfeld.de> Tue, 11 Apr 2006 10:50:15 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Thu, 13 Apr 2006 12:04:30 +0200
boinc (5.2.15-3) unstable; urgency=low
Added: trunk/boinc/debian/extra/global_prefs_override.xml
===================================================================
--- trunk/boinc/debian/extra/global_prefs_override.xml 2006-04-13 10:14:29 UTC (rev 395)
+++ trunk/boinc/debian/extra/global_prefs_override.xml 2006-04-13 10:32:09 UTC (rev 396)
@@ -0,0 +1,2 @@
+<global_preferences>
+</global_preferences>
Modified: trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
===================================================================
--- trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch 2006-04-13 10:14:29 UTC (rev 395)
+++ trunk/boinc/debian/patches/03_wx2.6-with-unicode.dpatch 2006-04-13 10:32:09 UTC (rev 396)
@@ -5,880 +5,15 @@
## DP: No description.
@DPATCH@
-diff -urNad boinc-5.2.15~/clientgui/AccountManagerProcessingPage.cpp boinc-5.2.15/clientgui/AccountManagerProcessingPage.cpp
---- boinc-5.2.15~/clientgui/AccountManagerProcessingPage.cpp 2005-10-04 01:14:15.000000000 +0200
-+++ boinc-5.2.15/clientgui/AccountManagerProcessingPage.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -215,9 +215,9 @@
- break;
- case ATTACHACCTMGR_ATTACHACCTMGR_EXECUTE:
- // Attempt to attach to the accout manager.
-- url = ((CWizardAccountManager*)GetParent())->m_AccountManagerInfoPage->GetProjectURL().c_str();
-- username = ((CWizardAccountManager*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().c_str();
-- password = ((CWizardAccountManager*)GetParent())->m_AccountInfoPage->GetAccountPassword().c_str();
-+ url = (const char*)((CWizardAccountManager*)GetParent())->m_AccountManagerInfoPage->GetProjectURL().mb_str();
-+ username = (const char*)((CWizardAccountManager*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
-+ password = (const char*)((CWizardAccountManager*)GetParent())->m_AccountInfoPage->GetAccountPassword().mb_str();
- pDoc->rpc.acct_mgr_rpc(
- url.c_str(),
- username.c_str(),
-@@ -257,7 +257,7 @@
- } else {
- strBuffer = ((CWizardAccountManager*)GetParent())->m_CompletionErrorPage->m_ServerMessages->GetLabel();
- for (i=0; i<reply.messages.size(); i++) {
-- strBuffer += wxString(reply.messages[i].c_str()) + wxString(wxT("\n"));
-+ strBuffer += wxString(reply.messages[i].c_str(), wxConvUTF8) + wxString(wxT("\n"));
- }
- ((CWizardAccountManager*)GetParent())->m_CompletionErrorPage->m_ServerMessages->SetLabel(strBuffer);
- }
-diff -urNad boinc-5.2.15~/clientgui/AccountManagerPropertiesPage.cpp boinc-5.2.15/clientgui/AccountManagerPropertiesPage.cpp
---- boinc-5.2.15~/clientgui/AccountManagerPropertiesPage.cpp 2005-11-29 09:06:44.000000000 +0100
-+++ boinc-5.2.15/clientgui/AccountManagerPropertiesPage.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -217,7 +217,7 @@
- case ACCTMGRPROP_RETRPROJECTPROPERTIES_EXECUTE:
- // Attempt to retrieve the project's account creation policies
- pDoc->rpc.get_project_config(
-- ((CWizardAccountManager*)GetParent())->m_AccountManagerInfoPage->GetProjectURL().c_str()
-+ (const char*)((CWizardAccountManager*)GetParent())->m_AccountManagerInfoPage->GetProjectURL().mb_str()
- );
-
- // Wait until we are done processing the request.
-diff -urNad boinc-5.2.15~/clientgui/BOINCBaseView.cpp boinc-5.2.15/clientgui/BOINCBaseView.cpp
---- boinc-5.2.15~/clientgui/BOINCBaseView.cpp 2005-09-30 11:00:47.000000000 +0200
-+++ boinc-5.2.15/clientgui/BOINCBaseView.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -279,7 +279,7 @@
- wxString CBOINCBaseView::OnListGetItemText(
- long WXUNUSED(item), long WXUNUSED(column)
- ) const {
-- return wxString("Undefined");
-+ return wxString(wxT("Undefined"));
- }
-
-
-@@ -299,17 +299,17 @@
-
-
- wxString CBOINCBaseView::OnDocGetItemText(long WXUNUSED(item), long WXUNUSED(column)) const {
-- return wxString("Undefined");
-+ return wxString(wxT("Undefined"));
- }
-
-
- wxString CBOINCBaseView::OnDocGetItemImage(long WXUNUSED(item)) const {
-- return wxString("Undefined");
-+ return wxString(wxT("Undefined"));
- }
-
-
- wxString CBOINCBaseView::OnDocGetItemAttr(long WXUNUSED(item)) const {
-- return wxString("Undefined");
-+ return wxString(wxT("Undefined"));
- }
-
-
-@@ -414,7 +414,7 @@
- if (existing.size() == 0) {
- existing = additional;
- } else {
-- existing = existing + ", " + additional;
-+ existing = existing + wxT(", ") + additional;
- }
- }
-
-diff -urNad boinc-5.2.15~/clientgui/BOINCGUIApp.cpp boinc-5.2.15/clientgui/BOINCGUIApp.cpp
---- boinc-5.2.15~/clientgui/BOINCGUIApp.cpp 2005-12-06 13:01:41.000000000 +0100
-+++ boinc-5.2.15/clientgui/BOINCGUIApp.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -312,7 +312,7 @@
- }
-
- #else
-- char* p = getenv("DISPLAY");
-+ wxString p = wxString(getenv("DISPLAY"), wxConvUTF8);
- if (p) m_strDefaultDisplay = p;
- #endif
-
-@@ -421,7 +421,7 @@
-
- #ifndef __WXMSW__
- // copy the path to the boinmgr from argv[0]
-- strncpy(szExecutableDirectory, wxGetApp().argv[0], sizeof(szExecutableDirectory));
-+ strncpy((char*)szExecutableDirectory, (const char*)wxGetApp().argv[0], sizeof(szExecutableDirectory));
- #endif
-
- // We are only interested in the path component of the fully qualified path.
-diff -urNad boinc-5.2.15~/clientgui/BOINCGUIApp.h boinc-5.2.15/clientgui/BOINCGUIApp.h
---- boinc-5.2.15~/clientgui/BOINCGUIApp.h 2005-10-01 10:56:37.000000000 +0200
-+++ boinc-5.2.15/clientgui/BOINCGUIApp.h 2006-03-22 17:46:12.000000000 +0100
-@@ -87,9 +87,9 @@
-
- public:
-
-- std::string m_strDefaultWindowStation;
-- std::string m_strDefaultDesktop;
-- std::string m_strDefaultDisplay;
-+ wxString m_strDefaultWindowStation;
-+ wxString m_strDefaultDesktop;
-+ wxString m_strDefaultDisplay;
-
- bool OnInit();
-
-diff -urNad boinc-5.2.15~/clientgui/DlgAbout.cpp boinc-5.2.15/clientgui/DlgAbout.cpp
---- boinc-5.2.15~/clientgui/DlgAbout.cpp 2005-10-04 01:14:13.000000000 +0200
-+++ boinc-5.2.15/clientgui/DlgAbout.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -73,7 +73,7 @@
-
- bool CDlgAbout::Create(wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style) {
- ////@begin CDlgAbout member initialisation
-- m_strVersion = BOINC_VERSION_STRING;
-+ m_strVersion = wxT(BOINC_VERSION_STRING);
- ////@end CDlgAbout member initialisation
-
- ////@begin CDlgAbout creation
-diff -urNad boinc-5.2.15~/clientgui/MainDocument.cpp boinc-5.2.15/clientgui/MainDocument.cpp
---- boinc-5.2.15~/clientgui/MainDocument.cpp 2005-11-29 10:14:20.000000000 +0100
-+++ boinc-5.2.15/clientgui/MainDocument.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -63,7 +63,7 @@
- buf[n] = 0;
- }
- }
-- strPassword = buf;
-+ strPassword = wxString(buf, wxConvUTF8);
- }
-
- // TODO: get rid of "reconnecting" stuff
-@@ -86,7 +86,7 @@
- m_bUseDefaultPassword = FALSE;
- }
-
-- retval = m_pDocument->rpc.authorize(m_strNewComputerPassword.c_str());
-+ retval = m_pDocument->rpc.authorize(m_strNewComputerPassword.mb_str());
- if (!retval) {
- wxLogTrace(wxT("Function Status"), wxT("CNetworkConnection::Poll - Connection Success"));
- SetStateSuccess(m_strNewComputerName, m_strNewComputerPassword);
-@@ -127,7 +127,7 @@
- if (IsComputerNameLocal(strComputer)) {
- retval = m_pDocument->rpc.init_asynch(NULL, 60., true);
- } else {
-- retval = m_pDocument->rpc.init_asynch(strComputer.c_str(), 60., false);
-+ retval = m_pDocument->rpc.init_asynch(strComputer.mb_str(), 60., false);
- }
-
- if (!retval) {
-@@ -326,7 +326,7 @@
- m_dtCachedStateTimestamp = m_dtCachedStateLockTimestamp;
- retval = rpc.get_state(state);
- if (retval) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedStateUpdate - Get State Failed '%d'", retval);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedStateUpdate - Get State Failed '%d'"), retval);
- m_pNetworkConnection->SetStateDisconnected();
- }
-
-@@ -334,7 +334,7 @@
-
- retval = rpc.get_host_info(host);
- if (retval) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedStateUpdate - Get Host Information Failed '%d'", retval);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedStateUpdate - Get Host Information Failed '%d'"), retval);
- m_pNetworkConnection->SetStateDisconnected();
- }
-
-@@ -590,7 +590,7 @@
- if (IsConnected()) {
- iRetVal = rpc.get_project_status(project_status);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedProjectStatusUpdate - Get Project Status Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedProjectStatusUpdate - Get Project Status Failed '%d'"), iRetVal);
- m_pNetworkConnection->SetStateDisconnected();
- }
-
-@@ -639,7 +639,7 @@
-
-
- int CMainDocument::ProjectAttach(const wxString& strURL, const wxString& strAccountKey) {
-- return rpc.project_attach(strURL.c_str(), strAccountKey.c_str());
-+ return rpc.project_attach((const char*)strURL.mb_str(), (const char*)strAccountKey.mb_str());
- }
-
-
-@@ -650,7 +650,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("detach"));
-+ iRetVal = rpc.project_op((*pProject), "detach");
-
- return iRetVal;
- }
-@@ -663,7 +663,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("update"));
-+ iRetVal = rpc.project_op((*pProject), "update");
-
- return iRetVal;
- }
-@@ -676,7 +676,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("reset"));
-+ iRetVal = rpc.project_op((*pProject), "reset");
-
- return iRetVal;
- }
-@@ -689,7 +689,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("suspend"));
-+ iRetVal = rpc.project_op((*pProject), "suspend");
-
- return iRetVal;
- }
-@@ -702,7 +702,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("resume"));
-+ iRetVal = rpc.project_op((*pProject), "resume");
-
- return iRetVal;
- }
-@@ -714,7 +714,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("nomorework"));
-+ iRetVal = rpc.project_op((*pProject), "nomorework");
-
- return iRetVal;
- }
-@@ -726,7 +726,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("allowmorework"));
-+ iRetVal = rpc.project_op((*pProject), "allowmorework");
-
- return iRetVal;
- }
-@@ -738,7 +738,7 @@
- if (IsConnected()) {
- iRetVal = rpc.get_results(results);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedResultsStatusUpdate - Get Result Status Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedResultsStatusUpdate - Get Result Status Failed '%d'"), iRetVal);
- m_pNetworkConnection->SetStateDisconnected();
- }
- }
-@@ -791,7 +791,7 @@
- if (pResult) {
- pStateResult = state.lookup_result(pResult->project_url, pResult->name);
- if (pStateResult) {
-- iRetVal = rpc.result_op((*pStateResult), wxT("suspend"));
-+ iRetVal = rpc.result_op((*pStateResult), "suspend");
- } else {
- ForceCacheUpdate();
- }
-@@ -811,7 +811,7 @@
- if (pResult) {
- pStateResult = state.lookup_result(pResult->project_url, pResult->name);
- if (pStateResult) {
-- iRetVal = rpc.result_op((*pStateResult), wxT("resume"));
-+ iRetVal = rpc.result_op((*pStateResult), "resume");
- } else {
- ForceCacheUpdate();
- }
-@@ -854,7 +854,7 @@
- if (pResult) {
- pStateResult = state.lookup_result(pResult->project_url, pResult->name);
- if (pStateResult) {
-- iRetVal = rpc.result_op((*pStateResult), wxT("abort"));
-+ iRetVal = rpc.result_op((*pStateResult), "abort");
- } else {
- ForceCacheUpdate();
- }
-@@ -874,7 +874,7 @@
- if (IsConnected()) {
- retval = rpc.get_messages(m_iMessageSequenceNumber, messages);
- if (retval) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedMessageUpdate - Get Messages Failed '%d'", retval);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedMessageUpdate - Get Messages Failed '%d'"), retval);
- m_pNetworkConnection->SetStateDisconnected();
- goto done;
- }
-@@ -935,7 +935,7 @@
- if (IsConnected()) {
- iRetVal = rpc.get_file_transfers(ft);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedFileTransfersUpdate - Get File Transfers Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedFileTransfersUpdate - Get File Transfers Failed '%d'"), iRetVal);
- m_pNetworkConnection->SetStateDisconnected();
- }
- }
-@@ -985,7 +985,7 @@
- pFT = file_transfer(iIndex);
-
- if (pFT)
-- iRetVal = rpc.file_transfer_op((*pFT), wxT("retry"));
-+ iRetVal = rpc.file_transfer_op((*pFT), "retry");
-
- return iRetVal;
- }
-@@ -998,7 +998,7 @@
- pFT = file_transfer(iIndex);
-
- if (pFT)
-- iRetVal = rpc.file_transfer_op((*pFT), wxT("abort"));
-+ iRetVal = rpc.file_transfer_op((*pFT), "abort");
-
- return iRetVal;
- }
-@@ -1010,7 +1010,7 @@
- if (IsConnected()) {
- iRetVal = rpc.get_disk_usage(resource_status);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedResourceStatusUpdate - Get Disk Usage Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedResourceStatusUpdate - Get Disk Usage Failed '%d'"), iRetVal);
- m_pNetworkConnection->SetStateDisconnected();
- }
- }
-@@ -1061,7 +1061,7 @@
- if (IsConnected()) {
- iRetVal = rpc.get_statistics(statistics_status);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedStatisticsStatusUpdate - Get Statistics Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedStatisticsStatusUpdate - Get Statistics Failed '%d'"), iRetVal);
- m_pNetworkConnection->SetStateDisconnected();
- }
- }
-@@ -1112,7 +1112,7 @@
-
- iRetVal = rpc.get_proxy_settings(proxy_info);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::GetProxyInfo - Get Proxy Info Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::GetProxyInfo - Get Proxy Info Failed '%d'"), iRetVal);
- }
-
- return iRetVal;
-@@ -1131,7 +1131,7 @@
-
- iRetVal = rpc.set_proxy_settings(proxy_info);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::SetProxyInfo - Set Proxy Info Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::SetProxyInfo - Set Proxy Info Failed '%d'"), iRetVal);
- }
-
- return iRetVal;
-diff -urNad boinc-5.2.15~/clientgui/MainFrame.cpp boinc-5.2.15/clientgui/MainFrame.cpp
---- boinc-5.2.15~/clientgui/MainFrame.cpp 2005-12-06 13:01:41.000000000 +0100
-+++ boinc-5.2.15/clientgui/MainFrame.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -989,9 +989,9 @@
- CDlgAccountManagerStatus* pDlgStatus = new CDlgAccountManagerStatus(this);
-
- strTitle = pDlgStatus->GetTitle();
-- strTitle += wxT(" - ") + wxString(ami.acct_mgr_name.c_str());
-- pDlgStatus->SetAcctManagerName(ami.acct_mgr_name.c_str());
-- pDlgStatus->SetAcctManagerURL(ami.acct_mgr_url.c_str());
-+ strTitle += wxT(" - ") + wxString(wxString(ami.acct_mgr_name.c_str(), wxConvUTF8));
-+ pDlgStatus->SetAcctManagerName(wxString(ami.acct_mgr_name.c_str(), wxConvUTF8));
-+ pDlgStatus->SetAcctManagerURL(wxString(ami.acct_mgr_url.c_str(), wxConvUTF8));
- pDlgStatus->SetTitle(strTitle);
-
- iAnswer = pDlgStatus->ShowModal();
-@@ -1007,8 +1007,8 @@
- wxString strURL = wxEmptyString;
- bool bCredentialsCached = false;
- if (ID_UPDATE == iAnswer) {
-- strName = ami.acct_mgr_name.c_str();
-- strURL = ami.acct_mgr_url.c_str();
-+ strName = wxString(ami.acct_mgr_name.c_str(), wxConvUTF8);
-+ strURL = wxString(ami.acct_mgr_url.c_str(), wxConvUTF8);
- bCredentialsCached = ami.have_credentials;
- }
- pWizard->Run( strName, strURL, bCredentialsCached );
-@@ -1154,17 +1154,17 @@
- }
-
- pDlg->m_EnableHTTPProxyCtrl->SetValue(pDoc->proxy_info.use_http_proxy);
-- pDlg->m_HTTPAddressCtrl->SetValue(pDoc->proxy_info.http_server_name.c_str());
-- pDlg->m_HTTPUsernameCtrl->SetValue(pDoc->proxy_info.http_user_name.c_str());
-- pDlg->m_HTTPPasswordCtrl->SetValue(pDoc->proxy_info.http_user_passwd.c_str());
-+ pDlg->m_HTTPAddressCtrl->SetValue(wxString(pDoc->proxy_info.http_server_name.c_str(), wxConvUTF8));
-+ pDlg->m_HTTPUsernameCtrl->SetValue(wxString(pDoc->proxy_info.http_user_name.c_str(), wxConvUTF8));
-+ pDlg->m_HTTPPasswordCtrl->SetValue(wxString(pDoc->proxy_info.http_user_passwd.c_str(), wxConvUTF8));
-
- strBuffer.Printf(wxT("%d"), pDoc->proxy_info.http_server_port);
- pDlg->m_HTTPPortCtrl->SetValue(strBuffer);
-
- pDlg->m_EnableSOCKSProxyCtrl->SetValue(pDoc->proxy_info.use_socks_proxy);
-- pDlg->m_SOCKSAddressCtrl->SetValue(pDoc->proxy_info.socks_server_name.c_str());
-- pDlg->m_SOCKSUsernameCtrl->SetValue(pDoc->proxy_info.socks5_user_name.c_str());
-- pDlg->m_SOCKSPasswordCtrl->SetValue(pDoc->proxy_info.socks5_user_passwd.c_str());
-+ pDlg->m_SOCKSAddressCtrl->SetValue(wxString(pDoc->proxy_info.socks_server_name.c_str(), wxConvUTF8));
-+ pDlg->m_SOCKSUsernameCtrl->SetValue(wxString(pDoc->proxy_info.socks5_user_name.c_str(), wxConvUTF8));
-+ pDlg->m_SOCKSPasswordCtrl->SetValue(wxString(pDoc->proxy_info.socks5_user_passwd.c_str(), wxConvUTF8));
-
- strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port);
- pDlg->m_SOCKSPortCtrl->SetValue(strBuffer);
-@@ -1193,18 +1193,18 @@
- // Proxy Tabs
- if (bRetrievedProxyConfiguration) {
- pDoc->proxy_info.use_http_proxy = pDlg->m_EnableHTTPProxyCtrl->GetValue();
-- pDoc->proxy_info.http_server_name = pDlg->m_HTTPAddressCtrl->GetValue().c_str();
-- pDoc->proxy_info.http_user_name = pDlg->m_HTTPUsernameCtrl->GetValue().c_str();
-- pDoc->proxy_info.http_user_passwd = pDlg->m_HTTPPasswordCtrl->GetValue().c_str();
-+ pDoc->proxy_info.http_server_name = (const char*)pDlg->m_HTTPAddressCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.http_user_name = (const char*)pDlg->m_HTTPUsernameCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.http_user_passwd = (const char*)pDlg->m_HTTPPasswordCtrl->GetValue().mb_str();
-
- strBuffer = pDlg->m_HTTPPortCtrl->GetValue();
- strBuffer.ToLong((long*)&iBuffer);
- pDoc->proxy_info.http_server_port = iBuffer;
-
- pDoc->proxy_info.use_socks_proxy = pDlg->m_EnableSOCKSProxyCtrl->GetValue();
-- pDoc->proxy_info.socks_server_name = pDlg->m_SOCKSAddressCtrl->GetValue().c_str();
-- pDoc->proxy_info.socks5_user_name = pDlg->m_SOCKSUsernameCtrl->GetValue().c_str();
-- pDoc->proxy_info.socks5_user_passwd = pDlg->m_SOCKSPasswordCtrl->GetValue().c_str();
-+ pDoc->proxy_info.socks_server_name = (const char*)pDlg->m_SOCKSAddressCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.socks5_user_name = (const char*)pDlg->m_SOCKSUsernameCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.socks5_user_passwd = (const char*)pDlg->m_SOCKSPasswordCtrl->GetValue().mb_str();
-
- strBuffer = pDlg->m_SOCKSPortCtrl->GetValue();
- strBuffer.ToLong((long*)&iBuffer);
-@@ -1366,8 +1366,8 @@
- pDoc->rpc.acct_mgr_info(ami);
- if (ami.acct_mgr_url.size()) {
- pAMWizard = new CWizardAccountManager(this);
-- strName = ami.acct_mgr_name.c_str();
-- strURL = ami.acct_mgr_url.c_str();
-+ strName = wxString(ami.acct_mgr_name.c_str(), wxConvUTF8);
-+ strURL = wxString(ami.acct_mgr_url.c_str(), wxConvUTF8);
- if (ami.have_credentials) {
- pAMWizard->Run(strName, strURL, true);
- } else {
-@@ -1376,8 +1376,8 @@
- } else {
- pAPWizard = new CWizardAttachProject(this);
- pDoc->rpc.get_project_init_status(pis);
-- strName = pis.name.c_str();
-- strURL = pis.url.c_str();
-+ strName = wxString(pis.name.c_str(), wxConvUTF8);
-+ strURL = wxString(pis.url.c_str(), wxConvUTF8);
- if (pis.url.length() && pis.has_account_key) {
- pAPWizard->Run(strName, strURL, true);
- } else {
-@@ -1766,7 +1766,7 @@
- wxString strComputerName = wxEmptyString;
- wxString strStatusText = wxEmptyString;
- wxString strTitle = m_strBaseTitle;
-- wxString strLocale = setlocale(LC_NUMERIC, NULL);
-+ wxString strLocale = wxString(setlocale(LC_NUMERIC, NULL), wxConvUTF8);
-
- if (pDoc->IsReconnecting())
- pDoc->GetConnectingComputerName(strComputerName);
-diff -urNad boinc-5.2.15~/clientgui/ProjectProcessingPage.cpp boinc-5.2.15/clientgui/ProjectProcessingPage.cpp
---- boinc-5.2.15~/clientgui/ProjectProcessingPage.cpp 2005-10-04 01:14:19.000000000 +0200
-+++ boinc-5.2.15/clientgui/ProjectProcessingPage.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -366,25 +366,25 @@
- ai->clear();
- ao->clear();
-
-- ai->url = ((CWizardAttachProject*)GetParent())->m_ProjectInfoPage->GetProjectURL().c_str();
-+ ai->url = (const char*)((CWizardAttachProject*)GetParent())->m_ProjectInfoPage->GetProjectURL().mb_str();
-
- if (!((CWizardAttachProject*)GetParent())->m_AccountKeyPage->m_strAccountKey.IsEmpty() ||
- ((CWizardAttachProject*)GetParent())->m_bCredentialsCached
- ) {
- if (!((CWizardAttachProject*)GetParent())->m_bCredentialsCached) {
-- ao->authenticator = ((CWizardAttachProject*)GetParent())->m_AccountKeyPage->m_strAccountKey.c_str();
-+ ao->authenticator = (const char*)((CWizardAttachProject*)GetParent())->m_AccountKeyPage->m_strAccountKey.mb_str();
- }
- SetProjectCommunitcationsSucceeded(true);
- } else {
- if (((CWizardAttachProject*)GetParent())->m_AccountInfoPage->m_AccountCreateCtrl->GetValue()) {
- if (!((CWizardAttachProject*)GetParent())->project_config.uses_username) {
-- ai->email_addr = ((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().c_str();
-- ai->user_name = ::wxGetUserName().c_str();
-+ ai->email_addr = (const char*)((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
-+ ai->user_name = (const char*)wxGetUserName().mb_str();
- } else {
-- ai->email_addr = wxT("");
-- ai->user_name = ((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().c_str();
-+ ai->email_addr = "";
-+ ai->user_name = (const char*)((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
- }
-- ai->passwd = ((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountPassword().c_str();
-+ ai->passwd = (const char*)((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountPassword().mb_str();
- pDoc->rpc.create_account(*ai);
-
- // Wait until we are done processing the request.
-@@ -412,11 +412,11 @@
- }
- } else {
- if (!((CWizardAttachProject*)GetParent())->project_config.uses_username) {
-- ai->email_addr = ((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().c_str();
-+ ai->email_addr = (const char*)((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
- } else {
-- ai->user_name = ((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().c_str();
-+ ai->user_name = (const char*)((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
- }
-- ai->passwd = ((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountPassword().c_str();
-+ ai->passwd = (const char*)((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountPassword().mb_str();
-
- pDoc->rpc.lookup_account(*ai);
-
-@@ -512,8 +512,8 @@
- if (!iReturnValue && !reply.error_num && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTATTACH)) {
- SetProjectAttachSucceeded(true);
- ((CWizardAttachProject*)GetParent())->SetAttachedToProjectSuccessfully(true);
-- ((CWizardAttachProject*)GetParent())->SetProjectURL(ai->url.c_str());
-- ((CWizardAttachProject*)GetParent())->SetProjectAuthenticator(ao->authenticator.c_str());
-+ ((CWizardAttachProject*)GetParent())->SetProjectURL(wxString(ai->url.c_str(), wxConvUTF8));
-+ ((CWizardAttachProject*)GetParent())->SetProjectAuthenticator(wxString(ao->authenticator.c_str(), wxConvUTF8));
- } else {
- SetProjectAttachSucceeded(false);
- if ((HTTP_STATUS_INTERNAL_SERVER_ERROR == reply.error_num) || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
-@@ -523,9 +523,9 @@
- } else {
- strBuffer = ((CWizardAttachProject*)GetParent())->m_CompletionErrorPage->m_ServerMessages->GetLabel();
- for (i=0; i<reply.messages.size(); i++) {
-- strBuffer += wxString(reply.messages[i].c_str()) + wxString(wxT("\n"));
-+ strBuffer += wxString(reply.messages[i].c_str(), wxConvUTF8) + wxString(wxT("\n"));
- }
-- ((CWizardAttachProject*)GetParent())->m_CompletionErrorPage->m_ServerMessages->SetLabel(strBuffer);
-+ ((CWizardAttachProject*)GetParent())->m_CompletionErrorPage->m_ServerMessages->SetLabel(wxString(strBuffer, wxConvUTF8));
- }
- }
- } else {
-diff -urNad boinc-5.2.15~/clientgui/ProjectPropertiesPage.cpp boinc-5.2.15/clientgui/ProjectPropertiesPage.cpp
---- boinc-5.2.15~/clientgui/ProjectPropertiesPage.cpp 2005-11-29 09:06:47.000000000 +0100
-+++ boinc-5.2.15/clientgui/ProjectPropertiesPage.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -373,7 +373,7 @@
- case PROJPROP_RETRPROJECTPROPERTIES_EXECUTE:
- // Attempt to retrieve the project's account creation policies
- pDoc->rpc.get_project_config(
-- ((CWizardAttachProject*)GetParent())->m_ProjectInfoPage->GetProjectURL().c_str()
-+ (const char*)((CWizardAttachProject*)GetParent())->m_ProjectInfoPage->GetProjectURL().mb_str()
- );
-
- // Wait until we are done processing the request.
-@@ -415,7 +415,7 @@
- }
-
- bSuccessfulCondition = (ERR_ALREADY_ATTACHED == pDoc->rpc.project_attach(
-- ((CWizardAttachProject*)GetParent())->m_ProjectInfoPage->GetProjectURL().c_str(),
-+ (const char*)((CWizardAttachProject*)GetParent())->m_ProjectInfoPage->GetProjectURL().mb_str(),
- ""
- ));
- if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTALREADYATTACHED)) {
-diff -urNad boinc-5.2.15~/clientgui/ProxyPage.cpp boinc-5.2.15/clientgui/ProxyPage.cpp
---- boinc-5.2.15~/clientgui/ProxyPage.cpp 2005-10-04 01:14:20.000000000 +0200
-+++ boinc-5.2.15/clientgui/ProxyPage.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -299,16 +299,16 @@
- if (event.GetDirection() == true) {
- // Moving from the previous page, get state
- pDoc->GetProxyConfiguration();
-- m_ProxyHTTPServerCtrl->SetValue(pDoc->proxy_info.http_server_name.c_str());
-- m_ProxyHTTPUsernameCtrl->SetValue(pDoc->proxy_info.http_user_name.c_str());
-- m_ProxyHTTPPasswordCtrl->SetValue(pDoc->proxy_info.http_user_passwd.c_str());
-+ m_ProxyHTTPServerCtrl->SetValue(wxString(pDoc->proxy_info.http_server_name.c_str(), wxConvUTF8));
-+ m_ProxyHTTPUsernameCtrl->SetValue(wxString(pDoc->proxy_info.http_user_name.c_str(), wxConvUTF8));
-+ m_ProxyHTTPPasswordCtrl->SetValue(wxString(pDoc->proxy_info.http_user_passwd.c_str(), wxConvUTF8));
-
- strBuffer.Printf(wxT("%d"), pDoc->proxy_info.http_server_port);
- m_ProxyHTTPPortCtrl->SetValue(strBuffer);
-
-- m_ProxySOCKSServerCtrl->SetValue(pDoc->proxy_info.socks_server_name.c_str());
-- m_ProxySOCKSUsernameCtrl->SetValue(pDoc->proxy_info.socks5_user_name.c_str());
-- m_ProxySOCKSPasswordCtrl->SetValue(pDoc->proxy_info.socks5_user_passwd.c_str());
-+ m_ProxySOCKSServerCtrl->SetValue(wxString(pDoc->proxy_info.socks_server_name.c_str(), wxConvUTF8));
-+ m_ProxySOCKSUsernameCtrl->SetValue(wxString(pDoc->proxy_info.socks5_user_name.c_str(), wxConvUTF8));
-+ m_ProxySOCKSPasswordCtrl->SetValue(wxString(pDoc->proxy_info.socks5_user_passwd.c_str(), wxConvUTF8));
-
- strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port);
- m_ProxySOCKSPortCtrl->SetValue(strBuffer);
-@@ -332,18 +332,18 @@
- if (event.GetDirection() == true) {
- // Moving to the next page, save state
- pDoc->proxy_info.use_http_proxy = (m_ProxyHTTPServerCtrl->GetValue().Length() > 0);
-- pDoc->proxy_info.http_server_name = m_ProxyHTTPServerCtrl->GetValue().c_str();
-- pDoc->proxy_info.http_user_name = m_ProxyHTTPUsernameCtrl->GetValue().c_str();
-- pDoc->proxy_info.http_user_passwd = m_ProxyHTTPPasswordCtrl->GetValue().c_str();
-+ pDoc->proxy_info.http_server_name = (const char*)m_ProxyHTTPServerCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.http_user_name = (const char*)m_ProxyHTTPUsernameCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.http_user_passwd = (const char*)m_ProxyHTTPPasswordCtrl->GetValue().mb_str();
-
- strBuffer = m_ProxyHTTPPortCtrl->GetValue();
- strBuffer.ToLong((long*)&iBuffer);
- pDoc->proxy_info.http_server_port = iBuffer;
-
- pDoc->proxy_info.use_socks_proxy = (m_ProxySOCKSServerCtrl->GetValue().Length() > 0);
-- pDoc->proxy_info.socks_server_name = m_ProxySOCKSServerCtrl->GetValue().c_str();
-- pDoc->proxy_info.socks5_user_name = m_ProxySOCKSUsernameCtrl->GetValue().c_str();
-- pDoc->proxy_info.socks5_user_passwd = m_ProxySOCKSPasswordCtrl->GetValue().c_str();
-+ pDoc->proxy_info.socks_server_name = (const char*)m_ProxySOCKSServerCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.socks5_user_name = (const char*)m_ProxySOCKSUsernameCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.socks5_user_passwd = (const char*)m_ProxySOCKSPasswordCtrl->GetValue().mb_str();
-
- strBuffer = m_ProxySOCKSPortCtrl->GetValue();
- strBuffer.ToLong((long*)&iBuffer);
-diff -urNad boinc-5.2.15~/clientgui/ValidateURL.cpp boinc-5.2.15/clientgui/ValidateURL.cpp
---- boinc-5.2.15~/clientgui/ValidateURL.cpp 2005-11-29 09:06:48.000000000 +0100
-+++ boinc-5.2.15/clientgui/ValidateURL.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -63,7 +63,7 @@
- bool ok = TRUE;
- std::string canonicalize_url;
-
-- canonicalize_url = control->GetValue().Trim().Trim(false).c_str(); // trim spaces before and after
-+ canonicalize_url = control->GetValue().Trim().Trim(false).mb_str(); // trim spaces before and after
-
- if (canonicalize_url.size() == 0) {
- ok = FALSE;
-@@ -71,9 +71,9 @@
- m_errormsg = _("Please specify a URL.\nFor example:\nhttp://www.example.com/");
- } else {
- canonicalize_master_url(canonicalize_url);
-- wxURI uri(canonicalize_url.c_str());
-- wxURL url(canonicalize_url.c_str());
-- wxString strURL(canonicalize_url.c_str());
-+ wxURI uri(wxString(canonicalize_url.c_str(), wxConvUTF8));
-+ wxURL url(wxString(canonicalize_url.c_str(), wxConvUTF8));
-+ wxString strURL(canonicalize_url.c_str(), wxConvUTF8);
- wxString strServer(uri.GetServer());
- int iServerDotLocation = strServer.Find(wxT("."));
- int iFirstPart = strServer.Mid(0, iServerDotLocation).Length();
-@@ -129,7 +129,7 @@
- }
-
- if (ok) {
-- control->SetValue(canonicalize_url.c_str());
-+ control->SetValue(wxString(canonicalize_url.c_str(), wxConvUTF8));
- }
-
- return ok;
-diff -urNad boinc-5.2.15~/clientgui/ViewMessages.cpp boinc-5.2.15/clientgui/ViewMessages.cpp
---- boinc-5.2.15~/clientgui/ViewMessages.cpp 2005-09-06 08:18:36.000000000 +0200
-+++ boinc-5.2.15/clientgui/ViewMessages.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -287,7 +287,7 @@
- MESSAGE* message = wxGetApp().GetDocument()->message(item);
-
- if (message) {
-- strBuffer = wxString(message->project.c_str());
-+ strBuffer = wxString(message->project.c_str(), wxConvUTF8);
- }
-
- return 0;
-@@ -329,7 +329,7 @@
- MESSAGE* message = wxGetApp().GetDocument()->message(item);
-
- if (message) {
-- strBuffer = wxString(message->body.c_str());
-+ strBuffer = wxString(message->body.c_str(), wxConvUTF8);
- }
-
- strBuffer.Replace(wxT("\n"), wxT(""), true);
-diff -urNad boinc-5.2.15~/clientgui/ViewProjects.cpp boinc-5.2.15/clientgui/ViewProjects.cpp
---- boinc-5.2.15~/clientgui/ViewProjects.cpp 2005-11-02 19:36:03.000000000 +0100
-+++ boinc-5.2.15/clientgui/ViewProjects.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -609,9 +609,9 @@
-
- // Default project url
- pItem = new CTaskItem(
-- project->project_name.c_str(),
-+ wxString(project->project_name.c_str(), wxConvUTF8),
- wxT(""),
-- project->master_url.c_str(),
-+ wxString(project->master_url.c_str(), wxConvUTF8),
- ID_TASK_PROJECT_WEB_PROJDEF_MIN
- );
- pGroup->m_Tasks.push_back(pItem);
-@@ -620,9 +620,9 @@
- // Project defined urls
- for (i=0;(i<project->gui_urls.size())&&(i<=ID_TASK_PROJECT_WEB_PROJDEF_MAX);i++) {
- pItem = new CTaskItem(
-- _(project->gui_urls[i].name.c_str()),
-- _(project->gui_urls[i].description.c_str()),
-- project->gui_urls[i].url.c_str(),
-+ wxString(project->gui_urls[i].name.c_str(), wxConvUTF8),
-+ wxString(project->gui_urls[i].description.c_str(), wxConvUTF8),
-+ wxString(project->gui_urls[i].url.c_str(), wxConvUTF8),
- ID_TASK_PROJECT_WEB_PROJDEF_MIN + 1 + i
- );
- pGroup->m_Tasks.push_back(pItem);
-@@ -644,7 +644,7 @@
-
- if (project) {
- project->get_name(project_name);
-- strBuffer = wxString(project_name.c_str());
-+ strBuffer = wxString(project_name.c_str(), wxConvUTF8);
- }
-
- return 0;
-@@ -655,7 +655,7 @@
- PROJECT* project = wxGetApp().GetDocument()->project(item);
-
- if (project) {
-- strBuffer = wxString(project->user_name.c_str());
-+ strBuffer = wxString(project->user_name.c_str(), wxConvUTF8);
- }
-
- return 0;
-@@ -666,7 +666,7 @@
- PROJECT* project = wxGetApp().GetDocument()->project(item);
-
- if (project) {
-- strBuffer = wxString(project->team_name.c_str());
-+ strBuffer = wxString(project->team_name.c_str(), wxConvUTF8);
- }
-
- return 0;
-diff -urNad boinc-5.2.15~/clientgui/ViewResources.cpp boinc-5.2.15/clientgui/ViewResources.cpp
---- boinc-5.2.15~/clientgui/ViewResources.cpp 2005-11-02 19:36:03.000000000 +0100
-+++ boinc-5.2.15/clientgui/ViewResources.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -215,7 +215,7 @@
- state_project = doc->state.lookup_project(resource->master_url);
- if (state_project) {
- state_project->get_name(project_name);
-- strBuffer = wxString(project_name.c_str());
-+ strBuffer = wxString(project_name.c_str(), wxConvUTF8);
- }
- }
-
-diff -urNad boinc-5.2.15~/clientgui/ViewStatistics.cpp boinc-5.2.15/clientgui/ViewStatistics.cpp
---- boinc-5.2.15~/clientgui/ViewStatistics.cpp 2005-11-15 00:27:11.000000000 +0100
-+++ boinc-5.2.15/clientgui/ViewStatistics.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -144,7 +144,7 @@
- state_project = pDoc->state.lookup_project(statistic->master_url);
- if (state_project) {
- state_project->get_name(project_name);
-- name = wxString(project_name.c_str());
-+ name = wxString(project_name.c_str(), wxConvUTF8);
- }
- }
-
-@@ -188,23 +188,23 @@
-
-
- wxCoord w_temp, h_temp, des_temp, lead_temp;
-- dc.GetTextExtent(wxString::Format("%.0f", max_val), &w_temp, &h_temp, &des_temp, &lead_temp);
-+ dc.GetTextExtent(wxString::Format(wxT("%.0f"), max_val), &w_temp, &h_temp, &des_temp, &lead_temp);
-
- rectangle_x_start=x_start+w_temp+2;
- rectangle_y_start=y_start+heading_height+2;
- rectangle_x_end=x_end-2;
- rectangle_y_end=y_end-2-h_temp;
-
-- dc.GetTextExtent("days", &w_temp, &h_temp, &des_temp, &lead_temp);
-+ dc.GetTextExtent(wxT("days"), &w_temp, &h_temp, &des_temp, &lead_temp);
- rectangle_x_end-=w_temp;
-
-- dc.GetTextExtent(wxString::Format("%.0f", max_val), &w_temp, &h_temp, &des_temp, &lead_temp);
-+ dc.GetTextExtent(wxString::Format(wxT("%.0f"), max_val), &w_temp, &h_temp, &des_temp, &lead_temp);
- dc.DrawRectangle(rectangle_x_start,rectangle_y_start,rectangle_x_end-rectangle_x_start,rectangle_y_end-rectangle_y_start);
-- dc.DrawText(wxString::Format("%.0f", max_val),x_start,rectangle_y_start-h_temp);
-+ dc.DrawText(wxString::Format(wxT("%.0f"), max_val),x_start,rectangle_y_start-h_temp);
-
-- dc.GetTextExtent(wxString::Format("%.0f", min_val), &w_temp, &h_temp, &des_temp, &lead_temp);
-- dc.DrawText(wxString::Format("%.0f", min_val),rectangle_x_start-w_temp-2,rectangle_y_end-h_temp);
-- dc.DrawText("days", rectangle_x_end, rectangle_y_end);
-+ dc.GetTextExtent(wxString::Format(wxT("%.0f"), min_val), &w_temp, &h_temp, &des_temp, &lead_temp);
-+ dc.DrawText(wxString::Format(wxT("%.0f"), min_val),rectangle_x_start-w_temp-2,rectangle_y_end-h_temp);
-+ dc.DrawText(wxT("days"), rectangle_x_end, rectangle_y_end);
-
- //Draw day numbers and lines marking the days
- wxCoord xpos=rectangle_x_start;
-@@ -212,7 +212,7 @@
- double day=dday()-j->day;
- day=day/(60*60*24);
- dc.SetPen(wxPen(wxColour (0 , 0 , 0) , 1 , wxSOLID));
-- if (j!=(--(*i)->statistics.end())) dc.DrawText(wxString::Format("-%.0f", day),xpos,rectangle_y_end);
-+ if (j!=(--(*i)->statistics.end())) dc.DrawText(wxString::Format(wxT("-%.0f"), day),xpos,rectangle_y_end);
- if (j!=(--(*i)->statistics.end()) && j!=(*i)->statistics.begin()) {
- dc.SetPen(wxPen(wxColour (200 , 200 , 200) , 1 , wxSOLID));
- dc.DrawLine(xpos,rectangle_y_start+1,xpos,rectangle_y_end-1);
-diff -urNad boinc-5.2.15~/clientgui/ViewStatistics.h boinc-5.2.15/clientgui/ViewStatistics.h
---- boinc-5.2.15~/clientgui/ViewStatistics.h 2005-11-15 00:27:11.000000000 +0100
-+++ boinc-5.2.15/clientgui/ViewStatistics.h 2006-03-22 17:46:12.000000000 +0100
-@@ -32,7 +32,7 @@
- {
- public:
- CPaintStatistics();
-- CPaintStatistics(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "panel");
-+ CPaintStatistics(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxT("panel") );
-
- wxInt32 m_SelectedStatistic;
- wxString heading;
-diff -urNad boinc-5.2.15~/clientgui/ViewTransfers.cpp boinc-5.2.15/clientgui/ViewTransfers.cpp
---- boinc-5.2.15~/clientgui/ViewTransfers.cpp 2005-11-02 19:36:03.000000000 +0100
-+++ boinc-5.2.15/clientgui/ViewTransfers.cpp 2006-03-22 17:46:12.000000000 +0100
-@@ -368,7 +368,7 @@
- FILE_TRANSFER* transfer = wxGetApp().GetDocument()->file_transfer(item);
-
- if (transfer) {
-- strBuffer = wxString(transfer->project_name.c_str());
-+ strBuffer = wxString(transfer->project_name.c_str(), wxConvUTF8);
- }
- return 0;
- }
-@@ -378,7 +378,7 @@
- FILE_TRANSFER* transfer = wxGetApp().GetDocument()->file_transfer(item);
-
- if (transfer) {
-- strBuffer = wxString(transfer->name.c_str());
-+ strBuffer = wxString(transfer->name.c_str(), wxConvUTF8);
- }
- return 0;
- }
-diff -urNad boinc-5.2.15~/clientgui/ViewWork.cpp boinc-5.2.15/clientgui/ViewWork.cpp
---- boinc-5.2.15~/clientgui/ViewWork.cpp 2005-11-27 02:58:37.000000000 +0100
-+++ boinc-5.2.15/clientgui/ViewWork.cpp 2006-03-22 17:49:42.000000000 +0100
-@@ -220,9 +220,9 @@
- pDoc->WorkShowGraphics(
- m_pListPane->GetFirstSelected(),
- false,
-- wxGetApp().m_strDefaultWindowStation,
-- wxGetApp().m_strDefaultDesktop,
-- wxGetApp().m_strDefaultDisplay
-+ (const char*)wxGetApp().m_strDefaultWindowStation.mb_str(),
-+ (const char*)wxGetApp().m_strDefaultDesktop.mb_str(),
-+ (const char*)wxGetApp().m_strDefaultDisplay.mb_str()
- );
- }
-
-@@ -479,7 +479,7 @@
- state_result = doc->state.lookup_result(result->project_url, result->name);
- if (state_result) {
- state_result->project->get_name(project_name);
-- strBuffer = wxString(project_name.c_str());
-+ strBuffer = wxString(project_name.c_str(), wxConvUTF8);
- } else {
- doc->ForceCacheUpdate();
- }
-@@ -500,14 +500,14 @@
- if (result) {
- state_result = doc->state.lookup_result(result->project_url, result->name);
- if (state_result) {
-- wxString strLocale = setlocale(LC_NUMERIC, NULL);
-+ wxString strLocale = wxString(setlocale(LC_NUMERIC, NULL), wxConvUTF8);
- setlocale(LC_NUMERIC, "C");
- strBuffer.Printf(
- wxT("%s %.2f"),
-- state_result->wup->avp->app_name.c_str(),
-+ wxString(state_result->wup->avp->app_name.c_str(), wxConvUTF8).c_str(),
- state_result->wup->avp->version_num/100.0
- );
-- setlocale(LC_NUMERIC, strLocale.c_str());
-+ setlocale(LC_NUMERIC, (const char*)strLocale.mb_str());
- } else {
- doc->ForceCacheUpdate();
- }
-@@ -523,7 +523,7 @@
- wxASSERT(result);
-
- if (result) {
-- strBuffer = wxString(result->name.c_str());
-+ strBuffer = wxString(result->name.c_str(), wxConvUTF8);
- }
-
- return 0;
+diff -urNad boinc-5.4.1~/clientgui/BOINCGUIApp.cpp boinc-5.4.1/clientgui/BOINCGUIApp.cpp
+--- boinc-5.4.1~/clientgui/BOINCGUIApp.cpp 2006-03-29 06:12:28.000000000 +0200
++++ boinc-5.4.1/clientgui/BOINCGUIApp.cpp 2006-04-13 08:24:54.000000000 +0200
+@@ -847,7 +847,7 @@
+ 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++) {
Modified: trunk/boinc/debian/patches/07_use-sensible-browser.dpatch
===================================================================
--- trunk/boinc/debian/patches/07_use-sensible-browser.dpatch 2006-04-13 10:14:29 UTC (rev 395)
+++ trunk/boinc/debian/patches/07_use-sensible-browser.dpatch 2006-04-13 10:32:09 UTC (rev 396)
@@ -8,29 +8,46 @@
## DP: we don't loose functionality here.
@DPATCH@
-
---- boinc-5.2.15.orig/clientgui/hyperlink.cpp 2005-10-19 23:16:28.000000000 +0200
-+++ boinc-5.2.15/clientgui/hyperlink.cpp 2006-01-08 13:35:08.000000000 +0100
-@@ -212,28 +212,9 @@
+diff -urNad boinc-5.4.1~/clientgui/hyperlink.cpp boinc-5.4.1/clientgui/hyperlink.cpp
+--- boinc-5.4.1~/clientgui/hyperlink.cpp 2006-03-09 11:21:07.000000000 +0100
++++ boinc-5.4.1/clientgui/hyperlink.cpp 2006-04-13 08:12:19.000000000 +0200
+@@ -196,45 +196,9 @@
#if defined(__WXGTK__) || defined(__WXMOTIF__)
if (!mime_type_found) {
- cmd = ::wxGetenv(wxT("BROWSER"));
- if(cmd.IsEmpty()) {
-- wxString strBuffer = wxEmptyString;
-- strBuffer.Printf(
-- _("BOINC could not determine what your default browser is.\n"
-- "Please verify that you have either the 'mailcap' package installed or\n"
-- "'mime' package installed, and that the 'text/html' mime type is\n"
-- "configured for your favorite browser. Another method is to set the\n"
-- "BROWSER environment variable to point to whatever your favorite\n"
-- "web browser is. Please open a browser window to the following URL:\n\n"
-- "%s"),
-- strLink.c_str()
+- wxString strDialogTitle = wxEmptyString;
+- wxString strDialogMessage = wxEmptyString;
+-
+- // %s is the application name
+- // i.e. 'BOINC Manager', 'GridRepublic Manager'
+- strDialogTitle.Printf(
+- _("%s - Can't find web browser"),
+- wxGetApp().GetBrand()->GetApplicationName().c_str()
- );
+-
+- // 1st %s is the application name
+- // i.e. 'BOINC Manager', 'GridRepublic Manager'
+- // 2nd %s is the URL that the browser is supposed to
+- // open.
+- // 3rd %s is the application name
+- // i.e. 'BOINC Manager', 'GridRepublic Manager'
+- strDialogMessage.Printf(
+- _("%s tried to display the web page\n"
+- "\t%s\n"
+- "but couldn't find a web browser.\n"
+- "To fix this, set the environment variable\n"
+- "BROWSER to the path of your web browser,\n"
+- "then restart the %s."),
+- wxGetApp().GetBrand()->GetApplicationName().c_str(),
+- strLink.c_str(),
+- wxGetApp().GetBrand()->GetApplicationName().c_str()
+- );
+-
- ::wxMessageBox(
-- strBuffer,
-- _("BOINC Manager"),
+- strDialogMessage,
+- strDialogTitle,
- wxOK | wxICON_INFORMATION
- );
- } else {
More information about the pkg-boinc-commits
mailing list