[vidalia-svn] r2222: Fix the #ifdefs that pick which icon files to use depending (in trunk: . src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-16 16:38:47 -0500 (Sun, 16 Dec 2007)
New Revision: 2222

Modified:
   trunk/
   trunk/src/vidalia/mainwindow.cpp
Log:
 r2315@lysithea:  edmanm | 2007-12-16 16:38:01 -0500
 Fix the #ifdefs that pick which icon files to use depending on the platform
 and tray icon implementation.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2315] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/src/vidalia/mainwindow.cpp
===================================================================
--- trunk/src/vidalia/mainwindow.cpp	2007-12-16 21:08:34 UTC (rev 2221)
+++ trunk/src/vidalia/mainwindow.cpp	2007-12-16 21:38:47 UTC (rev 2222)
@@ -39,6 +39,7 @@
 #include <clientstatusevent.h>
 #include <dangerousversionevent.h>
 #include <vmessagebox.h>
+#include "config.h"
 
 #include "mainwindow.h"
 
@@ -65,18 +66,14 @@
 #define ANIM_PROCESS_WORKING  ":/images/32x32/process-working.png"
 
 /* Decide which of our four sets of tray icons to use. */
-#if defined(USE_QSYSTEMTRAYICON)
-/* QSystemTrayIcon is available */
 #if defined(Q_WS_WIN)
+#if defined(HAVE_QSYSTEMTRAYICON_H)
 /* QSystemTrayIcon on Windows wants 16x16 .png files */
 #define IMG_TOR_STOPPED  ":/images/16x16/tor-off.png"
 #define IMG_TOR_RUNNING  ":/images/16x16/tor-on.png"
 #define IMG_TOR_STARTING ":/images/16x16/tor-starting.png"
 #define IMG_TOR_STOPPING ":/images/16x16/tor-stopping.png"
-#endif
 #else
-/* No QSystemTrayIcon support */
-#if defined(Q_WS_WIN)
 /* Use the .ico files */
 #include "res/vidalia_win.rc.h"
 #define IMG_TOR_STOPPED    QString::number(IDI_TOR_OFF)
@@ -84,15 +81,14 @@
 #define IMG_TOR_STARTING   QString::number(IDI_TOR_STARTING)
 #define IMG_TOR_STOPPING   QString::number(IDI_TOR_STOPPING)
 #endif
-#endif
-#if defined(Q_WS_MAC)
+#elif defined(Q_WS_MAC)
 /* On Mac, we always go straight to Carbon to load our dock images 
  * from .icns files */
 #define IMG_TOR_STOPPED    "tor-off"
 #define IMG_TOR_RUNNING    "tor-on"
 #define IMG_TOR_STARTING   "tor-starting"
 #define IMG_TOR_STOPPING   "tor-stopping"
-#elif defined(Q_WS_X11)
+#else
 /* On X11, we just use always the 22x22 .png files */
 #define IMG_TOR_STOPPED    ":/images/22x22/tor-off.png"
 #define IMG_TOR_RUNNING    ":/images/22x22/tor-on.png"