[vidalia-svn] r2573: Display a more useful error message (vidalia/branches/upnp/src/vidalia/config)

[sjmurdoch@xxxxxxxxxxxxxxxxxxx]

Author: sjmurdoch
Date: 2008-05-10 09:19:53 -0400 (Sat, 10 May 2008)
New Revision: 2573

Modified:
   vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp
Log:
Display a more useful error message

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp	2008-05-10 12:36:38 UTC (rev 2572)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp	2008-05-10 13:19:53 UTC (rev 2573)
@@ -19,6 +19,9 @@
 #include <QWaitCondition>
 #include <QMutex>
 #include <QTime>
+#include <QTextStream>
+#include <QString>
+#include <QMessageBox>
 
 #ifdef WIN32
 #include <winsock2.h>
@@ -136,6 +139,12 @@
   printf("configurePorts() result %d\n", retval);
     fflush(stdout);
 #endif
+    
+    if (retval) {
+      QString message;
+      QTextStream(&message) << "Failed to configure automatic port forwarding (status: " << retval << ")";
+      QMessageBox::warning(0, QString("Automatic port forwarding"), message);
+    }
 }
 
 void
@@ -218,7 +227,7 @@
     printf("upnpDiscover returned: NULL\n");
     fflush(stdout);
 #endif
-    return 1;
+    return 5;
   }
 
   retval = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
@@ -231,7 +240,7 @@
   freeUPNPDevlist(devlist);
 
   if (retval != 1 && retval != 2)
-    return 2;
+    return 6;
 
   return 0;
 }
@@ -305,7 +314,7 @@
     printf("DeletePortMapping() failed with code %d\n", retval);
     fflush(stdout);
 #endif
-    return 1;
+    return 4;
   }
   
   // Output the cancelled mapping