Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/ping.h @ 29668:e0e0cecdcd16
propagate from branch 'im.pidgin.pidgin' (head 53ec2e73334e6dc99c29f0f13b5ebf4700f5a92c)
to branch 'im.pidgin.cpw.attention_ui' (head 2ce3177a8ec94edba0f242ea181a9bd0f2655751)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 24 Feb 2009 20:26:34 +0000 |
parents | 36c73d036026 |
children | ced3d4ab745a |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/ping.h Fri Feb 06 23:31:35 2009 +0000 +++ b/libpurple/protocols/jabber/ping.h Tue Feb 24 20:26:34 2009 +0000 @@ -26,8 +26,7 @@ #include "conversation.h" void jabber_ping_parse(JabberStream *js, - const char *from, - const char *id); + xmlnode *packet); gboolean jabber_ping_jid(PurpleConversation *conv, const char *jid);