Mercurial > pidgin
comparison libpurple/protocols/jabber/libxmpp.c @ 23867:4bc74deeb503
propagate from branch 'im.pidgin.pidgin' (head 434563a4b8fadb9593c241db4bb5ffd0bf2c0627)
to branch 'im.pidgin.soc.2008.vv' (head 59d05cb38af9346d82ce57477273f7b381054bcc)
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Sat, 09 Aug 2008 02:24:38 +0000 |
parents | c014c3fe0de9 3da0957e7821 |
children | 4d752d07a126 |
comparison
equal
deleted
inserted
replaced
23684:de8f2d3e538a | 23867:4bc74deeb503 |
---|---|
113 jabber_prpl_send_raw, /* send_raw */ | 113 jabber_prpl_send_raw, /* send_raw */ |
114 jabber_roomlist_room_serialize, /* roomlist_room_serialize */ | 114 jabber_roomlist_room_serialize, /* roomlist_room_serialize */ |
115 jabber_unregister_account, /* unregister_user */ | 115 jabber_unregister_account, /* unregister_user */ |
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 | |
119 sizeof(PurplePluginProtocolInfo), /* struct_size */ | 118 sizeof(PurplePluginProtocolInfo), /* struct_size */ |
120 NULL | 119 NULL, /* get_account_text_table */ |
120 #ifdef USE_VV | |
121 jabber_initiate_media, /* initiate_media */ | |
122 jabber_can_do_media /* can_do_media */ | |
123 #else | |
124 NULL, /* initiate_media */ | |
125 NULL /* can_do_media */ | |
126 #endif | |
121 }; | 127 }; |
122 | 128 |
123 static gboolean load_plugin(PurplePlugin *plugin) | 129 static gboolean load_plugin(PurplePlugin *plugin) |
124 { | 130 { |
125 purple_signal_register(plugin, "jabber-receiving-xmlnode", | 131 purple_signal_register(plugin, "jabber-receiving-xmlnode", |
273 jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb); | 279 jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb); |
274 jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb); | 280 jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb); |
275 jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", jabber_buzz_isenabled); | 281 jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", jabber_buzz_isenabled); |
276 | 282 |
277 jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata); | 283 jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata); |
284 #ifdef USE_VV | |
285 jabber_add_feature("voice-v1", "http://www.xmpp.org/extensions/xep-0167.html#ns", NULL); | |
286 #endif | |
278 } | 287 } |
279 | 288 |
280 | 289 |
281 PURPLE_INIT_PLUGIN(jabber, init_plugin, info); | 290 PURPLE_INIT_PLUGIN(jabber, init_plugin, info); |