Mercurial > pidgin
comparison libpurple/protocols/jabber/libxmpp.c @ 23769:60f5abc6cf0c
propagate from branch 'im.pidgin.pidgin' (head 7f8e027e1591ade622baf58a9dac216e7122c1ac)
to branch 'im.pidgin.pidgin.vv' (head 9fd950ff4de5331c13cd762cb755741046bdd576)
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Sat, 29 Dec 2007 06:34:59 +0000 |
parents | d0a3463633ba 315151da0dc6 |
children | b20e24fcae47 |
comparison
equal
deleted
inserted
replaced
21949:18628d7aba30 | 23769:60f5abc6cf0c |
---|---|
116 jabber_send_attention, /* send_attention */ | 116 jabber_send_attention, /* send_attention */ |
117 jabber_attention_types, /* attention_types */ | 117 jabber_attention_types, /* attention_types */ |
118 | 118 |
119 /* padding */ | 119 /* padding */ |
120 NULL | 120 NULL |
121 NULL, | |
122 NULL, | |
123 jabber_media_initiate, /* initiate_media */ | |
124 sizeof(PurplePluginProtocolInfo) | |
121 }; | 125 }; |
122 | 126 |
123 static gboolean load_plugin(PurplePlugin *plugin) | 127 static gboolean load_plugin(PurplePlugin *plugin) |
124 { | 128 { |
125 purple_signal_register(plugin, "jabber-receiving-xmlnode", | 129 purple_signal_register(plugin, "jabber-receiving-xmlnode", |