*** empty log message ***

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

checkin_notes

@@ -7286,7 +7286,7 @@ Charlie 6 July 2006
         setprojectgrp.C
         switcher.C
     lib/
-        filesys.C
+        filesys.C,h
     mac_installer/
         release_boinc.sh
         release_GridRepublic.sh

client/file_names.C

@@ -283,15 +283,4 @@ int set_to_project_group(const char* path) {
 #endif
 }
 
-int remove_project_owned_file_or_dir(const char* path) {
-#ifdef SANDBOX
-    char cmd[1024];
-
-    sprintf(cmd, "%s/%s /bin/rm rm -fR \"%s\"", SWITCHER_DIR, SWITCHER_FILE_NAME, path);
-    return system(cmd);
-#else
-    return ERR_UNLINK;
-#endif
-}
-
 const char *BOINC_RCSID_7d362a6a52 = "$Id$";

client/file_names.h

@@ -49,7 +49,6 @@ extern void get_sched_request_filename(PROJECT&, char*);
 extern void get_sched_reply_filename(PROJECT&, char*);
 extern void get_master_filename(PROJECT&, char*);
 extern int set_to_project_group(const char* path);
-extern int remove_project_owned_file_or_dir(const char* path);
 
 
 #define PROJECTS_DIR                "projects"

clientgui/BOINCTaskBar.cpp

@@ -82,9 +82,7 @@ CTaskBarIcon::CTaskBarIcon(wxString title, wxIcon* icon, wxIcon* iconDisconnecte
     m_pRefreshTimer = new wxTimer(this, ID_TB_TIMER);
     m_pRefreshTimer->Start(1000);  // Send event every second
 
-#ifndef __WXMAC__
     SetIcon(m_iconTaskBarNormal, m_strDefaultTitle);
-#endif
 }
 
 
@@ -479,9 +477,7 @@ void CTaskBarIcon::ResetTaskBar() {
 #ifdef __WXMSW___
     SetBalloon(m_iconTaskBarNormal, wxT(""), wxT(""));
 #else
-#ifndef __WXMAC__
     SetIcon(m_iconTaskBarNormal, wxT(""));
-#endif
 #endif
 
     m_dtLastBalloonDisplayed = wxDateTime::Now();

clientgui/mac/MacSysMenu.cpp

@@ -95,6 +95,12 @@ bool CMacSystemMenu::SetIcon(const wxIcon& icon, const wxString&) {
     wxBitmapRefData * theBitsRefData;
     PicHandle thePICT;
     wxBitmap theBits;
+    static const wxIcon* currentIcon = NULL;
+
+    if (&icon == currentIcon)
+        return true;
+    
+    currentIcon = &icon;
 
     theBits.CopyFromIcon(icon);
     theBitsRefData = theBits.GetBitmapData();

lib/filesys.C

@@ -499,6 +499,17 @@ int boinc_rmdir(const char* name) {
 #endif
 }
 
+int remove_project_owned_file_or_dir(const char* path) {
+#ifdef SANDBOX
+    char cmd[1024];
+
+    sprintf(cmd, "%s/%s /bin/rm rm -fR \"%s\"", SWITCHER_DIR, SWITCHER_FILE_NAME, path);
+    return system(cmd);
+#else
+    return ERR_UNLINK;
+#endif
+}
+
 #ifndef _WIN32
 int boinc_chown(const char* path, gid_t gid) {
     if (gid)

lib/filesys.h

@@ -45,6 +45,7 @@ extern "C" {
   extern int boinc_chown(const char*, gid_t);
 #endif
   extern int boinc_rmdir(const char*);
+  extern int remove_project_owned_file_or_dir(const char* path);
   extern void relative_to_absolute(const char* relname, char* path);
   extern int boinc_make_dirs(char*, char*);
   extern char boinc_failed_file[256];