Mercurial > pidgin

comparison libpurple/protocols/jabber/libxmpp.c @ 23810:10f5a529d2a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '38838bc806900103298d383237d2ae7cd60bbd82' and '96c6198726fb7811a7762a8b11f05d257843729b'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Wed, 28 May 2008 21:13:36 +0000
parents 7d2e5f57dbca cbe97caec684
children 3da0957e7821
comparison
equal deleted inserted replaced
23809:7d2e5f57dbca 23810:10f5a529d2a6
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 sizeof(PurplePluginProtocolInfo), /* struct_size */ 118 sizeof(PurplePluginProtocolInfo), /* struct_size */
119 NULL, /* get_account_text_table */ 119 NULL, /* get_account_text_table */
120 #ifdef USE_FARSIGHT 120 #ifdef USE_VV
121 jabber_initiate_media, /* initiate_media */ 121 jabber_initiate_media, /* initiate_media */
122 jabber_can_do_media /* can_do_media */ 122 jabber_can_do_media /* can_do_media */
123 #else 123 #else
124 NULL, /* initiate_media */ 124 NULL, /* initiate_media */
125 NULL /* can_do_media */ 125 NULL /* can_do_media */
272 jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb); 272 jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb);
273 jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb); 273 jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb);
274 jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", jabber_buzz_isenabled); 274 jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", jabber_buzz_isenabled);
275 275
276 jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata); 276 jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
277 #ifdef USE_FARSIGHT 277 #ifdef USE_VV
278 jabber_add_feature("voice-v1", "http://www.xmpp.org/extensions/xep-0167.html#ns", NULL); 278 jabber_add_feature("voice-v1", "http://www.xmpp.org/extensions/xep-0167.html#ns", NULL);
279 #endif 279 #endif
280 } 280 }
281 281
282 282