diff --git a/checkin_notes b/checkin_notes index ee9e19a3b3..0ed93c0559 100755 --- a/checkin_notes +++ b/checkin_notes @@ -3367,3 +3367,10 @@ Rom 28 Mar 2006 clientgui/ BOINCGUIApp.cpp MainFrame.cpp + +Charlie 28 Mar 2006 + - Mac: Fix compiler warnings. + + clientgui/ + BOINCDialupManager.cpp + ViewWork.cpp diff --git a/clientgui/BOINCDialupManager.cpp b/clientgui/BOINCDialupManager.cpp index 612c4b6535..d08bc755f1 100644 --- a/clientgui/BOINCDialupManager.cpp +++ b/clientgui/BOINCDialupManager.cpp @@ -89,7 +89,9 @@ void CBOINCDialUpManager::poll() { CMainDocument* pDoc = wxGetApp().GetDocument(); CMainFrame* pFrame = wxGetApp().GetFrame(); +#ifdef __WXMSW__ bool bIsDialing = false; +#endif bool bIsOnline = false; bool bWantConnection = false; bool bWantDisconnect = false; diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp index 5990908fa2..8c45d4f2b7 100644 --- a/clientgui/ViewWork.cpp +++ b/clientgui/ViewWork.cpp @@ -266,7 +266,6 @@ void CViewWork::OnWorkAbort( wxCommandEvent& WXUNUSED(event) ) { wxString strStatus = wxEmptyString; CMainDocument* pDoc = wxGetApp().GetDocument(); CMainFrame* pFrame = wxGetApp().GetFrame(); - RESULT* result = NULL; wxASSERT(pDoc); wxASSERT(pFrame); diff --git a/mac_build/English.lproj/InfoPlist.strings b/mac_build/English.lproj/InfoPlist.strings index 2e929d791d..3e632d110a 100755 --- a/mac_build/English.lproj/InfoPlist.strings +++ b/mac_build/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "BOINC"; -CFBundleShortVersionString = "BOINC version 5.3.28"; -CFBundleGetInfoString = "BOINC version 5.3.28, Copyright 2005 University of California."; +CFBundleShortVersionString = "BOINC version 5.3.29"; +CFBundleGetInfoString = "BOINC version 5.3.29, Copyright 2005 University of California."; diff --git a/mac_build/Info.plist b/mac_build/Info.plist index 1c176ae081..ad8bf85533 100644 --- a/mac_build/Info.plist +++ b/mac_build/Info.plist @@ -17,6 +17,6 @@ CFBundleSignature BNC! CFBundleVersion - 5.3.28 + 5.3.29 diff --git a/mac_build/Installer-Info.plist b/mac_build/Installer-Info.plist index fc831a29d2..ce3b332e17 100644 --- a/mac_build/Installer-Info.plist +++ b/mac_build/Installer-Info.plist @@ -15,6 +15,6 @@ CFBundleSignature ???? CFBundleVersion - 5.3.28 + 5.3.29 diff --git a/mac_build/ScreenSaver-Info.plist b/mac_build/ScreenSaver-Info.plist index 92e68e4984..d53ddedd14 100644 --- a/mac_build/ScreenSaver-Info.plist +++ b/mac_build/ScreenSaver-Info.plist @@ -17,7 +17,7 @@ CFBundleSignature ???? CFBundleVersion - 5.3.28 + 5.3.29 NSPrincipalClass BOINC_Saver_ModuleView diff --git a/mac_build/SystemMenu-Info.plist b/mac_build/SystemMenu-Info.plist index 59c29a7d97..fa6452d0da 100644 --- a/mac_build/SystemMenu-Info.plist +++ b/mac_build/SystemMenu-Info.plist @@ -15,6 +15,6 @@ CFBundleSignature ???? CFBundleVersion - 5.3.28 + 5.3.29 diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 4a3c580ff3..6c1ec8134d 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -171,6 +171,7 @@ DD73E3B808A0809800656EB1 /* gui_rpc_client_print.C in Sources */ = {isa = PBXBuildFile; fileRef = DD73E34F08A0694100656EB1 /* gui_rpc_client_print.C */; }; DD73E3BF08A0837800656EB1 /* hostinfo.C in Sources */ = {isa = PBXBuildFile; fileRef = DD344BB607C5AEEE0043025C /* hostinfo.C */; }; DD7E49CD080F9B09002716F9 /* network.C in Sources */ = {isa = PBXBuildFile; fileRef = DD6D0A8507E9A61B007F882B /* network.C */; }; + DD8DD4A709D9432F0043019E /* BOINCDialupManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD8DD4A509D9432F0043019E /* BOINCDialupManager.cpp */; }; DD9B6AAF0890DD71003A8E83 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDE2552B07C62F3E008E7D6E /* IOKit.framework */; }; DDA9D3BC09189A8C0060E7A7 /* Mac_GUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDA9D3BB09189A8C0060E7A7 /* Mac_GUI.cpp */; }; DDADA51508BAC96200053BFB /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; }; @@ -889,6 +890,8 @@ DD81C5CC07C5D7D90098A04D /* gui_rpc_client.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = gui_rpc_client.C; path = ../lib/gui_rpc_client.C; sourceTree = SOURCE_ROOT; }; DD81C5F007C5D8290098A04D /* boinc_win.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = boinc_win.h; path = ../lib/boinc_win.h; sourceTree = SOURCE_ROOT; }; DD81C60307C5D8630098A04D /* gui_rpc_client.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = gui_rpc_client.h; path = ../lib/gui_rpc_client.h; sourceTree = SOURCE_ROOT; }; + DD8DD4A509D9432F0043019E /* BOINCDialupManager.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = BOINCDialupManager.cpp; path = ../clientgui/BOINCDialupManager.cpp; sourceTree = SOURCE_ROOT; }; + DD8DD4A609D9432F0043019E /* BOINCDialupManager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BOINCDialupManager.h; path = ../clientgui/BOINCDialupManager.h; sourceTree = SOURCE_ROOT; }; DD96AFF90811075000A06F22 /* BOINCSaver.saver */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BOINCSaver.saver; sourceTree = BUILT_PRODUCTS_DIR; }; DD96AFFA0811075100A06F22 /* ScreenSaver-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "ScreenSaver-Info.plist"; sourceTree = SOURCE_ROOT; }; DDA9D3BB09189A8C0060E7A7 /* Mac_GUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Mac_GUI.cpp; path = ../clientgui/mac/Mac_GUI.cpp; sourceTree = SOURCE_ROOT; }; @@ -1155,6 +1158,8 @@ DD81C43407C5D2240098A04D /* BOINCBaseView.h */, DD58C43408F3347D00C1DF66 /* BOINCBaseWizard.cpp */, DD58C43508F3347D00C1DF66 /* BOINCBaseWizard.h */, + DD8DD4A509D9432F0043019E /* BOINCDialupManager.cpp */, + DD8DD4A609D9432F0043019E /* BOINCDialupManager.h */, DD81C40507C5D1020098A04D /* BOINCGUIApp.cpp */, DD81C43B07C5D2240098A04D /* BOINCGUIApp.h */, DD81C40407C5D1020098A04D /* BOINCListCtrl.cpp */, @@ -2267,6 +2272,7 @@ DD58C47208F334EA00C1DF66 /* WizardAccountManager.cpp in Sources */, DD58C47408F334EA00C1DF66 /* WizardAttachProject.cpp in Sources */, DD58C47608F334EA00C1DF66 /* wizardex.cpp in Sources */, + DD8DD4A709D9432F0043019E /* BOINCDialupManager.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };