[vidalia-svn] r2568: Booo for tabs. (in vidalia: . branches/upnp/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-05-09 01:31:14 -0400 (Fri, 09 May 2008)
New Revision: 2568

Modified:
   vidalia/
   vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp
Log:
 r296@thebe:  edmanm | 2008-05-09 01:31:53 -0400
 Booo for tabs.



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

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp	2008-05-09 05:15:38 UTC (rev 2567)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrolthread.cpp	2008-05-09 05:31:14 UTC (rev 2568)
@@ -69,7 +69,7 @@
       shouldExit = !_keepRunning;
       _waitMutex->unlock();
       if (shouldExit)
-	break;
+        break;
     } else {
       /* We should exit */
       _waitMutex->unlock();
@@ -214,21 +214,19 @@
 
   // Add the port mapping of external:port -> internal:port
   retval = UPNP_AddPortMapping(urls.controlURL, data.servicetype,
-			       sPort, sPort, lanaddr, "Tor server", "TCP");
+                               sPort, sPort, lanaddr, "Tor server", "TCP");
   if(UPNPCOMMAND_SUCCESS != retval) {
     #ifdef UPNPCONTROL_DEBUG
     printf("AddPortMapping(%s, %s, %s) failed with code %d\n",
-	   sPort, sPort, lanaddr, retval);
+           sPort, sPort, lanaddr, retval);
     fflush(stdout);
     #endif
     return 1;
   }
   
   // Check if the port mapping was accepted
-  retval = UPNP_GetSpecificPortMappingEntry(urls.controlURL,
-					    data.servicetype,
-					    sPort, "TCP",
-					    intClient, intPort);
+  retval = UPNP_GetSpecificPortMappingEntry(urls.controlURL, data.servicetype,
+                                            sPort, "TCP", intClient, intPort);
   if(UPNPCOMMAND_SUCCESS != retval) {
     #ifdef UPNPCONTROL_DEBUG
     printf("GetSpecificPortMappingEntry() failed with code %d\n", retval);
@@ -263,7 +261,8 @@
   snprintf(sPort, sizeof(sPort), "%d", port);
   
   // Remove the mapping
-  int retval = UPNP_DeletePortMapping(urls.controlURL, data.servicetype, sPort, "TCP");
+  int retval = UPNP_DeletePortMapping(urls.controlURL, data.servicetype,
+                                      sPort, "TCP");
   if(UPNPCOMMAND_SUCCESS != retval) {
 #ifdef UPNPCONTROL_DEBUG
     printf("DeletePortMapping() failed with code %d\n", retval);