[vidalia-svn] r2320: Here's the other, uh, 90% of r2319. (in vidalia/trunk: . src/vidalia src/vidalia/tray)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-01-24 16:34:10 -0500 (Thu, 24 Jan 2008)
New Revision: 2320

Modified:
   vidalia/trunk/
   vidalia/trunk/CMakeLists.txt
   vidalia/trunk/config.h.in
   vidalia/trunk/src/vidalia/mainwindow.cpp
   vidalia/trunk/src/vidalia/tray/trayicon.cpp
   vidalia/trunk/src/vidalia/tray/trayicon.h
Log:
 r74@lysithea:  edmanm | 2008-01-24 16:34:07 -0500
 Here's the other, uh, 90% of r2319.



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r74] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/CMakeLists.txt
===================================================================
--- vidalia/trunk/CMakeLists.txt	2008-01-23 18:17:06 UTC (rev 2319)
+++ vidalia/trunk/CMakeLists.txt	2008-01-24 21:34:10 UTC (rev 2320)
@@ -54,11 +54,7 @@
 if (NOT APPLE)
   check_include_file_cxx("qsystemtrayicon.h" HAVE_QSYSTEMTRAYICON_H)
   if (HAVE_QSYSTEMTRAYICON_H)
-    option(WITH_QSYSTEMTRAYICON "Use Qt's tray icon implementation." ON)
-    if (NOT USE_QSYSTEMTRAYICON)
-      ## Disable the use of QSystemTrayIcon
-      set(HAVE_QSYSTEMTRAYICON_H "")
-    endif(NOT USE_QSYSTEMTRAYICON)
+    option(USE_QSYSTEMTRAYICON "Use Qt's tray icon implementation." ON)
   endif(HAVE_QSYSTEMTRAYICON_H)
 endif(NOT APPLE)
 

Modified: vidalia/trunk/config.h.in
===================================================================
--- vidalia/trunk/config.h.in	2008-01-23 18:17:06 UTC (rev 2319)
+++ vidalia/trunk/config.h.in	2008-01-24 21:34:10 UTC (rev 2320)
@@ -1,6 +1,8 @@
 
 #cmakedefine HAVE_QSYSTEMTRAYICON_H
 
+#cmakedefine USE_QSYSTEMTRAYICON
+
 #cmakedefine HAVE_QSSLSOCKET_H
 
 #cmakedefine USE_QSSLSOCKET

Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-01-23 18:17:06 UTC (rev 2319)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-01-24 21:34:10 UTC (rev 2320)
@@ -67,7 +67,7 @@
 
 /* Decide which of our four sets of tray icons to use. */
 #if defined(Q_WS_WIN)
-#if defined(HAVE_QSYSTEMTRAYICON_H)
+#if defined(USE_QSYSTEMTRAYICON)
 /* 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"

Modified: vidalia/trunk/src/vidalia/tray/trayicon.cpp
===================================================================
--- vidalia/trunk/src/vidalia/tray/trayicon.cpp	2008-01-23 18:17:06 UTC (rev 2319)
+++ vidalia/trunk/src/vidalia/tray/trayicon.cpp	2008-01-24 21:34:10 UTC (rev 2320)
@@ -71,7 +71,7 @@
 void
 TrayIcon::mouseButtonPress(QMouseEvent *event)
 {
-#if defined(Q_WS_X11) && !defined(HAVE_QSYSTEMTRAYICON_H)
+#if defined(Q_WS_X11) && !defined(USE_QSYSTEMTRAYICON)
   if (_contextMenu) {
     _contextMenu->popup(event->globalPos());
   }
@@ -152,7 +152,7 @@
 {
 #if defined(Q_WS_MAC)
   qt_mac_set_dock_menu(menu);
-#elif defined(HAVE_QSYSTEMTRAYICON_H)
+#elif defined(USE_QSYSTEMTRAYICON)
   TrayIconImpl::setContextMenu(menu);
 #else
   _contextMenu = menu;
@@ -164,7 +164,7 @@
 TrayIcon::showBalloonMessage(const QString &title, const QString &message,
                              BalloonMessageIcon balloonIcon)
 {
-#if defined(HAVE_QSYSTEMTRAYICON_H)
+#if defined(USE_QSYSTEMTRAYICON)
   QSystemTrayIcon::MessageIcon icon;
   switch (balloonIcon) {
     case NoIcon:   icon = QSystemTrayIcon::NoIcon; break;
@@ -188,7 +188,7 @@
 #if defined(Q_WS_WIN) || defined(Q_WS_MAC)
   /* We always have a tray on Win32 or a dock on OS X */
   return true;
-#elif defined(HAVE_QSYSTEMTRAYICON_H)
+#elif defined(USE_QSYSTEMTRAYICON)
   /* Ask Qt if there is a tray available */
   return QSystemTrayIcon::isSystemTrayAvailable();
 #else
@@ -203,7 +203,7 @@
 bool
 TrayIcon::supportsBalloonMessages()
 {
-#if defined(HAVE_QSYSTEMTRAYICON_H)
+#if defined(USE_QSYSTEMTRAYICON)
 #if defined(Q_WS_WIN)
   return (QSystemTrayIcon::supportsMessages()
             && QSysInfo::WindowsVersion > QSysInfo::WV_2000);

Modified: vidalia/trunk/src/vidalia/tray/trayicon.h
===================================================================
--- vidalia/trunk/src/vidalia/tray/trayicon.h	2008-01-23 18:17:06 UTC (rev 2319)
+++ vidalia/trunk/src/vidalia/tray/trayicon.h	2008-01-24 21:34:10 UTC (rev 2320)
@@ -35,7 +35,7 @@
 #include "config.h"
 
 /* Include the correct tray icon implementation */
-#if defined(HAVE_QSYSTEMTRAYICON_H)
+#if defined(USE_QSYSTEMTRAYICON)
 #include "trayicon_qt.h"
 #elif defined(Q_WS_WIN)
 #include "trayicon_win.h"