Mercurial > pidgin.yaz
annotate libpurple/protocols/jabber/libxmpp.c @ 25331:10e1f3c1d0db
explicit merge of '8c6ea3b255d94e0f2867fea830b1380415e6d47a'
and '5459c606fe645dac4dddd188eca62eb52a9f7745'
to branch 'im.pidgin.pidgin.next.minor'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Thu, 27 Nov 2008 06:05:42 +0000 |
parents | fba7c73c8f02 |
children | f763be370afb 8e7e6f60e053 53b073da65ee 9ab681f23007 4d752d07a126 |
rev | line source |
---|---|
16241 | 1 /* purple |
2 * | |
3 * Purple is the legal property of its developers, whose names are too numerous | |
4 * to list here. Please refer to the COPYRIGHT file distributed with this | |
5 * source distribution. | |
6 * | |
7 * This program is free software; you can redistribute it and/or modify | |
8 * it under the terms of the GNU General Public License as published by | |
9 * the Free Software Foundation; either version 2 of the License, or | |
10 * (at your option) any later version. | |
11 * | |
12 * This program is distributed in the hope that it will be useful, | |
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
15 * GNU General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU General Public License | |
18 * along with this program; if not, write to the Free Software | |
19680
44b4e8bd759b
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
18210
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
16241 | 20 * |
21 */ | |
22 | |
23 /* libxmpp is the XMPP protocol plugin. It is linked against libjabbercommon, | |
24 * which may be used to support other protocols (Bonjour) which may need to | |
25 * share code. | |
26 */ | |
27 | |
18210
b8572b937c09
#include reorganizations to allow compiling with glib < 2.8 using the
Stu Tomlinson <stu@nosnilmot.com>
parents:
18106
diff
changeset
|
28 #include "internal.h" |
b8572b937c09
#include reorganizations to allow compiling with glib < 2.8 using the
Stu Tomlinson <stu@nosnilmot.com>
parents:
18106
diff
changeset
|
29 |
16241 | 30 #include "accountopt.h" |
19998
7baa2bc64226
Cleanup the SASL init and add error checking.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19696
diff
changeset
|
31 #include "debug.h" |
16241 | 32 #include "version.h" |
33 | |
34 #include "iq.h" | |
35 #include "jabber.h" | |
36 #include "chat.h" | |
37 #include "message.h" | |
38 #include "roster.h" | |
39 #include "si.h" | |
40 #include "message.h" | |
41 #include "presence.h" | |
42 #include "google.h" | |
17566
0370da969e8a
Implemented adding callbacks for PEP events. Moved the feature list to be application-global instead of per-connection (makes more sense).
Andreas Monitzer <pidgin@monitzer.com>
parents:
16973
diff
changeset
|
43 #include "pep.h" |
17584
3e437e86bd6e
Implemented user tune, currently untested.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17581
diff
changeset
|
44 #include "usertune.h" |
17609
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17593
diff
changeset
|
45 #include "caps.h" |
23445
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
46 #include "data.h" |
16241 | 47 |
48 static PurplePluginProtocolInfo prpl_info = | |
49 { | |
19998
7baa2bc64226
Cleanup the SASL init and add error checking.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19696
diff
changeset
|
50 OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK | |
16241 | 51 #ifdef HAVE_CYRUS_SASL |
19998
7baa2bc64226
Cleanup the SASL init and add error checking.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19696
diff
changeset
|
52 OPT_PROTO_PASSWORD_OPTIONAL | |
7baa2bc64226
Cleanup the SASL init and add error checking.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19696
diff
changeset
|
53 #endif |
18030
62a71bb085ef
Mostly taken from the patch on ticket #410, don't send unknown slash
Stu Tomlinson <stu@nosnilmot.com>
parents:
16973
diff
changeset
|
54 OPT_PROTO_SLASH_COMMANDS_NATIVE, |
16241 | 55 NULL, /* user_splits */ |
56 NULL, /* protocol_options */ | |
21841
d0a3463633ba
Remove size restriction on XMPP avatars
Sean Egan <seanegan@gmail.com>
parents:
21637
diff
changeset
|
57 {"png", 32, 32, 96, 96, 0, PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY}, /* icon_spec */ |
16241 | 58 jabber_list_icon, /* list_icon */ |
59 jabber_list_emblem, /* list_emblems */ | |
60 jabber_status_text, /* status_text */ | |
61 jabber_tooltip_text, /* tooltip_text */ | |
62 jabber_status_types, /* status_types */ | |
63 jabber_blist_node_menu, /* blist_node_menu */ | |
64 jabber_chat_info, /* chat_info */ | |
65 jabber_chat_info_defaults, /* chat_info_defaults */ | |
66 jabber_login, /* login */ | |
67 jabber_close, /* close */ | |
68 jabber_message_send_im, /* send_im */ | |
69 jabber_set_info, /* set_info */ | |
70 jabber_send_typing, /* send_typing */ | |
71 jabber_buddy_get_info, /* get_info */ | |
17814 | 72 jabber_presence_send, /* set_status */ |
16241 | 73 jabber_idle_set, /* set_idle */ |
74 NULL, /* change_passwd */ | |
75 jabber_roster_add_buddy, /* add_buddy */ | |
76 NULL, /* add_buddies */ | |
77 jabber_roster_remove_buddy, /* remove_buddy */ | |
78 NULL, /* remove_buddies */ | |
79 NULL, /* add_permit */ | |
23357
bc3ecda40397
disapproval of revision 'b499ce3771edb822dda585ef37acbafcc48b71f4'
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23356
diff
changeset
|
80 jabber_google_roster_add_deny, /* add_deny */ |
16241 | 81 NULL, /* rem_permit */ |
23357
bc3ecda40397
disapproval of revision 'b499ce3771edb822dda585ef37acbafcc48b71f4'
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23356
diff
changeset
|
82 jabber_google_roster_rem_deny, /* rem_deny */ |
16241 | 83 NULL, /* set_permit_deny */ |
84 jabber_chat_join, /* join_chat */ | |
85 NULL, /* reject_chat */ | |
86 jabber_get_chat_name, /* get_chat_name */ | |
87 jabber_chat_invite, /* chat_invite */ | |
88 jabber_chat_leave, /* chat_leave */ | |
89 NULL, /* chat_whisper */ | |
90 jabber_message_send_chat, /* chat_send */ | |
91 jabber_keepalive, /* keepalive */ | |
92 jabber_register_account, /* register_user */ | |
23360
da78db9f188f
Pass the "real" chat username to the pidgin_retrieve_user_info function.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23356
diff
changeset
|
93 NULL, /* get_cb_info */ |
16241 | 94 NULL, /* get_cb_away */ |
95 jabber_roster_alias_change, /* alias_buddy */ | |
96 jabber_roster_group_change, /* group_buddy */ | |
97 jabber_roster_group_rename, /* rename_group */ | |
98 NULL, /* buddy_free */ | |
99 jabber_convo_closed, /* convo_closed */ | |
100 jabber_normalize, /* normalize */ | |
101 jabber_set_buddy_icon, /* set_buddy_icon */ | |
102 NULL, /* remove_group */ | |
103 jabber_chat_buddy_real_name, /* get_cb_real_name */ | |
104 jabber_chat_set_topic, /* set_chat_topic */ | |
105 jabber_find_blist_chat, /* find_blist_chat */ | |
106 jabber_roomlist_get_list, /* roomlist_get_list */ | |
107 jabber_roomlist_cancel, /* roomlist_cancel */ | |
108 NULL, /* roomlist_expand_category */ | |
23357
bc3ecda40397
disapproval of revision 'b499ce3771edb822dda585ef37acbafcc48b71f4'
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23356
diff
changeset
|
109 NULL, /* can_receive_file */ |
16241 | 110 jabber_si_xfer_send, /* send_file */ |
111 jabber_si_new_xfer, /* new_xfer */ | |
112 jabber_offline_message, /* offline_message */ | |
113 NULL, /* whiteboard_prpl_ops */ | |
114 jabber_prpl_send_raw, /* send_raw */ | |
115 jabber_roomlist_room_serialize, /* roomlist_room_serialize */ | |
18703
033b128f7c21
Added unregistering XMPP accounts. This requires a new prpl-struct entry, but I got an ok for that on the mailing list.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
116 jabber_unregister_account, /* unregister_user */ |
20631
56cec2b6ff98
Uh, these two callbacks were backwards. Methinks somebody didn't test
Mark Doliner <mark@kingant.net>
parents:
20149
diff
changeset
|
117 jabber_send_attention, /* send_attention */ |
56cec2b6ff98
Uh, these two callbacks were backwards. Methinks somebody didn't test
Mark Doliner <mark@kingant.net>
parents:
20149
diff
changeset
|
118 jabber_attention_types, /* attention_types */ |
16675
a338acd14365
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16241
diff
changeset
|
119 |
23111
718a9c287839
Use up the last padding for PurplePluginProtocolInfo in a way that allows
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
22642
diff
changeset
|
120 sizeof(PurplePluginProtocolInfo), /* struct_size */ |
23112
bb41bdce8981
Patch from Jaywalker to let prpls add some helpful text for some account
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
23111
diff
changeset
|
121 NULL |
16241 | 122 }; |
123 | |
124 static gboolean load_plugin(PurplePlugin *plugin) | |
125 { | |
126 purple_signal_register(plugin, "jabber-receiving-xmlnode", | |
127 purple_marshal_VOID__POINTER_POINTER, NULL, 2, | |
128 purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION), | |
129 purple_value_new_outgoing(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE)); | |
130 | |
131 purple_signal_register(plugin, "jabber-sending-xmlnode", | |
132 purple_marshal_VOID__POINTER_POINTER, NULL, 2, | |
133 purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION), | |
134 purple_value_new_outgoing(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE)); | |
135 | |
136 purple_signal_register(plugin, "jabber-sending-text", | |
137 purple_marshal_VOID__POINTER_POINTER, NULL, 2, | |
138 purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION), | |
139 purple_value_new_outgoing(PURPLE_TYPE_STRING)); | |
23988
305fac6af8f9
Updated to use latest spec. in XEP-0231
Marcus Lundblad <ml@update.uu.se>
parents:
23986
diff
changeset
|
140 |
16241 | 141 return TRUE; |
142 } | |
143 | |
144 static gboolean unload_plugin(PurplePlugin *plugin) | |
145 { | |
146 purple_signal_unregister(plugin, "jabber-receiving-xmlnode"); | |
147 | |
148 purple_signal_unregister(plugin, "jabber-sending-xmlnode"); | |
149 | |
150 purple_signal_unregister(plugin, "jabber-sending-text"); | |
151 | |
23991
fba7c73c8f02
Fixed a memory error, which was due to me destroying some hashtables in the
Marcus Lundblad <ml@update.uu.se>
parents:
23988
diff
changeset
|
152 jabber_data_uninit(); |
fba7c73c8f02
Fixed a memory error, which was due to me destroying some hashtables in the
Marcus Lundblad <ml@update.uu.se>
parents:
23988
diff
changeset
|
153 |
16241 | 154 return TRUE; |
155 } | |
156 | |
157 static PurplePluginInfo info = | |
158 { | |
159 PURPLE_PLUGIN_MAGIC, | |
160 PURPLE_MAJOR_VERSION, | |
161 PURPLE_MINOR_VERSION, | |
162 PURPLE_PLUGIN_PROTOCOL, /**< type */ | |
163 NULL, /**< ui_requirement */ | |
164 0, /**< flags */ | |
165 NULL, /**< dependencies */ | |
166 PURPLE_PRIORITY_DEFAULT, /**< priority */ | |
167 | |
168 "prpl-jabber", /**< id */ | |
169 "XMPP", /**< name */ | |
21030
3cc856ca2338
Add a --with-extraversion option to ./configure so packagers can fine tune
Stu Tomlinson <stu@nosnilmot.com>
parents:
20631
diff
changeset
|
170 DISPLAY_VERSION, /**< version */ |
16241 | 171 /** summary */ |
16915
56042b2f8b64
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@wiktel.com>
parents:
16728
diff
changeset
|
172 N_("XMPP Protocol Plugin"), |
16241 | 173 /** description */ |
16915
56042b2f8b64
s/Jabber/XMPP in user-visible places.
Richard Laager <rlaager@wiktel.com>
parents:
16728
diff
changeset
|
174 N_("XMPP Protocol Plugin"), |
16241 | 175 NULL, /**< author */ |
176 PURPLE_WEBSITE, /**< homepage */ | |
177 | |
178 load_plugin, /**< load */ | |
179 unload_plugin, /**< unload */ | |
180 NULL, /**< destroy */ | |
181 | |
182 NULL, /**< ui_info */ | |
183 &prpl_info, /**< extra_info */ | |
184 NULL, /**< prefs_info */ | |
16675
a338acd14365
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16241
diff
changeset
|
185 jabber_actions, |
a338acd14365
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16241
diff
changeset
|
186 |
a338acd14365
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16241
diff
changeset
|
187 /* padding */ |
a338acd14365
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16241
diff
changeset
|
188 NULL, |
a338acd14365
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16241
diff
changeset
|
189 NULL, |
a338acd14365
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16241
diff
changeset
|
190 NULL, |
a338acd14365
And now the protocols
Gary Kramlich <grim@reaperworld.com>
parents:
16241
diff
changeset
|
191 NULL |
16241 | 192 }; |
193 | |
194 static void | |
195 init_plugin(PurplePlugin *plugin) | |
196 { | |
19998
7baa2bc64226
Cleanup the SASL init and add error checking.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19696
diff
changeset
|
197 #ifdef HAVE_CYRUS_SASL |
21125
23d046a20aa0
Improved cyrus sasl support on win32:
Stu Tomlinson <stu@nosnilmot.com>
parents:
21030
diff
changeset
|
198 #ifdef _WIN32 |
23668
c014c3fe0de9
Don't distribute the MIT Kerberos libraries with the win32 build anymore.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23645
diff
changeset
|
199 UINT old_error_mode; |
21125
23d046a20aa0
Improved cyrus sasl support on win32:
Stu Tomlinson <stu@nosnilmot.com>
parents:
21030
diff
changeset
|
200 gchar *sasldir; |
23d046a20aa0
Improved cyrus sasl support on win32:
Stu Tomlinson <stu@nosnilmot.com>
parents:
21030
diff
changeset
|
201 #endif |
19998
7baa2bc64226
Cleanup the SASL init and add error checking.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19696
diff
changeset
|
202 int ret; |
7baa2bc64226
Cleanup the SASL init and add error checking.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19696
diff
changeset
|
203 #endif |
19489
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
204 PurpleAccountUserSplit *split; |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
205 PurpleAccountOption *option; |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
206 |
16963
919515748253
Handle people forgetting to enter a domain. Also, change 'server,' in the account options to 'domain,' which is its proper name, and hopefully less confusion
Sean Egan <seanegan@gmail.com>
parents:
16962
diff
changeset
|
207 /* Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im */ |
19489
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
208 split = purple_account_user_split_new(_("Domain"), NULL, '@'); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
209 purple_account_user_split_set_reverse(split, FALSE); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
210 prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
211 |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
212 split = purple_account_user_split_new(_("Resource"), "Home", '/'); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
213 purple_account_user_split_set_reverse(split, FALSE); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
214 prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
215 |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
216 option = purple_account_option_bool_new(_("Require SSL/TLS"), "require_tls", FALSE); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
217 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
218 option); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
219 |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
220 option = purple_account_option_bool_new(_("Force old (port 5223) SSL"), "old_ssl", FALSE); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
221 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
222 option); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
223 |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
224 option = purple_account_option_bool_new( |
21637
844225b0c905
Now that the release has been tagged and strings are unfrozen, enable the new ft proxy account setting for xmpp accounts. Also, prevent duplicate entries in the streamhost lists. I don't know if the default account proxy is acceptable, perhaps there shouldn't be a default value.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
225 _("Allow plaintext auth over unencrypted streams"), |
844225b0c905
Now that the release has been tagged and strings are unfrozen, enable the new ft proxy account setting for xmpp accounts. Also, prevent duplicate entries in the streamhost lists. I don't know if the default account proxy is acceptable, perhaps there shouldn't be a default value.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
226 "auth_plain_in_clear", FALSE); |
19489
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
227 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
21637
844225b0c905
Now that the release has been tagged and strings are unfrozen, enable the new ft proxy account setting for xmpp accounts. Also, prevent duplicate entries in the streamhost lists. I don't know if the default account proxy is acceptable, perhaps there shouldn't be a default value.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
228 option); |
22498
aed6cbd18a3b
Now that Adium has cyrus-sasl enabled, I'm having a lot of users report problems connecting to servers which ultimately turn out to be that the server supports GSSAPI in addition to other mechanisms and the user isn't configured serverside or clientside to authenticate properly. Generally speaking, a user/password combination is the expectation for most people for connecting.
Evan Schoenberg <evan.s@dreskin.net>
parents:
21841
diff
changeset
|
229 |
19489
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
230 option = purple_account_option_int_new(_("Connect port"), "port", 5222); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
231 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
21637
844225b0c905
Now that the release has been tagged and strings are unfrozen, enable the new ft proxy account setting for xmpp accounts. Also, prevent duplicate entries in the streamhost lists. I don't know if the default account proxy is acceptable, perhaps there shouldn't be a default value.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
232 option); |
844225b0c905
Now that the release has been tagged and strings are unfrozen, enable the new ft proxy account setting for xmpp accounts. Also, prevent duplicate entries in the streamhost lists. I don't know if the default account proxy is acceptable, perhaps there shouldn't be a default value.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
233 |
19489
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
234 option = purple_account_option_string_new(_("Connect server"), |
21637
844225b0c905
Now that the release has been tagged and strings are unfrozen, enable the new ft proxy account setting for xmpp accounts. Also, prevent duplicate entries in the streamhost lists. I don't know if the default account proxy is acceptable, perhaps there shouldn't be a default value.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
235 "connect_server", NULL); |
19489
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
236 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
21637
844225b0c905
Now that the release has been tagged and strings are unfrozen, enable the new ft proxy account setting for xmpp accounts. Also, prevent duplicate entries in the streamhost lists. I don't know if the default account proxy is acceptable, perhaps there shouldn't be a default value.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
237 option); |
844225b0c905
Now that the release has been tagged and strings are unfrozen, enable the new ft proxy account setting for xmpp accounts. Also, prevent duplicate entries in the streamhost lists. I don't know if the default account proxy is acceptable, perhaps there shouldn't be a default value.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
238 |
21603
a4b6854737d5
Implement more of XEP-0065 to support sending files through a proxy. To avoid adding strings this close to a release, it only supports using a proxy that is discovered from the server, but we'll include an account option to manually specify a ft proxy in the next release. Lots of this is based on a patch from galt - Fixes #3730, #116, #1768
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21125
diff
changeset
|
239 option = purple_account_option_string_new(_("File transfer proxies"), |
a4b6854737d5
Implement more of XEP-0065 to support sending files through a proxy. To avoid adding strings this close to a release, it only supports using a proxy that is discovered from the server, but we'll include an account option to manually specify a ft proxy in the next release. Lots of this is based on a patch from galt - Fixes #3730, #116, #1768
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21125
diff
changeset
|
240 "ft_proxies", |
a4b6854737d5
Implement more of XEP-0065 to support sending files through a proxy. To avoid adding strings this close to a release, it only supports using a proxy that is discovered from the server, but we'll include an account option to manually specify a ft proxy in the next release. Lots of this is based on a patch from galt - Fixes #3730, #116, #1768
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21125
diff
changeset
|
241 /* TODO: Is this an acceptable default? */ |
23645
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23364
diff
changeset
|
242 "proxy.jabber.org"); |
21603
a4b6854737d5
Implement more of XEP-0065 to support sending files through a proxy. To avoid adding strings this close to a release, it only supports using a proxy that is discovered from the server, but we'll include an account option to manually specify a ft proxy in the next release. Lots of this is based on a patch from galt - Fixes #3730, #116, #1768
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21125
diff
changeset
|
243 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
a4b6854737d5
Implement more of XEP-0065 to support sending files through a proxy. To avoid adding strings this close to a release, it only supports using a proxy that is discovered from the server, but we'll include an account option to manually specify a ft proxy in the next release. Lots of this is based on a patch from galt - Fixes #3730, #116, #1768
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21125
diff
changeset
|
244 option); |
a4b6854737d5
Implement more of XEP-0065 to support sending files through a proxy. To avoid adding strings this close to a release, it only supports using a proxy that is discovered from the server, but we'll include an account option to manually specify a ft proxy in the next release. Lots of this is based on a patch from galt - Fixes #3730, #116, #1768
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21125
diff
changeset
|
245 |
23445
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
246 /* this should probably be part of global smiley theme settings later on, |
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
247 shared with MSN */ |
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
248 option = purple_account_option_bool_new(_("Show Custom Smileys"), |
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
249 "custom_smileys", TRUE); |
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
250 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, |
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
251 option); |
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
252 |
19489
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
253 jabber_init_plugin(plugin); |
21637
844225b0c905
Now that the release has been tagged and strings are unfrozen, enable the new ft proxy account setting for xmpp accounts. Also, prevent duplicate entries in the streamhost lists. I don't know if the default account proxy is acceptable, perhaps there shouldn't be a default value.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
254 |
19489
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
255 purple_prefs_remove("/plugins/prpl/jabber"); |
21637
844225b0c905
Now that the release has been tagged and strings are unfrozen, enable the new ft proxy account setting for xmpp accounts. Also, prevent duplicate entries in the streamhost lists. I don't know if the default account proxy is acceptable, perhaps there shouldn't be a default value.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
256 |
19489
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
257 /* XXX - If any other plugin wants SASL this won't be good ... */ |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
258 #ifdef HAVE_CYRUS_SASL |
21125
23d046a20aa0
Improved cyrus sasl support on win32:
Stu Tomlinson <stu@nosnilmot.com>
parents:
21030
diff
changeset
|
259 #ifdef _WIN32 |
23d046a20aa0
Improved cyrus sasl support on win32:
Stu Tomlinson <stu@nosnilmot.com>
parents:
21030
diff
changeset
|
260 sasldir = g_build_filename(wpurple_install_dir(), "sasl2", NULL); |
23d046a20aa0
Improved cyrus sasl support on win32:
Stu Tomlinson <stu@nosnilmot.com>
parents:
21030
diff
changeset
|
261 sasl_set_path(SASL_PATH_TYPE_PLUGIN, sasldir); |
23d046a20aa0
Improved cyrus sasl support on win32:
Stu Tomlinson <stu@nosnilmot.com>
parents:
21030
diff
changeset
|
262 g_free(sasldir); |
23668
c014c3fe0de9
Don't distribute the MIT Kerberos libraries with the win32 build anymore.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23645
diff
changeset
|
263 /* Suppress error popups for failing to load sasl plugins */ |
c014c3fe0de9
Don't distribute the MIT Kerberos libraries with the win32 build anymore.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23645
diff
changeset
|
264 old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS); |
21125
23d046a20aa0
Improved cyrus sasl support on win32:
Stu Tomlinson <stu@nosnilmot.com>
parents:
21030
diff
changeset
|
265 #endif |
19998
7baa2bc64226
Cleanup the SASL init and add error checking.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19696
diff
changeset
|
266 if ((ret = sasl_client_init(NULL)) != SASL_OK) { |
7baa2bc64226
Cleanup the SASL init and add error checking.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19696
diff
changeset
|
267 purple_debug_error("xmpp", "Error (%d) initializing SASL.\n", ret); |
7baa2bc64226
Cleanup the SASL init and add error checking.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19696
diff
changeset
|
268 } |
23668
c014c3fe0de9
Don't distribute the MIT Kerberos libraries with the win32 build anymore.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23645
diff
changeset
|
269 #ifdef _WIN32 |
c014c3fe0de9
Don't distribute the MIT Kerberos libraries with the win32 build anymore.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23645
diff
changeset
|
270 /* Restore the original error mode */ |
c014c3fe0de9
Don't distribute the MIT Kerberos libraries with the win32 build anymore.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23645
diff
changeset
|
271 SetErrorMode(old_error_mode); |
c014c3fe0de9
Don't distribute the MIT Kerberos libraries with the win32 build anymore.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23645
diff
changeset
|
272 #endif |
19489
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
273 #endif |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
274 jabber_register_commands(); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
275 |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
276 jabber_iq_init(); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
277 jabber_pep_init(); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
278 |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
279 jabber_tune_init(); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
280 jabber_caps_init(); |
23988
305fac6af8f9
Updated to use latest spec. in XEP-0231
Marcus Lundblad <ml@update.uu.se>
parents:
23986
diff
changeset
|
281 |
23445
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
282 jabber_data_init(); |
23988
305fac6af8f9
Updated to use latest spec. in XEP-0231
Marcus Lundblad <ml@update.uu.se>
parents:
23986
diff
changeset
|
283 |
19489
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
284 jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb); |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
285 jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb); |
23445
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
286 jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", |
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
287 jabber_buzz_isenabled); |
23988
305fac6af8f9
Updated to use latest spec. in XEP-0231
Marcus Lundblad <ml@update.uu.se>
parents:
23986
diff
changeset
|
288 jabber_add_feature("bob", XEP_0231_NAMESPACE, |
23445
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
289 jabber_custom_smileys_isenabled); |
4ac5db6e39f3
Custom smileys for XMPP according to XEP 0231. Refs #5627.
Marcus Lundblad <ml@update.uu.se>
parents:
23112
diff
changeset
|
290 |
19489
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18922
diff
changeset
|
291 jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata); |
16241 | 292 } |
293 | |
294 | |
295 PURPLE_INIT_PLUGIN(jabber, init_plugin, info); |