Mercurial > pidgin
changeset 30340:0f66b49522c4
merge of '6156c597e7d5a7702b6915a78bef090253dd0090'
and 'f88405b0b717173fb9fe55267ef7ae95fa07d29c'
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Sun, 08 Aug 2010 20:31:14 +0000 |
parents | 19ad096c48d5 (current diff) 6d790bb772ed (diff) |
children | 601d519fc6a2 93410d06cb51 |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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