Mercurial > pidgin

comparison libpurple/protocols/jabber/libxmpp.c @ 25663:1d1d1829de11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 42f77b0e8b8ebf5ff3c30d8f8022ac5d289631e8) to branch 'org.darkrain42.pidgin.xmpp' (head f3aa6c57ecb65ae9dbf729bca259e94f48b87279)
author Paul Aurich <paul@darkrain42.org>
date Sun, 18 Jan 2009 04:17:50 +0000
parents 0700833f0c5d 17b60b844803
children 7d2e85f78aec
comparison
equal deleted inserted replaced
25330:8a5c0c5c71f9 25663:1d1d1829de11
67 jabber_close, /* close */ 67 jabber_close, /* close */
68 jabber_message_send_im, /* send_im */ 68 jabber_message_send_im, /* send_im */
69 jabber_set_info, /* set_info */ 69 jabber_set_info, /* set_info */
70 jabber_send_typing, /* send_typing */ 70 jabber_send_typing, /* send_typing */
71 jabber_buddy_get_info, /* get_info */ 71 jabber_buddy_get_info, /* get_info */
72 jabber_presence_send, /* set_status */ 72 jabber_set_status, /* set_status */
73 jabber_idle_set, /* set_idle */ 73 jabber_idle_set, /* set_idle */
74 NULL, /* change_passwd */ 74 NULL, /* change_passwd */
75 jabber_roster_add_buddy, /* add_buddy */ 75 jabber_roster_add_buddy, /* add_buddy */
76 NULL, /* add_buddies */ 76 NULL, /* add_buddies */
77 jabber_roster_remove_buddy, /* remove_buddy */ 77 jabber_roster_remove_buddy, /* remove_buddy */
146 purple_signal_unregister(plugin, "jabber-receiving-xmlnode"); 146 purple_signal_unregister(plugin, "jabber-receiving-xmlnode");
147 147
148 purple_signal_unregister(plugin, "jabber-sending-xmlnode"); 148 purple_signal_unregister(plugin, "jabber-sending-xmlnode");
149 149
150 purple_signal_unregister(plugin, "jabber-sending-text"); 150 purple_signal_unregister(plugin, "jabber-sending-text");
151 151
152 /* reverse order of init_plugin */
153 jabber_bosh_uninit();
152 jabber_data_uninit(); 154 jabber_data_uninit();
153 155 /* PEP things should be uninit via jabber_pep_uninit, not here */
156 jabber_pep_uninit();
157 jabber_caps_uninit();
158 jabber_iq_uninit();
159
160 /* Stay on target...stay on target... Almost there... */
161 jabber_uninit_plugin();
162
154 return TRUE; 163 return TRUE;
155 } 164 }
156 165
157 static PurplePluginInfo info = 166 static PurplePluginInfo info =
158 { 167 {
224 option = purple_account_option_bool_new( 233 option = purple_account_option_bool_new(
225 _("Allow plaintext auth over unencrypted streams"), 234 _("Allow plaintext auth over unencrypted streams"),
226 "auth_plain_in_clear", FALSE); 235 "auth_plain_in_clear", FALSE);
227 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, 236 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
228 option); 237 option);
229 238
239 /* XXX FORCE_BOSH: Remove this before re-merging branch */
240 option = purple_account_option_bool_new(_("Force BOSH (debugging)"),
241 "force_bosh", FALSE);
242 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
243 option);
244
230 option = purple_account_option_int_new(_("Connect port"), "port", 5222); 245 option = purple_account_option_int_new(_("Connect port"), "port", 5222);
231 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, 246 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
232 option); 247 option);
233 248
234 option = purple_account_option_string_new(_("Connect server"), 249 option = purple_account_option_string_new(_("Connect server"),
270 /* Restore the original error mode */ 285 /* Restore the original error mode */
271 SetErrorMode(old_error_mode); 286 SetErrorMode(old_error_mode);
272 #endif 287 #endif
273 #endif 288 #endif
274 jabber_register_commands(); 289 jabber_register_commands();
275 290
291 /* reverse order of unload_plugin */
276 jabber_iq_init(); 292 jabber_iq_init();
293 jabber_caps_init();
294 /* PEP things should be init via jabber_pep_init, not here */
277 jabber_pep_init(); 295 jabber_pep_init();
278
279 jabber_tune_init();
280 jabber_caps_init();
281
282 jabber_data_init(); 296 jabber_data_init();
283 297 jabber_bosh_init();
284 jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb); 298
285 jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb); 299 #warning implement adding and retrieving own features via IPC API
286 jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", 300
301 jabber_add_feature(AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb);
302 jabber_add_feature(AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb);
303 jabber_add_feature("http://www.xmpp.org/extensions/xep-0224.html#ns",
287 jabber_buzz_isenabled); 304 jabber_buzz_isenabled);
288 jabber_add_feature("bob", XEP_0231_NAMESPACE, 305 jabber_add_feature(XEP_0231_NAMESPACE, jabber_custom_smileys_isenabled);
289 jabber_custom_smileys_isenabled); 306
290 307 jabber_pep_register_handler(AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
291 jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
292 } 308 }
293 309
294 310
295 PURPLE_INIT_PLUGIN(jabber, init_plugin, info); 311 PURPLE_INIT_PLUGIN(jabber, init_plugin, info);