# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1281299474 0
# Node ID 0f66b49522c4c01337ffd55a11260c016bdcf30f
# Parent  19ad096c48d536c1b32cfebebc7a5c4bb8d99493# Parent  6d790bb772ed893abb6f2bccf8ff06666ebb607c
merge of '6156c597e7d5a7702b6915a78bef090253dd0090'
     and 'f88405b0b717173fb9fe55267ef7ae95fa07d29c'

diff -r 19ad096c48d5 -r 0f66b49522c4 libpurple/protocols/msn/directconn.h
--- a/libpurple/protocols/msn/directconn.h	Sat Aug 07 23:47:00 2010 +0000
+++ b/libpurple/protocols/msn/directconn.h	Sun Aug 08 20:31:14 2010 +0000
@@ -131,7 +131,7 @@
  * Creates, initializes, and returns a new MsnDirectConn structure.
  */
 MsnDirectConn *
-msn_dc_new(MsnSlpCall *slplink);
+msn_dc_new(MsnSlpCall *slpcall);
 
 /*
  * Destroys an MsnDirectConn structure. Frees every buffer allocated earlier