Mercurial > pidgin
diff libpurple/protocols/jabber/libxmpp.c @ 20685:02df6998b466
propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 4ad1081695d083df424898e6e7091f731b401265)
to branch 'im.pidgin.pidgin' (head d33243e8f5347776c81f81a0e4ba3a76ae5505a5)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 28 Sep 2007 16:34:43 +0000 |
| parents | 56cec2b6ff98 |
| children | 3cc856ca2338 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/libxmpp.c Fri Sep 28 16:32:28 2007 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Fri Sep 28 16:34:43 2007 +0000 @@ -113,10 +113,10 @@ jabber_prpl_send_raw, /* send_raw */ jabber_roomlist_room_serialize, /* roomlist_room_serialize */ jabber_unregister_account, /* unregister_user */ + jabber_send_attention, /* send_attention */ + jabber_attention_types, /* attention_types */ /* padding */ - NULL, - NULL, NULL };