*** empty log message ***

svn path=/trunk/boinc/; revision=9778

checkin_notes

@@ -3478,3 +3478,18 @@ Rom    30 Mar 2006
 Rom    30 Mar 2006 (HEAD)
     - Tag for 5.3.31 release, all platforms
       boinc_core_release_5_3_31
+
+Charlie 30 Mar 2006
+    - Mac: Fix "unused variable" compiler warning.
+    - Mac: "Fix" bug 460: Mac OS X automatically puts a "Preferences" item 
+      in the BOINC menu, but we don't use it so it was disabled.  This was 
+      confusing some users, so hide (delete) this menu item.
+    - Mac: add gutil_text.C to project.
+      
+    client/
+        main.C
+    clientgui/
+        MainFrame.cpp
+    mac_build/
+        boinc.xcodeproj/
+            project.pbxproj

client/main.C

@@ -611,9 +611,9 @@ int boinc_main_loop() {
 
 int main(int argc, char** argv) {
     int retval = 0;
-    int i;
 
 #ifdef _WIN32
+    int i;
     int len;
     char *commandLine;
     STARTUPINFO si;
@@ -677,6 +677,8 @@ int main(int argc, char** argv) {
         }
     }
 #elif defined linux
+    int i;
+    
     for (i = 1; i < argc; i++) {
         if (strcmp(argv[i], "-daemon") == 0 || strcmp(argv[i], "--daemon") == 0) {
             syslog(LOG_DAEMON, "Starting Boinc-Daemon, listening on port %d.", GUI_RPC_PORT);

clientgui/MainFrame.cpp

@@ -547,6 +547,15 @@ bool CMainFrame::CreateMenu() {
     if (m_pOldMenubar) {
         delete m_pOldMenubar;
     }
+    
+#ifdef __WXMAC__
+    MenuRef prefsMenuRef;
+    MenuItemIndex prefsMenuItemIndex;
+
+    // Hide Mac OS X's standard Preferences menu ite, since we don't use it
+    if (GetIndMenuItemWithCommandID(NULL, kHICommandPreferences, 1, &prefsMenuRef, &prefsMenuItemIndex) == noErr)
+        ChangeMenuItemAttributes(prefsMenuRef, prefsMenuItemIndex, kMenuItemAttrHidden, 0);
+ #endif
 
     wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CreateMenu - Function End"));
     return true;

mac_build/English.lproj/InfoPlist.strings

@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "BOINC";
-CFBundleShortVersionString = "BOINC version 5.3.30";
-CFBundleGetInfoString = "BOINC version 5.3.30, Copyright 2005 University of California.";
+CFBundleShortVersionString = "BOINC version 5.3.31";
+CFBundleGetInfoString = "BOINC version 5.3.31, Copyright 2005 University of California.";

mac_build/Info.plist

@@ -17,6 +17,6 @@
 	<key>CFBundleSignature</key>
 	<string>BNC!</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.30</string>
+	<string>5.3.31</string>
 </dict>
 </plist>

mac_build/Installer-Info.plist

@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.30</string>
+	<string>5.3.31</string>
 </dict>
 </plist>

mac_build/ScreenSaver-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.30</string>
+	<string>5.3.31</string>
 	<key>NSPrincipalClass</key>
 	<string>BOINC_Saver_ModuleView</string>
 </dict>

mac_build/SystemMenu-Info.plist

@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.30</string>
+	<string>5.3.31</string>
 </dict>
 </plist>

mac_build/boinc.xcodeproj/project.pbxproj

@@ -156,6 +156,7 @@
 		DD616A3008150050006981C1 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F51BDF4903086C46012012A7 /* InfoPlist.strings */; };
 		DD6381460870DB78007A2F8E /* mac_icon.C in Sources */ = {isa = PBXBuildFile; fileRef = DD6381450870DB78007A2F8E /* mac_icon.C */; };
 		DD6381F90870DD83007A2F8E /* make_app_icon_h.C in Sources */ = {isa = PBXBuildFile; fileRef = DD6381F80870DD83007A2F8E /* make_app_icon_h.C */; };
+		DD64DF0509DCC5E000668B3A /* gutil_text.C in Sources */ = {isa = PBXBuildFile; fileRef = DD64DF0409DCC5E000668B3A /* gutil_text.C */; };
 		DD69FEF508416C6B00C01361 /* gui_rpc_client.C in Sources */ = {isa = PBXBuildFile; fileRef = DD81C5CC07C5D7D90098A04D /* gui_rpc_client.C */; };
 		DD69FEF708416C9A00C01361 /* boinc_cmd.C in Sources */ = {isa = PBXBuildFile; fileRef = DD69FEF608416C9A00C01361 /* boinc_cmd.C */; };
 		DD69FF0C084171CF00C01361 /* network.C in Sources */ = {isa = PBXBuildFile; fileRef = DD6D0A8507E9A61B007F882B /* network.C */; };
@@ -835,6 +836,7 @@
 		DD6381450870DB78007A2F8E /* mac_icon.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = mac_icon.C; path = ../api/mac_icon.C; sourceTree = SOURCE_ROOT; };
 		DD6381EA0870DC9D007A2F8E /* MakeAppIcon_h */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MakeAppIcon_h; sourceTree = BUILT_PRODUCTS_DIR; };
 		DD6381F80870DD83007A2F8E /* make_app_icon_h.C */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = make_app_icon_h.C; sourceTree = "<group>"; };
+		DD64DF0409DCC5E000668B3A /* gutil_text.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = gutil_text.C; path = ../api/gutil_text.C; sourceTree = SOURCE_ROOT; };
 		DD64E7D507D89DB800B176C8 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
 		DD69FEE808416C1300C01361 /* boinc_cmd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = boinc_cmd; sourceTree = BUILT_PRODUCTS_DIR; };
 		DD69FEF608416C9A00C01361 /* boinc_cmd.C */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = boinc_cmd.C; path = ../lib/boinc_cmd.C; sourceTree = SOURCE_ROOT; };
@@ -1408,6 +1410,7 @@
 				DD40825207D3076400163EF5 /* graphics_data.h */,
 				DD40825307D3076400163EF5 /* graphics_impl.C */,
 				DD40825407D3076400163EF5 /* graphics_impl.h */,
+				DD64DF0409DCC5E000668B3A /* gutil_text.C */,
 				DD40825507D3076400163EF5 /* gutil.C */,
 				DD40825607D3076400163EF5 /* gutil.h */,
 				DD6D82DA08131AB1008F7200 /* macglutfix.m */,
@@ -2340,6 +2343,7 @@
 				DD40826307D3076400163EF5 /* reduce_main.C in Sources */,
 				DD4EC61108A0A083009AA08F /* texture.C in Sources */,
 				DD40826507D3076400163EF5 /* x_opengl.C in Sources */,
+				DD64DF0509DCC5E000668B3A /* gutil_text.C in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};