[vidalia-svn] r2634: Temporarily disable MainWindow's upnp error message box, sin (in vidalia: . branches/upnp/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-05-31 20:52:13 -0400 (Sat, 31 May 2008)
New Revision: 2634

Modified:
   vidalia/
   vidalia/branches/upnp/src/vidalia/mainwindow.cpp
Log:
 r400@thebe:  edmanm | 2008-05-31 20:52:17 -0400
 Temporarily disable MainWindow's upnp error message box, since it has the
 possibility of bombarding the user with error messages if the UPnP test and
 subsequent state restoration fails.



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

Modified: vidalia/branches/upnp/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/mainwindow.cpp	2008-06-01 00:52:11 UTC (rev 2633)
+++ vidalia/branches/upnp/src/vidalia/mainwindow.cpp	2008-06-01 00:52:13 UTC (rev 2634)
@@ -1185,11 +1185,18 @@
 {
   Q_UNUSED(error);
 
+#if 0
+  /* XXX: Is there a better way to do this? Currently, this could get called
+   * if there is an error when testing UPnP support, and again when attempting
+   * to reset the UPnP state when the test dialog is closed. The user would
+   * not be amused with all the warning dialogs. */
+
   VMessageBox::warning(this,
     tr("Port Forwarding Failed"),
     p(tr("Vidalia was unable to configure automatic port forwarding."))
       + p(UPNPControl::Instance()->errorString()),
     VMessageBox::Ok);
+#endif
 }
 #endif