*** empty log message ***

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

api/gutil.C

@@ -41,6 +41,9 @@ extern "C" {
 #include <cstring>
 #include <cmath>
 #include <csetjmp>
+#ifdef __APPLE__
+#undef HAVE_STDLIB_H /* Avoid compiler warning (redefined in jconfig,h) */
+#endif
 extern "C"{
 #include <jpeglib.h>
 }

api/mac_icon.C

@@ -61,8 +61,8 @@ int setMacRsrcForFile(char *filename, char *rsrcData, long rsrcSize,
     int retry;
 
     /* get finder spec for this file */
-    CHECK_OSERR(FSPathMakeRef((StringPtr)filename, &fsref, NULL));
-    CHECK_OSERR(FSGetCatalogInfo(&fsref, NULL, NULL, NULL, &fsspec, NULL));
+    CHECK_OSERR((int)FSPathMakeRef((StringPtr)filename, &fsref, NULL));
+    CHECK_OSERR(FSGetCatalogInfo(&fsref, nil, NULL, NULL, &fsspec, NULL));
 
     /* Open the resource fork for writing, create it if it does not exist.
         On a dual-processor system, the other cpu may have the resource fork 

checkin_notes

@@ -1512,11 +1512,23 @@ Charlie 2 Feb 2006
        PowerPC on an Intel Mac, treat the application as not supporting 
        graphics.  This works around a crash bug when displaying graphics 
        under PPC emulation.
-       
+    Fix multiple compiler warnings and one error.
+    
+    api/
+        gutil.C
+        mac_icon.C
     client/
         app.h
         app_graphics.C
         app_start.C
+    clientgui/
+        BOINCBaseView.cpp
+        BOINCGUIApp.cpp
+    lib/
+        mac_backtrace.C
+        shmem.C
+    mac_installer/
+        LoginItemAPI.c
 
 David  6 Feb 2006
     - Slight refinement to next-earlier checkin.

clientgui/BOINCBaseView.cpp

@@ -428,10 +428,7 @@ void CBOINCBaseView::UpdateWebsiteSelection(long lControlGroup, PROJECT* project
     unsigned int        i;
     CTaskItemGroup*     pGroup = NULL;
     CTaskItem*          pItem = NULL;
-    CMainDocument*      pDoc = wxGetApp().GetDocument();
 
-    wxASSERT(pDoc);
-    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
     wxASSERT(m_pTaskPane);
     wxASSERT(m_pListPane);
 

clientgui/BOINCGUIApp.cpp

@@ -114,8 +114,13 @@ bool CBrandingScheme::OnInit( wxConfigBase *pConfig ) {
         case 1:
             // Running as a GridRepublic client.
             m_strApplicationName = wxT("GridRepublic Desktop");
+#ifdef __APPLE__
+            m_iconApplicationIcon = wxIcon(gridrepublic_xpm);
+            m_bitmapApplicationLogo = wxBitmap(gridrepublic_xpm);
+#else
             m_iconApplicationIcon = wxIcon(gridrepublic16_xpm);
             m_bitmapApplicationLogo = wxBitmap(gridrepublic32_xpm);
+#endif
             m_strCompanyName = wxT("GridRepublic");
             m_strCompanyWebsite = wxT("http://www.gridrepublic.org/");
             m_strProjectName = wxT("GridRepublic");

clientgui/ViewStatistics.cpp

@@ -364,7 +364,7 @@ void CPaintStatistics::OnPaint(wxPaintEvent& WXUNUSED(event)) {
 //Init drawing
 	wxPaintDC dc (this);
 
-	wxCoord width = 0, height = 0, heading_height=0;
+	wxCoord width = 0, height = 0;
 	wxCoord rectangle_x_start=0, rectangle_y_start=0;
 	wxCoord rectangle_x_end=0, rectangle_y_end=0;
 
@@ -544,7 +544,6 @@ void CPaintStatistics::OnPaint(wxPaintEvent& WXUNUSED(event)) {
 	//Find minimum/maximum value
 		double min_val_y=10e32, max_val_y=0;
 		double min_val_x=10e32, max_val_x=0;
-		wxCoord project_name_max_width=0;
 		
 		wxInt32 count=-1;
 		for (std::vector<PROJECT*>::const_iterator i=proj->projects.begin();i!=proj->projects.end(); ++i) {

lib/mac_backtrace.C

@@ -71,10 +71,11 @@ enum {
 
 #define SKIPFRAME 4 /* Number frames overhead for signal handler and backtrace */
 
+#ifdef __ppc__
 static void PrintNameOfThisApp(void);
 static void PrintOSVersion(char *minorVersion);
 static int OutputFrames(const MacBTPPCFrame *frameArray, unsigned long frameCount, unsigned char lookupSymbolNames);
-
+#endif
 
 void PrintBacktrace(void) {
 #ifdef __ppc__

lib/shmem.C

@@ -220,7 +220,7 @@ int print_shmem_info(key_t key) {
     shmctl(id, IPC_STAT, &buf);
     fprintf(
         stderr, "shmem key: %x\t\tid: %d, size: %d, nattach: %d\n",
-        (unsigned int)key, id, buf.shm_segsz, (int)buf.shm_nattch
+        (unsigned int)key, id, (int)buf.shm_segsz, (int)buf.shm_nattch
     );
 
     return 0;

mac_build/English.lproj/InfoPlist.strings

@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "BOINC";
-CFBundleShortVersionString = "BOINC version 5.3.16";
-CFBundleGetInfoString = "BOINC version 5.3.16, Copyright 2005 University of California.";
+CFBundleShortVersionString = "BOINC version 5.3.17";
+CFBundleGetInfoString = "BOINC version 5.3.17, 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.16</string>
+	<string>5.3.17</string>
 </dict>
 </plist>

mac_build/Installer-Info.plist

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

mac_build/ScreenSaver-Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.3.16</string>
+	<string>5.3.17</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.16</string>
+	<string>5.3.17</string>
 </dict>
 </plist>

mac_installer/LoginItemAPI.c

@@ -240,7 +240,7 @@ char* ReturnLoginItemPropertyAtIndex(CFStringRef WhosPreferencesToList, int Requ
     CFStringRef PathKey, HideKey;
     CFBooleanRef HideValue;
 	
-    char* StringToReturn;
+    char* StringToReturn = NULL;
     char* TempString;
     
     //Doing a sanity check on the request type passed in.  If request type doesn't match something we know we return NULL representing an error