From a4896c49c4a8e58eb7d32af63495f143d5d5bdea Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Thu, 6 Jul 2006 11:44:47 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=10590
---
 checkin_notes                |  2 +-
 client/file_names.C          | 11 -----------
 client/file_names.h          |  1 -
 clientgui/BOINCTaskBar.cpp   |  4 ----
 clientgui/mac/MacSysMenu.cpp |  6 ++++++
 lib/filesys.C                | 11 +++++++++++
 lib/filesys.h                |  1 +
 7 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index e6f365ed9c..a4cdc16e49 100755
--- a/checkin_notes
+++ b/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
diff --git a/client/file_names.C b/client/file_names.C
index 95167cd9c7..d7239bc00a 100644
--- a/client/file_names.C
+++ b/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$";
diff --git a/client/file_names.h b/client/file_names.h
index 94ddf4e7d1..6d702487aa 100644
--- a/client/file_names.h
+++ b/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"
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index 2e917eab7b..060c880f46 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/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();
diff --git a/clientgui/mac/MacSysMenu.cpp b/clientgui/mac/MacSysMenu.cpp
index 7b6ad0fc68..aceef74f74 100644
--- a/clientgui/mac/MacSysMenu.cpp
+++ b/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();
diff --git a/lib/filesys.C b/lib/filesys.C
index 5ad799bb6a..f7752a3383 100755
--- a/lib/filesys.C
+++ b/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)
diff --git a/lib/filesys.h b/lib/filesys.h
index c72cce26d3..83fddf6866 100755
--- a/lib/filesys.h
+++ b/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];