diff libpurple/protocols/msn/slp.h @ 31292:47b6eda87723

propagate from branch 'im.pidgin.pidgin' (head 07d0765c444a097af45c2650f54323afb900a07b) to branch 'im.pidgin.soc.2010.msn-tlc' (head f3998422a4724ab424e4e2328f58fc0504856557)
author masca@cpw.pidgin.im
date Mon, 19 Jul 2010 21:11:32 +0000
parents 56ef12440d52
children b4064198e017
line wrap: on
line diff
--- a/libpurple/protocols/msn/slp.h	Mon Jul 19 18:25:47 2010 +0000
+++ b/libpurple/protocols/msn/slp.h	Mon Jul 19 21:11:32 2010 +0000
@@ -25,10 +25,12 @@
 #define MSN_SLP_H
 
 #include "internal.h"
+#include "ft.h"
 
-#include "ft.h"
 #include "session.h"
 #include "slpcall.h"
+#include "slplink.h"
+#include "user.h"
 
 #define MAX_FILE_NAME_LEN 260 /* MAX_PATH in Windows */
 
@@ -49,8 +51,6 @@
 } MsnFileContext;
 #pragma pack(pop)
 
-MsnSlpCall * msn_slp_sip_recv(MsnSlpLink *slplink,
-							  const char *body);
 void
 msn_slp_send_ok(MsnSlpCall *slpcall, const char *branch,
 		const char *type, const char *content);
@@ -62,15 +62,9 @@
 
 void send_bye(MsnSlpCall *slpcall, const char *type);
 
-void msn_xfer_completed_cb(MsnSlpCall *slpcall,
-						   const guchar *body, gsize size);
 
-void msn_xfer_cancel(PurpleXfer *xfer);
-gssize msn_xfer_write(const guchar *data, gsize len, PurpleXfer *xfer);
-gssize msn_xfer_read(guchar **data, PurpleXfer *xfer);
+void msn_request_user_display(MsnUser *user);
 
-void msn_xfer_end_cb(MsnSlpCall *slpcall, MsnSession *session);
-
-void msn_queue_buddy_icon_request(MsnUser *user);
+void msn_request_ft(PurpleXfer *xfer);
 
 #endif /* MSN_SLP_H */