[vidalia-svn] r2500: Tweak sjmurdoch's patch so it builds. (C++ spells 'boolean' (in vidalia/trunk: . src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-04-09 17:01:51 -0400 (Wed, 09 Apr 2008)
New Revision: 2500

Modified:
   vidalia/trunk/
   vidalia/trunk/src/vidalia/config/serversettings.cpp
   vidalia/trunk/src/vidalia/config/serversettings.h
Log:
 r337@lysithea:  edmanm | 2008-04-09 17:01:46 -0400
 Tweak sjmurdoch's patch so it builds. (C++ spells 'boolean' as 'bool')



Property changes on: vidalia/trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r337] on 90112fd6-a33b-4cea-8d39-48ff1d78625c

Modified: vidalia/trunk/src/vidalia/config/serversettings.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/serversettings.cpp	2008-04-09 21:01:49 UTC (rev 2499)
+++ vidalia/trunk/src/vidalia/config/serversettings.cpp	2008-04-09 21:01:51 UTC (rev 2500)
@@ -166,7 +166,7 @@
 /* TODO: init_upnp() will block for up to 2 seconds. We should fire off a thread */
 /** Configure UPnP device to forward DirPort and ORPort */
 void
-ServerSettings::configurePortForwarding(boolean enable)
+ServerSettings::configurePortForwarding(bool enable)
 {
 #ifdef USE_MINIUPNPC
   UPNPControl *pUNPControl = UPNPControl::Instance();

Modified: vidalia/trunk/src/vidalia/config/serversettings.h
===================================================================
--- vidalia/trunk/src/vidalia/config/serversettings.h	2008-04-09 21:01:49 UTC (rev 2499)
+++ vidalia/trunk/src/vidalia/config/serversettings.h	2008-04-09 21:01:51 UTC (rev 2500)
@@ -93,7 +93,7 @@
   QHash<QString,QString> confValues();
 
   /** Configure UPnP device to forward DirPort and ORPort */
-  void configurePortForwarding(boolean enable);
+  void configurePortForwarding(bool enable);
 };
 
 #endif