From 8b249d47c3c6a9675a5ec8a9ed9bd0d382f9eebd Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Fri, 24 Feb 2006 01:25:31 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=9543 --- checkin_notes | 5 +++++ clientgui/BOINCTaskBar.cpp | 2 +- mac_build/English.lproj/InfoPlist.strings | 4 ++-- mac_build/Info.plist | 2 +- mac_build/Installer-Info.plist | 2 +- mac_build/ScreenSaver-Info.plist | 2 +- mac_build/SystemMenu-Info.plist | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/checkin_notes b/checkin_notes index 637bf7837e..727013ceb9 100755 --- a/checkin_notes +++ b/checkin_notes @@ -2302,3 +2302,8 @@ Walt 23 Feb 2006 gui_rpc_client_ops.C gui_rpc_client_print.C +Charlie 23 Feb 2006 + - Mac: Fix compiler warning. + + clientgui/ + BOINCTaskBar.cpp diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp index e3abc3c78d..b9ecee0adb 100644 --- a/clientgui/BOINCTaskBar.cpp +++ b/clientgui/BOINCTaskBar.cpp @@ -491,10 +491,10 @@ wxMenu *CTaskBarIcon::BuildContextMenu() { ACCT_MGR_INFO ami; bool is_acct_mgr_detected = false; wxMenu* pMenu = new wxMenu; - wxMenuItem* pMenuItem = NULL; wxString menuName = wxEmptyString; wxFont font = wxNullFont; #ifdef __WXMSW__ + wxMenuItem* pMenuItem = NULL; wxMenuItem* menuItem = NULL; size_t loc = 0; #endif diff --git a/mac_build/English.lproj/InfoPlist.strings b/mac_build/English.lproj/InfoPlist.strings index 34c5b75370..fac4045145 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.19"; -CFBundleGetInfoString = "BOINC version 5.3.19, Copyright 2005 University of California."; +CFBundleShortVersionString = "BOINC version 5.3.20"; +CFBundleGetInfoString = "BOINC version 5.3.20, Copyright 2005 University of California."; diff --git a/mac_build/Info.plist b/mac_build/Info.plist index 6861671e3e..af8f613a36 100644 --- a/mac_build/Info.plist +++ b/mac_build/Info.plist @@ -17,6 +17,6 @@ CFBundleSignature BNC! CFBundleVersion - 5.3.19 + 5.3.20 diff --git a/mac_build/Installer-Info.plist b/mac_build/Installer-Info.plist index d34a8825f6..dcfe12ddc1 100644 --- a/mac_build/Installer-Info.plist +++ b/mac_build/Installer-Info.plist @@ -15,6 +15,6 @@ CFBundleSignature ???? CFBundleVersion - 5.3.19 + 5.3.20 diff --git a/mac_build/ScreenSaver-Info.plist b/mac_build/ScreenSaver-Info.plist index 30f8e73109..60f81b93b5 100644 --- a/mac_build/ScreenSaver-Info.plist +++ b/mac_build/ScreenSaver-Info.plist @@ -17,7 +17,7 @@ CFBundleSignature ???? CFBundleVersion - 5.3.19 + 5.3.20 NSPrincipalClass BOINC_Saver_ModuleView diff --git a/mac_build/SystemMenu-Info.plist b/mac_build/SystemMenu-Info.plist index 71aa4296f8..67cedd08cc 100644 --- a/mac_build/SystemMenu-Info.plist +++ b/mac_build/SystemMenu-Info.plist @@ -15,6 +15,6 @@ CFBundleSignature ???? CFBundleVersion - 5.3.19 + 5.3.20