diff libgaim/protocols/oscar/peer.h @ 14267:645598a4ec04

[gaim-migrate @ 16949] Change gaim_network_listen() and gaim_network_listen_range() to be cancelable. This doesn't actually help anything yet, since the gaim_upnp_functions() are not yet cancelable. But the framework is there, and the PRPLs shouldn't need any additional changes. Still to go: gaim_upnp_everything() gaim_url_fetch() gaim_srv_resolve() Let me know if there are others committer: Tailor Script <[e-mail]>

--- a/libgaim/protocols/oscar/peer.h	Mon Aug 21 07:44:31 2006 +0000
+++ b/libgaim/protocols/oscar/peer.h	Mon Aug 21 07:47:03 2006 +0000
@@ -26,11 +26,12 @@
 #define _PEER_H_
 
 #include "ft.h"
+#include "network.h"
+#include "proxy.h"
 
 typedef struct _OdcFrame              OdcFrame;
 typedef struct _OftFrame              OftFrame;
 typedef struct _ProxyFrame            ProxyFrame;
-typedef struct _NewPeerConnectionData NewPeerConnectionData;
 typedef struct _PeerConnection        PeerConnection;
 
 #define PEER_CONNECTION_FLAG_INITIATED_BY_ME  0x0001
@@ -132,12 +133,6 @@
 	ByteStream payload;      /* 12 */
 };
 
-struct _NewPeerConnectionData
-{
-	GaimConnection *gc;
-	PeerConnection *conn;
-};
-
 struct _PeerConnection
 {
 	OscarData *od;
@@ -166,6 +161,12 @@
 	/**
 	 * This is only used when the peer connection is being established.
 	 */
+	GaimNetworkListenData *listen_data;
+
+
+	/**
+	 * This is only used when the peer connection is being established.
+	 */
 	guint connect_timeout_timer;
 
 	/**