Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/libxmpp.c @ 25211:53b073da65ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head d7476bfe7f9003553f7b3ea48491f4cebd192098) to branch 'im.pidgin.cpw.malu.xmpp.ibb_ft' (head 11e25d42c31c1c2c0cd2dff0c862c638940dac19)
author Marcus Lundblad <ml@update.uu.se>
date Tue, 23 Sep 2008 17:44:38 +0000
parents b4ec5481a67a fba7c73c8f02
children 87a206ca018f
comparison
equal deleted inserted replaced
25210:dc01f9b0aaa3 25211:53b073da65ee
41 #include "presence.h" 41 #include "presence.h"
42 #include "google.h" 42 #include "google.h"
43 #include "pep.h" 43 #include "pep.h"
44 #include "usertune.h" 44 #include "usertune.h"
45 #include "caps.h" 45 #include "caps.h"
46 #include "ibb.h" 46 #include "data.h"
47 47
48 static PurplePluginProtocolInfo prpl_info = 48 static PurplePluginProtocolInfo prpl_info =
49 { 49 {
50 OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK | 50 OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK |
51 #ifdef HAVE_CYRUS_SASL 51 #ifdef HAVE_CYRUS_SASL
135 135
136 purple_signal_register(plugin, "jabber-sending-text", 136 purple_signal_register(plugin, "jabber-sending-text",
137 purple_marshal_VOID__POINTER_POINTER, NULL, 2, 137 purple_marshal_VOID__POINTER_POINTER, NULL, 2,
138 purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION), 138 purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
139 purple_value_new_outgoing(PURPLE_TYPE_STRING)); 139 purple_value_new_outgoing(PURPLE_TYPE_STRING));
140 140
141
142 return TRUE; 141 return TRUE;
143 } 142 }
144 143
145 static gboolean unload_plugin(PurplePlugin *plugin) 144 static gboolean unload_plugin(PurplePlugin *plugin)
146 { 145 {
147 purple_signal_unregister(plugin, "jabber-receiving-xmlnode"); 146 purple_signal_unregister(plugin, "jabber-receiving-xmlnode");
148 147
149 purple_signal_unregister(plugin, "jabber-sending-xmlnode"); 148 purple_signal_unregister(plugin, "jabber-sending-xmlnode");
150 149
151 purple_signal_unregister(plugin, "jabber-sending-text"); 150 purple_signal_unregister(plugin, "jabber-sending-text");
152 151
153 jabber_si_uninit(); 152 jabber_data_uninit();
154 jabber_ibb_uninit();
155 153
156 return TRUE; 154 return TRUE;
157 } 155 }
158 156
159 static PurplePluginInfo info = 157 static PurplePluginInfo info =
243 /* TODO: Is this an acceptable default? */ 241 /* TODO: Is this an acceptable default? */
244 "proxy.jabber.org"); 242 "proxy.jabber.org");
245 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, 243 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
246 option); 244 option);
247 245
246 /* this should probably be part of global smiley theme settings later on,
247 shared with MSN */
248 option = purple_account_option_bool_new(_("Show Custom Smileys"),
249 "custom_smileys", TRUE);
250 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
251 option);
252
248 jabber_init_plugin(plugin); 253 jabber_init_plugin(plugin);
249 254
250 purple_prefs_remove("/plugins/prpl/jabber"); 255 purple_prefs_remove("/plugins/prpl/jabber");
251 256
252 /* XXX - If any other plugin wants SASL this won't be good ... */ 257 /* XXX - If any other plugin wants SASL this won't be good ... */
272 jabber_pep_init(); 277 jabber_pep_init();
273 278
274 jabber_tune_init(); 279 jabber_tune_init();
275 jabber_caps_init(); 280 jabber_caps_init();
276 281
282 jabber_data_init();
283
284
277 jabber_ibb_init(); 285 jabber_ibb_init();
278 jabber_si_init(); 286 jabber_si_init();
279 287
280 jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb); 288 jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb);
281 jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb); 289 jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb);
282 jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", jabber_buzz_isenabled); 290 jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns",
283 jabber_add_feature("ibb", XEP_0047_NAMESPACE, NULL); 291 jabber_buzz_isenabled);
284 292 jabber_add_feature("bob", XEP_0231_NAMESPACE,
293 jabber_custom_smileys_isenabled);
294
285 jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata); 295 jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
286 } 296 }
287 297
288 298
289 PURPLE_INIT_PLUGIN(jabber, init_plugin, info); 299 PURPLE_INIT_PLUGIN(jabber, init_plugin, info);