Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/libxmpp.c @ 26329:f5e613e05332
Applied disco-2.patch from nops with some modifications:
* Alphabetized includes and Makefiles
* Removed purple_disco_set_ui_ops(NULL) in finch; ops is NULL by default.
* A few string changes
* Removed DISCO_PREF_LAST_SERVER. Default to our server, but store
the last requested in the JabberStream* and use it if available.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 29 Mar 2009 19:29:22 +0000 |
parents | 5f9a24d1c25e |
children | b290c7b9fc73 |
comparison
equal
deleted
inserted
replaced
26328:c422c7b1bde7 | 26329:f5e613e05332 |
---|---|
32 #include "version.h" | 32 #include "version.h" |
33 | 33 |
34 #include "iq.h" | 34 #include "iq.h" |
35 #include "jabber.h" | 35 #include "jabber.h" |
36 #include "chat.h" | 36 #include "chat.h" |
37 #include "disco.h" | |
37 #include "message.h" | 38 #include "message.h" |
38 #include "roster.h" | 39 #include "roster.h" |
39 #include "si.h" | 40 #include "si.h" |
40 #include "message.h" | 41 #include "message.h" |
41 #include "presence.h" | 42 #include "presence.h" |
117 jabber_unregister_account, /* unregister_user */ | 118 jabber_unregister_account, /* unregister_user */ |
118 jabber_send_attention, /* send_attention */ | 119 jabber_send_attention, /* send_attention */ |
119 jabber_attention_types, /* attention_types */ | 120 jabber_attention_types, /* attention_types */ |
120 | 121 |
121 sizeof(PurplePluginProtocolInfo), /* struct_size */ | 122 sizeof(PurplePluginProtocolInfo), /* struct_size */ |
122 NULL | 123 NULL, |
124 jabber_disco_get_list, /* disco_get_list */ | |
125 jabber_disco_cancel, /* disco_cancel */ | |
126 jabber_disco_service_register /* disco_service_register */ | |
127 | |
123 }; | 128 }; |
124 | 129 |
125 static gboolean load_plugin(PurplePlugin *plugin) | 130 static gboolean load_plugin(PurplePlugin *plugin) |
126 { | 131 { |
127 purple_signal_register(plugin, "jabber-receiving-xmlnode", | 132 purple_signal_register(plugin, "jabber-receiving-xmlnode", |