[boinc] 02/04: Imported Upstream version 7.2.28+dfsg
Steffen Möller
moeller at alioth.debian.org
Fri Nov 8 22:48:51 UTC 2013
This is an automated email from the git hooks/post-receive script.
moeller pushed a commit to branch master
in repository boinc.
commit e2f757dcb58bf22685579415c8041466c267e2b8
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Thu Nov 7 15:20:42 2013 +0100
Imported Upstream version 7.2.28+dfsg
---
android/BOINC/AndroidManifest.xml | 4 ++--
client/gui_rpc_server_ops.cpp | 9 +++++++++
client/project.cpp | 1 -
client/scheduler_op.cpp | 6 ++++++
clientgui/DlgEventLog.cpp | 9 ++++++++-
clientgui/DlgEventLog.h | 3 +++
clientgui/ViewProjects.cpp | 10 ++++++++++
clientgui/ViewProjects.h | 1 +
clientgui/ViewTransfers.cpp | 11 +++++++++++
clientgui/ViewTransfers.h | 1 +
clientgui/ViewWork.cpp | 11 +++++++++++
clientgui/ViewWork.h | 1 +
configure.ac | 2 +-
lib/common_defs.h | 5 +++++
14 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/android/BOINC/AndroidManifest.xml b/android/BOINC/AndroidManifest.xml
index 5691b75..9a3ffcf 100644
--- a/android/BOINC/AndroidManifest.xml
+++ b/android/BOINC/AndroidManifest.xml
@@ -20,8 +20,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="edu.berkeley.boinc"
- android:versionCode="41"
- android:versionName="7.2.27"
+ android:versionCode="42"
+ android:versionName="7.2.28"
android:installLocation="internalOnly" > <!-- installation on SD card would break boot receiver -->
diff --git a/client/gui_rpc_server_ops.cpp b/client/gui_rpc_server_ops.cpp
index 201492e..a441706 100644
--- a/client/gui_rpc_server_ops.cpp
+++ b/client/gui_rpc_server_ops.cpp
@@ -1191,6 +1191,14 @@ static void handle_report_device_status(GUI_RPC_CONN& grc) {
}
}
if (!retval) {
+ // if the GUI reported a device name, use it
+ //
+ if (strlen(d.device_name)) {
+ if (strcmp(d.device_name, gstate.host_info.domain_name)) {
+ strcpy(gstate.host_info.domain_name, d.device_name);
+ gstate.set_client_state_dirty("Device name changed");
+ }
+ }
gstate.device_status = d;
gstate.device_status_time = gstate.now;
grc.mfout.printf("<success/>\n");
@@ -1213,6 +1221,7 @@ int DEVICE_STATUS::parse(XML_PARSER& xp) {
if (xp.parse_double("battery_temperature_celsius", battery_temperature_celsius)) continue;
if (xp.parse_bool("wifi_online", wifi_online)) continue;
if (xp.parse_bool("user_active", user_active)) continue;
+ if (xp.parse_str("device_name", device_name, sizeof(device_name))) continue;
}
return ERR_XML_PARSE;
}
diff --git a/client/project.cpp b/client/project.cpp
index 06a467a..7b42552 100644
--- a/client/project.cpp
+++ b/client/project.cpp
@@ -905,4 +905,3 @@ void PROJECT::check_no_apps() {
no_rsc_apps[avp->gpu_usage.rsc_type] = false;
}
}
-
diff --git a/client/scheduler_op.cpp b/client/scheduler_op.cpp
index c319b6d..24f6fa6 100644
--- a/client/scheduler_op.cpp
+++ b/client/scheduler_op.cpp
@@ -592,6 +592,12 @@ int SCHEDULER_REPLY::parse(FILE* in, PROJECT* project) {
sr_feeds.clear();
trickle_up_urls.clear();
+ if (!project->anonymous_platform) {
+ for (int i=0; i<MAX_RSC; i++) {
+ project->no_rsc_apps[i] = false;
+ }
+ }
+
// First line should either be tag (HTTP 1.0) or
// hex length of response (HTTP 1.1)
//
diff --git a/clientgui/DlgEventLog.cpp b/clientgui/DlgEventLog.cpp
index cd6dc6b..b3e879e 100644
--- a/clientgui/DlgEventLog.cpp
+++ b/clientgui/DlgEventLog.cpp
@@ -75,6 +75,7 @@ BEGIN_EVENT_TABLE( CDlgEventLog, wxDialog )
EVT_SIZE(CDlgEventLog::OnSize)
EVT_MOVE(CDlgEventLog::OnMove)
EVT_CLOSE(CDlgEventLog::OnClose)
+ EVT_LIST_COL_END_DRAG(ID_SIMPLE_MESSAGESVIEW, CDlgEventLog::OnColResize)
////@end CDlgEventLog event table entries
END_EVENT_TABLE()
@@ -256,7 +257,8 @@ bool CDlgEventLog::Create( wxWindow* parent, wxWindowID id, const wxString& capt
SetTextColor();
RestoreState();
OnRefresh();
-
+ // Register that we had the Event Log open immediately
+ SaveState();
return true;
}
@@ -885,6 +887,11 @@ void CDlgEventLog::OnButtonHelp( wxCommandEvent& event ) {
}
+void CDlgEventLog::OnColResize( wxListEvent& ) {
+ // Register the new column widths immediately
+ SaveState();
+}
+
void CDlgEventLog::ResetMessageFiltering() {
s_bIsFiltered = false;
s_strFilteredProjectName.clear();
diff --git a/clientgui/DlgEventLog.h b/clientgui/DlgEventLog.h
index 8eecc48..1035309 100644
--- a/clientgui/DlgEventLog.h
+++ b/clientgui/DlgEventLog.h
@@ -118,6 +118,9 @@ public:
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_SIMPLE_HELP
void OnButtonHelp( wxCommandEvent& event );
+ /// EVT_LIST_COL_END_DRAG event handler for ID_SIMPLE_MESSAGESVIEW
+ void OnColResize( wxListEvent& event );
+
/// called from CMainDocument::HandleCompletedRPC() after wxEVT_RPC_FINISHED event
void OnRefresh();
////@end CDlgEventLog event handler declarations
diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp
index 5cc8d92..91909fe 100644
--- a/clientgui/ViewProjects.cpp
+++ b/clientgui/ViewProjects.cpp
@@ -86,6 +86,7 @@ BEGIN_EVENT_TABLE (CViewProjects, CBOINCBaseView)
EVT_LIST_ITEM_DESELECTED(ID_LIST_PROJECTSVIEW, CViewProjects::OnListDeselected)
EVT_LIST_COL_CLICK(ID_LIST_PROJECTSVIEW, CViewProjects::OnColClick)
EVT_LIST_CACHE_HINT(ID_LIST_PROJECTSVIEW, CViewProjects::OnCacheHint)
+ EVT_LIST_COL_END_DRAG(ID_LIST_PROJECTSVIEW, CViewProjects::OnColResize)
END_EVENT_TABLE ()
@@ -554,6 +555,15 @@ void CViewProjects::OnProjectWebsiteClicked( wxEvent& event ) {
wxLogTrace(wxT("Function Start/End"), wxT("CViewProjects::OnProjectWebsiteClicked - Function End"));
}
+void CViewProjects::OnColResize( wxListEvent& ) {
+ // Register the new column widths immediately
+ CAdvancedFrame* pFrame = wxDynamicCast(GetParent()->GetParent()->GetParent(), CAdvancedFrame);
+
+ wxASSERT(pFrame);
+ wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame));
+ pFrame->SaveState();
+}
+
wxInt32 CViewProjects::GetDocCount() {
CMainDocument* pDoc = wxGetApp().GetDocument();
diff --git a/clientgui/ViewProjects.h b/clientgui/ViewProjects.h
index 376b2bc..c755474 100644
--- a/clientgui/ViewProjects.h
+++ b/clientgui/ViewProjects.h
@@ -73,6 +73,7 @@ public:
void OnShowItemProperties( wxCommandEvent& event );
void OnProjectWebsiteClicked( wxEvent& event );
+ void OnColResize( wxListEvent& event);
std::vector<CProject*> m_ProjectCache;
diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp
index c900c96..a14431b 100644
--- a/clientgui/ViewTransfers.cpp
+++ b/clientgui/ViewTransfers.cpp
@@ -72,6 +72,7 @@ BEGIN_EVENT_TABLE (CViewTransfers, CBOINCBaseView)
EVT_LIST_ITEM_DESELECTED(ID_LIST_TRANSFERSVIEW, CViewTransfers::OnListDeselected)
EVT_LIST_COL_CLICK(ID_LIST_TRANSFERSVIEW, CViewTransfers::OnColClick)
EVT_LIST_CACHE_HINT(ID_LIST_TRANSFERSVIEW, CViewTransfers::OnCacheHint)
+ EVT_LIST_COL_END_DRAG(ID_LIST_TRANSFERSVIEW, CViewTransfers::OnColResize)
END_EVENT_TABLE ()
@@ -364,6 +365,16 @@ void CViewTransfers::OnTransfersAbort( wxCommandEvent& WXUNUSED(event) ) {
}
+void CViewTransfers::OnColResize( wxListEvent& ) {
+ // Register the new column widths immediately
+ CAdvancedFrame* pFrame = wxDynamicCast(GetParent()->GetParent()->GetParent(), CAdvancedFrame);
+
+ wxASSERT(pFrame);
+ wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame));
+ pFrame->SaveState();
+}
+
+
wxInt32 CViewTransfers::GetDocCount() {
return wxGetApp().GetDocument()->GetTransferCount();
}
diff --git a/clientgui/ViewTransfers.h b/clientgui/ViewTransfers.h
index cbe9a43..16f694a 100644
--- a/clientgui/ViewTransfers.h
+++ b/clientgui/ViewTransfers.h
@@ -67,6 +67,7 @@ public:
void OnTransfersRetryNow( wxCommandEvent& event );
void OnTransfersAbort( wxCommandEvent& event );
+ void OnColResize( wxListEvent& event);
std::vector<CTransfer*> m_TransferCache;
diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp
index 0c90769..102f9ab 100644
--- a/clientgui/ViewWork.cpp
+++ b/clientgui/ViewWork.cpp
@@ -93,6 +93,7 @@ BEGIN_EVENT_TABLE (CViewWork, CBOINCBaseView)
EVT_LIST_ITEM_DESELECTED(ID_LIST_WORKVIEW, CViewWork::OnListDeselected)
EVT_LIST_COL_CLICK(ID_LIST_WORKVIEW, CViewWork::OnColClick)
EVT_LIST_CACHE_HINT(ID_LIST_WORKVIEW, CViewWork::OnCacheHint)
+ EVT_LIST_COL_END_DRAG(ID_LIST_WORKVIEW, CViewWork::OnColResize)
END_EVENT_TABLE ()
@@ -611,6 +612,16 @@ void CViewWork::OnProjectWebsiteClicked( wxEvent& event ) {
}
+void CViewWork::OnColResize( wxListEvent& ) {
+ // Register the new column widths immediately
+ CAdvancedFrame* pFrame = wxDynamicCast(GetParent()->GetParent()->GetParent(), CAdvancedFrame);
+
+ wxASSERT(pFrame);
+ wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame));
+ pFrame->SaveState();
+}
+
+
wxInt32 CViewWork::GetDocCount() {
return wxGetApp().GetDocument()->GetWorkCount();
}
diff --git a/clientgui/ViewWork.h b/clientgui/ViewWork.h
index 5b99cdc..41231f6 100644
--- a/clientgui/ViewWork.h
+++ b/clientgui/ViewWork.h
@@ -75,6 +75,7 @@ public:
void OnActiveTasksOnly( wxCommandEvent& event );
void OnProjectWebsiteClicked( wxEvent& event );
+ void OnColResize( wxListEvent& event);
std::vector<CWork*> m_WorkCache;
diff --git a/configure.ac b/configure.ac
index 25d8988..6d758fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
AC_PREREQ(2.58)
dnl Set the BOINC version here. You can also use the set-version script.
-AC_INIT(BOINC, 7.2.27)
+AC_INIT(BOINC, 7.2.28)
AC_CONFIG_MACRO_DIR([m4])
LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
AC_SUBST([LIBBOINC_VERSION])
diff --git a/lib/common_defs.h b/lib/common_defs.h
index 715148d..4134bd6 100644
--- a/lib/common_defs.h
+++ b/lib/common_defs.h
@@ -244,6 +244,10 @@ struct DEVICE_STATUS {
double battery_temperature_celsius;
bool wifi_online;
bool user_active;
+ char device_name[256];
+ // if present, a user-selected name for the device.
+ // This will be stored by the client as hostinfo.domain_name,
+ // and reported to schedulers.
int parse(XML_PARSER&);
DEVICE_STATUS() {
@@ -254,6 +258,7 @@ struct DEVICE_STATUS {
battery_temperature_celsius = 0;
wifi_online = false;
user_active = false;
+ strcpy(device_name, "");
}
};
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list