[vidalia-svn] r1703: Show the tray icon after we show the main window, so Qt does (in trunk: . src/gui)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-04-09 01:34:01 -0400 (Mon, 09 Apr 2007)
New Revision: 1703

Modified:
   trunk/
   trunk/src/gui/mainwindow.cpp
Log:
 r1789@adrastea:  edmanm | 2007-04-09 01:27:43 -0400
 Show the tray icon after we show the main window, so Qt doesn't decide to
 replace our dock icon with the window's icon (only affects OS X).



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r1789] on 54b3572a-7227-0410-958f-53ecd705b71a

Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp	2007-04-09 03:28:49 UTC (rev 1702)
+++ trunk/src/gui/mainwindow.cpp	2007-04-09 05:34:01 UTC (rev 1703)
@@ -150,6 +150,9 @@
   ui.chkShowOnStartup->setChecked(settings.showMainWindowAtStart());
   if (ui.chkShowOnStartup->isChecked())
     this->show();
+
+  /* Make the tray icon visible */
+  _trayIcon.show();
 }
 
 /** Destructor. */
@@ -260,8 +263,6 @@
   createMenuBar();
   /* Create a tray menu and add it to the tray icon */
   _trayIcon.setContextMenu(createTrayMenu());
-  /* Make the tray icon visible */
-  _trayIcon.show();
 
 #if defined(USE_QSYSTEMTRAYICON)
   connect(&_trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),