[vidalia-svn] r2185: Compiling is cool. In other news, the poorly-described previ (in trunk: . src/gui src/gui/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-06 14:42:43 -0500 (Thu, 06 Dec 2007)
New Revision: 2185

Modified:
   trunk/
   trunk/src/gui/mainwindow.cpp
   trunk/src/gui/network/netviewer.h
Log:
 r2246@lysithea:  edmanm | 2007-12-06 14:42:40 -0500
 Compiling is cool. In other news, the poorly-described previous commit added
 initial CMake support. Things left to do are:
   - Test on Windows and (particulary) OS X
   - Add lupdate and lrelease make targets
   - Figure out logging in src/torcontrol/ again such that it doesn't depend on
     Vidalia. (I'd like this library to one day at least have the possibility
     of being useful to others writing a non-Vidalia, Qt-based Tor controller.)



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

Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp	2007-12-06 19:33:52 UTC (rev 2184)
+++ trunk/src/gui/mainwindow.cpp	2007-12-06 19:42:43 UTC (rev 2185)
@@ -39,6 +39,7 @@
 #include <net.h>
 #include <clientstatusevent.h>
 #include <dangerousversionevent.h>
+#include <vmessagebox.h>
 
 #include "mainwindow.h"
 

Modified: trunk/src/gui/network/netviewer.h
===================================================================
--- trunk/src/gui/network/netviewer.h	2007-12-06 19:33:52 UTC (rev 2184)
+++ trunk/src/gui/network/netviewer.h	2007-12-06 19:42:43 UTC (rev 2185)
@@ -34,7 +34,6 @@
 #include <QTimer>
 #include <QHash>
 #include <torcontrol.h>
-#include <geoipresolver.h>
 #include <vidaliawindow.h>
 
 #include "geoipresolver.h"