[vidalia-svn] r2616: Add some #ifdefs around some more upnp stuff. This will go a (in vidalia: . branches/upnp/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-05-26 23:19:40 -0400 (Mon, 26 May 2008)
New Revision: 2616

Modified:
   vidalia/
   vidalia/branches/upnp/src/vidalia/mainwindow.cpp
   vidalia/branches/upnp/src/vidalia/mainwindow.h
Log:
 r372@thebe:  edmanm | 2008-05-26 23:20:11 -0400
 Add some #ifdefs around some more upnp stuff. This will go away once we decide
 UPnP is good enough to always have it compiled in.



Property changes on: vidalia
___________________________________________________________________
 svk:merge ticket from /local/vidalia [r372] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/branches/upnp/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/mainwindow.cpp	2008-05-27 03:19:37 UTC (rev 2615)
+++ vidalia/branches/upnp/src/vidalia/mainwindow.cpp	2008-05-27 03:19:40 UTC (rev 2616)
@@ -28,7 +28,6 @@
 #include <clientstatusevent.h>
 #include <dangerousversionevent.h>
 #include <vmessagebox.h>
-#include "config.h"
 
 #include "mainwindow.h"
 
@@ -142,9 +141,11 @@
   connect(vApp, SIGNAL(running()), this, SLOT(running()));
   connect(vApp, SIGNAL(shutdown()), this, SLOT(shutdown()));
 
+#if defined(USE_MINIUPNPC)
   /* Catch UPnP-related signals */
   connect(UPNPControl::Instance(), SIGNAL(error(UPNPControl::UPNPError)),
          this, SLOT(upnpError(UPNPControl::UPNPError)));
+#endif
 
   if (TrayIcon::isTrayIconSupported()) {
     /* Make the tray icon visible */
@@ -1177,6 +1178,7 @@
   return "Unknown";
 }
 
+#if defined(USE_MINIUPNPC)
 /** Called when a UPnP error occurs. */
 void
 MainWindow::upnpError(UPNPControl::UPNPError error)
@@ -1189,4 +1191,5 @@
       + p(UPNPControl::Instance()->errorString()),
     VMessageBox::Ok);
 }
+#endif
 

Modified: vidalia/branches/upnp/src/vidalia/mainwindow.h
===================================================================
--- vidalia/branches/upnp/src/vidalia/mainwindow.h	2008-05-27 03:19:37 UTC (rev 2615)
+++ vidalia/branches/upnp/src/vidalia/mainwindow.h	2008-05-27 03:19:40 UTC (rev 2616)
@@ -26,12 +26,15 @@
 #include "log/messagelog.h"
 #include "bwgraph/bwgraph.h"
 #include "config/configdialog.h"
-#include "config/upnpcontrol.h"
 #include "help/browser/helpbrowser.h"
 #include "network/netviewer.h"
 #include "ui_mainwindow.h"
 #include "helperprocess.h"
+#include "config.h"
 
+#if defined(USE_MINIUPNPC)
+#include "config/upnpcontrol.h"
+#endif
 
 class MainWindow : public VidaliaWindow
 {
@@ -104,8 +107,11 @@
   void onBrowserFailed(QString errmsg);
   /** Called when the proxy server fails to start */
   void onProxyFailed(QString errmsg);
+
+#if defined(USE_MINIUPNPC)
   /** Called when a UPnP error occurs. */
   void upnpError(UPNPControl::UPNPError error);
+#endif
 
 private:
   enum TorStatus {