macapp: new mac icon

this provides a new icon for the .app bundle
also removes the setting of the dock icon from within wx
(which previously used a different icon)

diff --git a/mac/allmydata.icns b/mac/allmydata.icns
index bc9151987d056dc89941b02be9b03fa694f84ada..41fe98024187da7d33156fb5632cf32499c00295 100644 (file)
Binary files a/mac/allmydata.icns and b/mac/allmydata.icns differ

diff --git a/src/allmydata/gui/macapp.py b/src/allmydata/gui/macapp.py
index cb31eeca481f3870c19418c8b99c502066ee4aad..6e671200fde2a15d263c4d1d07a24a3f0639ccbc 100644 (file)
--- a/src/allmydata/gui/macapp.py
+++ b/src/allmydata/gui/macapp.py
@@ -406,7 +406,7 @@ class MacGuiApp(wx.App):
 
     def setup_dock_icon(self):
         self.tbicon = wx.TaskBarIcon()
-        self.tbicon.SetIcon(amdicon.getIcon(), "Allmydata Tahoe")
+        #self.tbicon.SetIcon(amdicon.getIcon(), "Allmydata Tahoe")
         wx.EVT_TASKBAR_RIGHT_UP(self.tbicon, self.on_dock_menu)
 
     def setup_app_menu(self, frame):