[vidalia-svn] r4407: Update the menubar icon at the same time as the dock icon on (vidalia/trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2010-08-26 12:55:53 -0400 (Thu, 26 Aug 2010)
New Revision: 4407

Modified:
   vidalia/trunk/src/vidalia/MainWindow.cpp
Log:

Update the menubar icon at the same time as the dock icon on OS X.
Previously, we had a blank icon in the menubar. Fixes ticket #610. It
would be better to have a separate set of grayscale icons for this purpose
since those would fit in with the standard style better, but someone with
more Photoshop fu than me would have to make such icons first.


Modified: vidalia/trunk/src/vidalia/MainWindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/MainWindow.cpp	2010-08-25 21:02:24 UTC (rev 4406)
+++ vidalia/trunk/src/vidalia/MainWindow.cpp	2010-08-26 16:55:53 UTC (rev 4407)
@@ -572,9 +572,8 @@
 {
 #if defined(Q_WS_MAC)
   QApplication::setWindowIcon(QPixmap(iconFile));
-#else
-  _trayIcon.setIcon(QIcon(iconFile));
 #endif
+  _trayIcon.setIcon(QIcon(iconFile));
 }
 
 /** Respond to a double-click on the tray icon by opening the Control Panel