 +
 +/** Based on http://miniupnp.free.fr/files/download.php?file=xchat-upnp20061022.patch */
 +void
-+ServerSettings::upnp_add_redir(const char * addr, int port)
++UPNPControl::upnp_add_redir(const char * addr, int port)
 +{
 +	char port_str[16];
 +	int r;

 )
 configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/res/vidalia_win.rc.in
@@ -234,9 +235,16 @@
 endif(APPLE)
 add_dependencies(${vidalia_BIN} translations)
 

+	                        port_str, port_str, addr, 0, "TCP");
+	if(r==0)
+		printf("AddPortMapping(%s, %s, %s) failed\n", port_str, port_str, addr);
+	fflush(stdout);
+}
+
+/** Based on http://miniupnp.free.fr/files/download.php?file=xchat-upnp20061022.patch */
+void
+UPNPControl::upnp_rem_redir(int port)
+{
+	char port_str[16];
+	int t;
