annotate libpurple/protocols/jabber/disco.c @ 26605:217a3ad87fc4

Discovered why that default assumption of PURPLE_DISCO_BROWSE was in there... ejabberd's MUC component doesn't advertise disco#items as a feature on the MUC.
author Paul Aurich <paul@darkrain42.org>
date Tue, 14 Apr 2009 08:29:25 +0000
parents ff33b65b2448
children 9fb8d8d9783a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1 /*
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
2 * purple - Jabber Service Discovery
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
3 *
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
4 * Copyright (C) 2003, Nathan Walp <faceprint@faceprint.com>
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
5 *
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
6 * This program is free software; you can redistribute it and/or modify
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
7 * it under the terms of the GNU General Public License as published by
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
8 * the Free Software Foundation; either version 2 of the License, or
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
9 * (at your option) any later version.
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
10 *
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
11 * This program is distributed in the hope that it will be useful,
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
14 * GNU General Public License for more details.
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
15 *
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
16 * You should have received a copy of the GNU General Public License
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
17 * along with this program; if not, write to the Free Software
19681
44b4e8bd759b The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 19654
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
19 *
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
20 */
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
21
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
22 #include "internal.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
23 #include "prefs.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
24 #include "debug.h"
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
25 #include "request.h"
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
26 #include "notify.h"
26593
b290c7b9fc73 propagate from branch 'im.pidgin.pidgin' (head 3c568b43fb4447b65a2b06e6767340edd7763c53)
Paul Aurich <paul@darkrain42.org>
parents: 26470 26260
diff changeset
27 #include "libpurple/disco.h"
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
28
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
29 #include "buddy.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
30 #include "google.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
31 #include "iq.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
32 #include "disco.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
33 #include "jabber.h"
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23867
diff changeset
34 #include "jingle/jingle.h"
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
35 #include "presence.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
36 #include "roster.h"
17834
a75079eae085 added preliminary frame for pep-support
Andreas Monitzer <pidgin@monitzer.com>
parents: 17364
diff changeset
37 #include "pep.h"
17882
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: 17849
diff changeset
38 #include "adhoccommands.h"
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
39 #include "xdata.h"
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
40
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
41 struct _jabber_disco_info_cb_data {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
42 gpointer data;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
43 JabberDiscoInfoCallback *callback;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
44 };
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
45
26258
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
46 struct _jabber_disco_items_cb_data {
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
47 gpointer data;
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
48 JabberDiscoItemsCallback *callback;
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
49 };
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
50
17849
e49b259fc7dd PEP publishing features are now only announced in disco#info when PEP is supported by the server.
Andreas Monitzer <pidgin@monitzer.com>
parents: 17839
diff changeset
51 #define SUPPORT_FEATURE(x) { \
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
52 feature = xmlnode_new_child(query, "feature"); \
17849
e49b259fc7dd PEP publishing features are now only announced in disco#info when PEP is supported by the server.
Andreas Monitzer <pidgin@monitzer.com>
parents: 17839
diff changeset
53 xmlnode_set_attrib(feature, "var", x); \
e49b259fc7dd PEP publishing features are now only announced in disco#info when PEP is supported by the server.
Andreas Monitzer <pidgin@monitzer.com>
parents: 17839
diff changeset
54 }
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
55
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
56 struct jabber_disco_list_data {
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
57 JabberStream *js; /* TODO: Needed? */
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
58 PurpleDiscoList *list;
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
59 char *server;
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
60 int fetch_count;
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
61 };
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
62
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
63 struct jabber_disco_service_data {
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
64 char *jid;
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
65 char *node;
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
66 };
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
67
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: 19697
diff changeset
68 static void
26465
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
69 jabber_disco_bytestream_server_cb(JabberStream *js, const char *from,
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
70 JabberIqType type, const char *id,
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
71 xmlnode *packet, gpointer data)
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
72 {
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: 19697
diff changeset
73 JabberBytestreamsStreamhost *sh = data;
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: 19697
diff changeset
74 xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
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: 19697
diff changeset
75 "http://jabber.org/protocol/bytestreams");
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: 19697
diff changeset
76
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: 19697
diff changeset
77 if (from && !strcmp(from, sh->jid) && query != NULL) {
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: 19697
diff changeset
78 xmlnode *sh_node = xmlnode_get_child(query, "streamhost");
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: 19697
diff changeset
79 if (sh_node) {
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: 19697
diff changeset
80 const char *jid = xmlnode_get_attrib(sh_node, "jid");
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: 19697
diff changeset
81 const char *port = xmlnode_get_attrib(sh_node, "port");
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: 19697
diff changeset
82
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: 19697
diff changeset
83
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: 19697
diff changeset
84 if (jid == NULL || strcmp(jid, from) != 0)
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: 19697
diff changeset
85 purple_debug_error("jabber", "Invalid jid(%s) for bytestream.\n",
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: 19697
diff changeset
86 jid ? jid : "(null)");
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: 19697
diff changeset
87
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: 19697
diff changeset
88 sh->host = g_strdup(xmlnode_get_attrib(sh_node, "host"));
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: 19697
diff changeset
89 sh->zeroconf = g_strdup(xmlnode_get_attrib(sh_node, "zeroconf"));
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: 19697
diff changeset
90 if (port != NULL)
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: 19697
diff changeset
91 sh->port = atoi(port);
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: 19697
diff changeset
92 }
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: 19697
diff changeset
93 }
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: 19697
diff changeset
94
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: 19697
diff changeset
95 purple_debug_info("jabber", "Discovered bytestream proxy server: "
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: 19697
diff changeset
96 "jid='%s' host='%s' port='%d' zeroconf='%s'\n",
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: 19697
diff changeset
97 from ? from : "", sh->host ? sh->host : "",
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: 19697
diff changeset
98 sh->port, sh->zeroconf ? sh->zeroconf : "");
23600
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
99
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
100 /* TODO: When we support zeroconf proxies, fix this to handle them */
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
101 if (!(sh->jid && sh->host && sh->port > 0)) {
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
102 g_free(sh->jid);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
103 g_free(sh->host);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
104 g_free(sh->zeroconf);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
105 g_free(sh);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
106 js->bs_proxies = g_list_remove(js->bs_proxies, sh);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
107 }
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: 19697
diff changeset
108 }
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: 19697
diff changeset
109
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
110
25648
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
111 void jabber_disco_info_parse(JabberStream *js, const char *from,
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
112 JabberIqType type, const char *id,
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
113 xmlnode *in_query) {
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
114
25648
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
115 if(!from)
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
116 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
117
25648
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
118 if(type == JABBER_IQ_GET) {
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
119 xmlnode *query, *identity, *feature;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
120 JabberIq *iq;
25648
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
121 const char *node = xmlnode_get_attrib(in_query, "node");
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
122
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
123 iq = jabber_iq_new_query(js, JABBER_IQ_RESULT,
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
124 "http://jabber.org/protocol/disco#info");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
125
26257
ce23e32a0ada Don't match in the disco callbacks hashtable on remote JID. Use IQ id instead.
Paul Aurich <paul@darkrain42.org>
parents: 26256
diff changeset
126 jabber_iq_set_id(iq, id);
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
127
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
128 xmlnode_set_attrib(iq->node, "to", from);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
129 query = xmlnode_get_child(iq->node, "query");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
130
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
131 if(node)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
132 xmlnode_set_attrib(query, "node", node);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
133
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
134 if(!node || !strcmp(node, CAPS0115_NODE "#" VERSION)) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
135 identity = xmlnode_new_child(query, "identity");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
136 xmlnode_set_attrib(identity, "category", "client");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
137 xmlnode_set_attrib(identity, "type", "pc"); /* XXX: bot, console,
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
138 * handheld, pc, phone,
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
139 * web */
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
140 xmlnode_set_attrib(identity, "name", PACKAGE);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
141
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
142 SUPPORT_FEATURE("jabber:iq:last")
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
143 SUPPORT_FEATURE("jabber:iq:oob")
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
144 SUPPORT_FEATURE("jabber:iq:time")
25638
a73791d35fcc Marcus' eagle eyes noticed 'xmpp:urn:time', which is bogus.
Paul Aurich <paul@darkrain42.org>
parents: 24855
diff changeset
145 SUPPORT_FEATURE("urn:xmpp:time")
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
146 SUPPORT_FEATURE("jabber:iq:version")
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
147 SUPPORT_FEATURE("jabber:x:conference")
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
148 SUPPORT_FEATURE("http://jabber.org/protocol/bytestreams")
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
149 SUPPORT_FEATURE("http://jabber.org/protocol/disco#info")
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
150 SUPPORT_FEATURE("http://jabber.org/protocol/disco#items")
25129
b4ec5481a67a Implements file transfers using in-band bytestreams for XMPP
Marcus Lundblad <ml@update.uu.se>
parents: 23600
diff changeset
151 SUPPORT_FEATURE("http://jabber.org/protocol/ibb");
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
152 SUPPORT_FEATURE("http://jabber.org/protocol/muc")
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
153 SUPPORT_FEATURE("http://jabber.org/protocol/muc#user")
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
154 SUPPORT_FEATURE("http://jabber.org/protocol/si")
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
155 SUPPORT_FEATURE("http://jabber.org/protocol/si/profile/file-transfer")
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
156 SUPPORT_FEATURE("http://jabber.org/protocol/xhtml-im")
18109
3d7129ac1de9 respond to XEP-0199 queries (XMPP ping)
Nathan Walp <nwalp@pidgin.im>
parents: 17364
diff changeset
157 SUPPORT_FEATURE("urn:xmpp:ping")
25952
5f9a24d1c25e Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25762
diff changeset
158
19489
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
159 if(!node) { /* non-caps disco#info, add all enabled extensions */
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
160 GList *features;
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
161 for(features = jabber_features; features; features = features->next) {
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
162 JabberFeature *feat = (JabberFeature*)features->data;
17849
e49b259fc7dd PEP publishing features are now only announced in disco#info when PEP is supported by the server.
Andreas Monitzer <pidgin@monitzer.com>
parents: 17839
diff changeset
163 if(feat->is_enabled == NULL || feat->is_enabled(js, feat->shortname, feat->namespace) == TRUE)
e49b259fc7dd PEP publishing features are now only announced in disco#info when PEP is supported by the server.
Andreas Monitzer <pidgin@monitzer.com>
parents: 17839
diff changeset
164 SUPPORT_FEATURE(feat->namespace);
19489
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
165 }
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
166 }
23814
d0ac3c438b71 Check remote JID's capabilities for audio and video XEP support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23787
diff changeset
167 #ifdef USE_VV
23759
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18259
diff changeset
168 } else if (node && !strcmp(node, CAPS0115_NODE "#voice-v1")) {
24965
70ae1029bb70 Fix GTalk vv caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
169 SUPPORT_FEATURE("http://www.google.com/xmpp/protocol/session");
70ae1029bb70 Fix GTalk vv caps.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24938
diff changeset
170 SUPPORT_FEATURE("http://www.google.com/xmpp/protocol/voice/v1");
24938
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23867
diff changeset
171 SUPPORT_FEATURE(JINGLE);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23867
diff changeset
172 SUPPORT_FEATURE(JINGLE_APP_RTP_SUPPORT_AUDIO);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23867
diff changeset
173 SUPPORT_FEATURE(JINGLE_APP_RTP_SUPPORT_VIDEO);
bd598b606ca4 Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23867
diff changeset
174 SUPPORT_FEATURE(JINGLE_TRANSPORT_RAWUDP);
24966
bee5ab815291 Added a Jingle ice-udp transmitter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 24965
diff changeset
175 SUPPORT_FEATURE(JINGLE_TRANSPORT_ICEUDP);
23814
d0ac3c438b71 Check remote JID's capabilities for audio and video XEP support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 23787
diff changeset
176 #endif
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
177 } else {
19489
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
178 const char *ext = NULL;
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
179 unsigned pos;
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
180 unsigned nodelen = strlen(node);
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
181 unsigned capslen = strlen(CAPS0115_NODE);
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
182 /* do a basic plausability check */
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
183 if(nodelen > capslen+1) {
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
184 /* verify that the string is CAPS0115#<ext> and get the pointer to the ext part */
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
185 for(pos = 0; pos < capslen+1; ++pos) {
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
186 if(pos == capslen) {
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
187 if(node[pos] == '#')
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
188 ext = &node[pos+1];
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
189 else
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
190 break;
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
191 } else if(node[pos] != CAPS0115_NODE[pos])
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
192 break;
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
193 }
25952
5f9a24d1c25e Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25762
diff changeset
194
19489
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
195 if(ext != NULL) {
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
196 /* look for that ext */
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
197 GList *features;
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
198 for(features = jabber_features; features; features = features->next) {
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
199 JabberFeature *feat = (JabberFeature*)features->data;
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
200 if(!strcmp(feat->shortname, ext)) {
17849
e49b259fc7dd PEP publishing features are now only announced in disco#info when PEP is supported by the server.
Andreas Monitzer <pidgin@monitzer.com>
parents: 17839
diff changeset
201 SUPPORT_FEATURE(feat->namespace);
e49b259fc7dd PEP publishing features are now only announced in disco#info when PEP is supported by the server.
Andreas Monitzer <pidgin@monitzer.com>
parents: 17839
diff changeset
202 break;
19489
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
203 }
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
204 }
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
205 if(features == NULL)
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
206 ext = NULL;
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
207 }
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
208 }
25952
5f9a24d1c25e Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25762
diff changeset
209
19489
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
210 if(ext == NULL) {
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
211 xmlnode *error, *inf;
25952
5f9a24d1c25e Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25762
diff changeset
212
19489
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
213 /* XXX: gross hack, implement jabber_iq_set_type or something */
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
214 xmlnode_set_attrib(iq->node, "type", "error");
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
215 iq->type = JABBER_IQ_ERROR;
25952
5f9a24d1c25e Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25762
diff changeset
216
19489
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
217 error = xmlnode_new_child(query, "error");
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
218 xmlnode_set_attrib(error, "code", "404");
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
219 xmlnode_set_attrib(error, "type", "cancel");
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
220 inf = xmlnode_new_child(error, "item-not-found");
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
221 xmlnode_set_namespace(inf, "urn:ietf:params:xml:ns:xmpp-stanzas");
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
222 }
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
223 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
224
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
225 jabber_iq_send(iq);
26598
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
226 } else if (type == JABBER_IQ_SET) {
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
227 /* wtf? seriously. wtf‽ */
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
228 JabberIq *iq = jabber_iq_new(js, JABBER_IQ_ERROR);
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
229 xmlnode *error, *bad_request;
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
230
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
231 /* Free the <query/> */
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
232 xmlnode_free(xmlnode_get_child(iq->node, "query"));
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
233 /* Add an error */
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
234 error = xmlnode_new_child(iq->node, "error");
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
235 xmlnode_set_attrib(error, "type", "modify");
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
236 bad_request = xmlnode_new_child(error, "bad-request");
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
237 xmlnode_set_namespace(bad_request, "urn:ietf:params:xml:ns:xmpp-stanzas");
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
238
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
239 jabber_iq_set_id(iq, id);
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
240 xmlnode_set_attrib(iq->node, "to", from);
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
241
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
242 jabber_iq_send(iq);
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
243 }
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
244 }
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
245
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
246 static void jabber_disco_info_cb(JabberStream *js, const char *from,
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
247 JabberIqType type, const char *id,
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
248 xmlnode *packet, gpointer data)
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
249 {
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
250 struct _jabber_disco_info_cb_data *jdicd = data;
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
251 xmlnode *query;
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
252
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
253 query = xmlnode_get_child_with_namespace(packet, "query",
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
254 "http://jabber.org/protocol/disco#info");
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
255
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
256 if (type == JABBER_IQ_RESULT && query) {
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
257 xmlnode *child;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
258 JabberID *jid;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
259 JabberBuddy *jb;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
260 JabberBuddyResource *jbr = NULL;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
261 JabberCapabilities capabilities = JABBER_CAP_NONE;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
262
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
263 if((jid = jabber_id_new(from))) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
264 if(jid->resource && (jb = jabber_buddy_find(js, from, TRUE)))
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
265 jbr = jabber_buddy_find_resource(jb, jid->resource);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
266 jabber_id_free(jid);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
267 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
268
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
269 if(jbr)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
270 capabilities = jbr->capabilities;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
271
26598
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
272 for(child = query->child; child; child = child->next) {
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
273 if(child->type != XMLNODE_TYPE_TAG)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
274 continue;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
275
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
276 if(!strcmp(child->name, "identity")) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
277 const char *category = xmlnode_get_attrib(child, "category");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
278 const char *type = xmlnode_get_attrib(child, "type");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
279 if(!category || !type)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
280 continue;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
281
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
282 if(!strcmp(category, "conference") && !strcmp(type, "text")) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
283 /* we found a groupchat or MUC server, add it to the list */
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
284 /* XXX: actually check for protocol/muc or gc-1.0 support */
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: 19697
diff changeset
285 js->chat_servers = g_list_prepend(js->chat_servers, g_strdup(from));
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
286 } else if(!strcmp(category, "directory") && !strcmp(type, "user")) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
287 /* we found a JUD */
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: 19697
diff changeset
288 js->user_directories = g_list_prepend(js->user_directories, g_strdup(from));
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: 19697
diff changeset
289 } else if(!strcmp(category, "proxy") && !strcmp(type, "bytestreams")) {
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: 19697
diff changeset
290 /* This is a bytestream proxy */
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: 19697
diff changeset
291 JabberIq *iq;
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: 19697
diff changeset
292 JabberBytestreamsStreamhost *sh;
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: 19697
diff changeset
293
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: 19697
diff changeset
294 purple_debug_info("jabber", "Found bytestream proxy server: %s\n", from);
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: 19697
diff changeset
295
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: 19697
diff changeset
296 sh = g_new0(JabberBytestreamsStreamhost, 1);
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: 19697
diff changeset
297 sh->jid = g_strdup(from);
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: 19697
diff changeset
298 js->bs_proxies = g_list_prepend(js->bs_proxies, sh);
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: 19697
diff changeset
299
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: 19697
diff changeset
300 iq = jabber_iq_new_query(js, JABBER_IQ_GET,
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: 19697
diff changeset
301 "http://jabber.org/protocol/bytestreams");
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: 19697
diff changeset
302 xmlnode_set_attrib(iq->node, "to", sh->jid);
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: 19697
diff changeset
303 jabber_iq_set_callback(iq, jabber_disco_bytestream_server_cb, sh);
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: 19697
diff changeset
304 jabber_iq_send(iq);
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
305 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
306
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
307 } else if(!strcmp(child->name, "feature")) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
308 const char *var = xmlnode_get_attrib(child, "var");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
309 if(!var)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
310 continue;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
311
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
312 if(!strcmp(var, "http://jabber.org/protocol/si"))
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
313 capabilities |= JABBER_CAP_SI;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
314 else if(!strcmp(var, "http://jabber.org/protocol/si/profile/file-transfer"))
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
315 capabilities |= JABBER_CAP_SI_FILE_XFER;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
316 else if(!strcmp(var, "http://jabber.org/protocol/bytestreams"))
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
317 capabilities |= JABBER_CAP_BYTESTREAMS;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
318 else if(!strcmp(var, "jabber:iq:search"))
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
319 capabilities |= JABBER_CAP_IQ_SEARCH;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
320 else if(!strcmp(var, "jabber:iq:register"))
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
321 capabilities |= JABBER_CAP_IQ_REGISTER;
26466
cde07a2e4531 Do not advertise support for old XEP-0199 (Ping) namespace
Paul Aurich <paul@darkrain42.org>
parents: 26465
diff changeset
322 else if(!strcmp(var, "urn:xmpp:ping"))
17835
6ab1089e2101 applied patch for supporting XEP-0199: XMPP Ping
Andreas Monitzer <pidgin@monitzer.com>
parents: 17834
diff changeset
323 capabilities |= JABBER_CAP_PING;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
324 else if(!strcmp(var, "http://jabber.org/protocol/disco#items"))
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
325 capabilities |= JABBER_CAP_ITEMS;
17882
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: 17849
diff changeset
326 else if(!strcmp(var, "http://jabber.org/protocol/commands")) {
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: 17849
diff changeset
327 capabilities |= JABBER_CAP_ADHOC;
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: 17849
diff changeset
328 }
25129
b4ec5481a67a Implements file transfers using in-band bytestreams for XMPP
Marcus Lundblad <ml@update.uu.se>
parents: 23600
diff changeset
329 else if(!strcmp(var, "http://jabber.org/protocol/ibb")) {
b4ec5481a67a Implements file transfers using in-band bytestreams for XMPP
Marcus Lundblad <ml@update.uu.se>
parents: 23600
diff changeset
330 purple_debug_info("jabber", "remote supports IBB\n");
b4ec5481a67a Implements file transfers using in-band bytestreams for XMPP
Marcus Lundblad <ml@update.uu.se>
parents: 23600
diff changeset
331 capabilities |= JABBER_CAP_IBB;
b4ec5481a67a Implements file transfers using in-band bytestreams for XMPP
Marcus Lundblad <ml@update.uu.se>
parents: 23600
diff changeset
332 }
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
333 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
334 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
335
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
336 capabilities |= JABBER_CAP_RETRIEVED;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
337
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
338 if(jbr)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
339 jbr->capabilities = capabilities;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
340
26598
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
341 jdicd->callback(js, from, capabilities, jdicd->data);
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
342 } else { /* type == JABBER_IQ_ERROR or query == NULL */
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
343 JabberID *jid;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
344 JabberBuddy *jb;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
345 JabberBuddyResource *jbr = NULL;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
346 JabberCapabilities capabilities = JABBER_CAP_NONE;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
347
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
348 if((jid = jabber_id_new(from))) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
349 if(jid->resource && (jb = jabber_buddy_find(js, from, TRUE)))
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
350 jbr = jabber_buddy_find_resource(jb, jid->resource);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
351 jabber_id_free(jid);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
352 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
353
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
354 if(jbr)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
355 capabilities = jbr->capabilities;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
356
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
357 jdicd->callback(js, from, capabilities, jdicd->data);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
358 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
359 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
360
25648
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
361 void jabber_disco_items_parse(JabberStream *js, const char *from,
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
362 JabberIqType type, const char *id,
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
363 xmlnode *query) {
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
364 if(type == JABBER_IQ_GET) {
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
365 JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_RESULT,
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
366 "http://jabber.org/protocol/disco#items");
25952
5f9a24d1c25e Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25762
diff changeset
367
17892
22c848c81ccd Now preserving the node on the (empty) disco#items replies. This is required for apps to add items on the correct nodes using signals.
Andreas Monitzer <pidgin@monitzer.com>
parents: 17883
diff changeset
368 /* preserve node */
25648
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
369 xmlnode *iq_query = xmlnode_get_child(iq->node, "query");
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
370 const char *node = xmlnode_get_attrib(query, "node");
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
371 if(node)
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
372 xmlnode_set_attrib(iq_query,"node",node);
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
373
25648
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
374 jabber_iq_set_id(iq, id);
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
375
25648
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
376 if (from)
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25638
diff changeset
377 xmlnode_set_attrib(iq->node, "to", from);
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
378 jabber_iq_send(iq);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
379 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
380 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
381
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
382 static void
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
383 jabber_disco_finish_server_info_result_cb(JabberStream *js)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
384 {
23600
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
385 const char *ft_proxies;
18163
703872bf33c6 server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents: 18153
diff changeset
386
703872bf33c6 server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents: 18153
diff changeset
387 jabber_vcard_fetch_mine(js);
703872bf33c6 server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents: 18153
diff changeset
388
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
389 if (!(js->server_caps & JABBER_CAP_GOOGLE_ROSTER)) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
390 /* If the server supports JABBER_CAP_GOOGLE_ROSTER; we will have already requested it */
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
391 jabber_roster_request(js);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
392 }
17362
48aebb50a93d whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 15822
diff changeset
393
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
394 /* Send initial presence; this will trigger receipt of presence for contacts on the roster */
18685
c03e3fe11ea9 Fixed errors created by merge conflict resolve mistakes.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18684
diff changeset
395 jabber_presence_send(js->gc->account, NULL);
23600
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
396
17883
9a19c46adf66 The server's ad-hoc commands are now listed in the account's action menu. Note that this requires an additional field in the _PurplePluginAction struct. There's no other way, since there was no way to supply user_data, and dynamically created functions are not supported by C. This should be fine, since that struct is only malloced in purple_plugin_action_new, which is part of the core. Applications have to either pass the struct unmodified, or restore the user_data pointer if the action is recreated when necessary (as is the case in Adium).
Andreas Monitzer <pidgin@monitzer.com>
parents: 17882
diff changeset
397 if (js->server_caps & JABBER_CAP_ADHOC) {
9a19c46adf66 The server's ad-hoc commands are now listed in the account's action menu. Note that this requires an additional field in the _PurplePluginAction struct. There's no other way, since there was no way to supply user_data, and dynamically created functions are not supported by C. This should be fine, since that struct is only malloced in purple_plugin_action_new, which is part of the core. Applications have to either pass the struct unmodified, or restore the user_data pointer if the action is recreated when necessary (as is the case in Adium).
Andreas Monitzer <pidgin@monitzer.com>
parents: 17882
diff changeset
398 /* The server supports ad-hoc commands, so let's request the list */
9a19c46adf66 The server's ad-hoc commands are now listed in the account's action menu. Note that this requires an additional field in the _PurplePluginAction struct. There's no other way, since there was no way to supply user_data, and dynamically created functions are not supported by C. This should be fine, since that struct is only malloced in purple_plugin_action_new, which is part of the core. Applications have to either pass the struct unmodified, or restore the user_data pointer if the action is recreated when necessary (as is the case in Adium).
Andreas Monitzer <pidgin@monitzer.com>
parents: 17882
diff changeset
399 jabber_adhoc_server_get_list(js);
9a19c46adf66 The server's ad-hoc commands are now listed in the account's action menu. Note that this requires an additional field in the _PurplePluginAction struct. There's no other way, since there was no way to supply user_data, and dynamically created functions are not supported by C. This should be fine, since that struct is only malloced in purple_plugin_action_new, which is part of the core. Applications have to either pass the struct unmodified, or restore the user_data pointer if the action is recreated when necessary (as is the case in Adium).
Andreas Monitzer <pidgin@monitzer.com>
parents: 17882
diff changeset
400 }
23600
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
401
24855
0700833f0c5d Commit patch #7670: Implement xep-0191 (simple blocking) for jabber protocols
Mark Doliner <mark@kingant.net>
parents: 23600
diff changeset
402 /* If the server supports blocking, request the block list */
0700833f0c5d Commit patch #7670: Implement xep-0191 (simple blocking) for jabber protocols
Mark Doliner <mark@kingant.net>
parents: 23600
diff changeset
403 if (js->server_caps & JABBER_CAP_BLOCKING) {
0700833f0c5d Commit patch #7670: Implement xep-0191 (simple blocking) for jabber protocols
Mark Doliner <mark@kingant.net>
parents: 23600
diff changeset
404 jabber_request_block_list(js);
0700833f0c5d Commit patch #7670: Implement xep-0191 (simple blocking) for jabber protocols
Mark Doliner <mark@kingant.net>
parents: 23600
diff changeset
405 }
0700833f0c5d Commit patch #7670: Implement xep-0191 (simple blocking) for jabber protocols
Mark Doliner <mark@kingant.net>
parents: 23600
diff changeset
406
23600
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
407 /* If there are manually specified bytestream proxies, query them */
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
408 ft_proxies = purple_account_get_string(js->gc->account, "ft_proxies", NULL);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
409 if (ft_proxies) {
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
410 JabberIq *iq;
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
411 JabberBytestreamsStreamhost *sh;
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
412 int i;
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
413 char *tmp;
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
414 gchar **ft_proxy_list = g_strsplit(ft_proxies, ",", 0);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
415
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
416 for(i = 0; ft_proxy_list[i]; i++) {
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
417 g_strstrip(ft_proxy_list[i]);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
418 if(!(*ft_proxy_list[i]))
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
419 continue;
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
420
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
421 /* We used to allow specifying a port directly here; get rid of it */
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
422 if((tmp = strchr(ft_proxy_list[i], ':')))
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
423 *tmp = '\0';
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
424
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
425 sh = g_new0(JabberBytestreamsStreamhost, 1);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
426 sh->jid = g_strdup(ft_proxy_list[i]);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
427 js->bs_proxies = g_list_prepend(js->bs_proxies, sh);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
428
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
429 iq = jabber_iq_new_query(js, JABBER_IQ_GET,
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
430 "http://jabber.org/protocol/bytestreams");
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
431 xmlnode_set_attrib(iq->node, "to", sh->jid);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
432 jabber_iq_set_callback(iq, jabber_disco_bytestream_server_cb, sh);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
433 jabber_iq_send(iq);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
434 }
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
435
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
436 g_strfreev(ft_proxy_list);
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
437 }
10382f1e1353 Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents: 21603
diff changeset
438
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
439 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
440
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
441 struct _disco_data {
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
442 struct jabber_disco_list_data *list_data;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
443 PurpleDiscoService *parent;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
444 char *node;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
445 };
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
446
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
447 static void
26465
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
448 jabber_disco_server_info_result_cb(JabberStream *js, const char *from,
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
449 JabberIqType type, const char *id,
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
450 xmlnode *packet, gpointer data)
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
451 {
17362
48aebb50a93d whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 15822
diff changeset
452 xmlnode *query, *child;
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
453
26465
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
454 if (!from || strcmp(from, js->user->domain)) {
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
455 jabber_disco_finish_server_info_result_cb(js);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
456 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
457 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
458
26465
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
459 if (type == JABBER_IQ_ERROR) {
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
460 /* A common way to get here is for the server not to support xmlns http://jabber.org/protocol/disco#info */
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
461 jabber_disco_finish_server_info_result_cb(js);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
462 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
463 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
464
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
465 query = xmlnode_get_child(packet, "query");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
466
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
467 if (!query) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
468 jabber_disco_finish_server_info_result_cb(js);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
469 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
470 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
471
17362
48aebb50a93d whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 15822
diff changeset
472 for (child = xmlnode_get_child(query, "identity"); child;
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
473 child = xmlnode_get_next_twin(child)) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
474 const char *category, *type, *name;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
475 category = xmlnode_get_attrib(child, "category");
17834
a75079eae085 added preliminary frame for pep-support
Andreas Monitzer <pidgin@monitzer.com>
parents: 17364
diff changeset
476 type = xmlnode_get_attrib(child, "type");
19489
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
477 if(category && type && !strcmp(category, "pubsub") && !strcmp(type,"pep"))
b0733d5d7621 Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents: 18685
diff changeset
478 js->pep = TRUE;
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
479 if (!category || strcmp(category, "server"))
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
480 continue;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
481 if (!type || strcmp(type, "im"))
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
482 continue;
17362
48aebb50a93d whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 15822
diff changeset
483
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
484 name = xmlnode_get_attrib(child, "name");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
485 if (!name)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
486 continue;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
487
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
488 g_free(js->server_name);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
489 js->server_name = g_strdup(name);
15522
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15373
diff changeset
490 if (!strcmp(name, "Google Talk")) {
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: 19697
diff changeset
491 purple_debug_info("jabber", "Google Talk!\n");
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: 19697
diff changeset
492 js->googletalk = TRUE;
26080
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 24986
diff changeset
493
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 24986
diff changeset
494 /* autodiscover stun and relays */
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 24986
diff changeset
495 jabber_google_send_jingle_info(js);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 24986
diff changeset
496 } else {
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 24986
diff changeset
497 /* TODO: add external service discovery here... */
15522
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15373
diff changeset
498 }
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
499 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
500
17362
48aebb50a93d whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 15822
diff changeset
501 for (child = xmlnode_get_child(query, "feature"); child;
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
502 child = xmlnode_get_next_twin(child)) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
503 const char *var;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
504 var = xmlnode_get_attrib(child, "var");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
505 if (!var)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
506 continue;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
507
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
508 if (!strcmp("google:mail:notify", var)) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
509 js->server_caps |= JABBER_CAP_GMAIL_NOTIFY;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
510 jabber_gmail_init(js);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
511 } else if (!strcmp("google:roster", var)) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
512 js->server_caps |= JABBER_CAP_GOOGLE_ROSTER;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
513 jabber_google_roster_init(js);
17883
9a19c46adf66 The server's ad-hoc commands are now listed in the account's action menu. Note that this requires an additional field in the _PurplePluginAction struct. There's no other way, since there was no way to supply user_data, and dynamically created functions are not supported by C. This should be fine, since that struct is only malloced in purple_plugin_action_new, which is part of the core. Applications have to either pass the struct unmodified, or restore the user_data pointer if the action is recreated when necessary (as is the case in Adium).
Andreas Monitzer <pidgin@monitzer.com>
parents: 17882
diff changeset
514 } else if (!strcmp("http://jabber.org/protocol/commands", var)) {
9a19c46adf66 The server's ad-hoc commands are now listed in the account's action menu. Note that this requires an additional field in the _PurplePluginAction struct. There's no other way, since there was no way to supply user_data, and dynamically created functions are not supported by C. This should be fine, since that struct is only malloced in purple_plugin_action_new, which is part of the core. Applications have to either pass the struct unmodified, or restore the user_data pointer if the action is recreated when necessary (as is the case in Adium).
Andreas Monitzer <pidgin@monitzer.com>
parents: 17882
diff changeset
515 js->server_caps |= JABBER_CAP_ADHOC;
24855
0700833f0c5d Commit patch #7670: Implement xep-0191 (simple blocking) for jabber protocols
Mark Doliner <mark@kingant.net>
parents: 23600
diff changeset
516 } else if (!strcmp("urn:xmpp:blocking", var)) {
0700833f0c5d Commit patch #7670: Implement xep-0191 (simple blocking) for jabber protocols
Mark Doliner <mark@kingant.net>
parents: 23600
diff changeset
517 js->server_caps |= JABBER_CAP_BLOCKING;
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
518 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
519 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
520
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
521 jabber_disco_finish_server_info_result_cb(js);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
522 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
523
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
524 static void
26465
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
525 jabber_disco_server_items_result_cb(JabberStream *js, const char *from,
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
526 JabberIqType type, const char *id,
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
527 xmlnode *packet, gpointer data)
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
528 {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
529 xmlnode *query, *child;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
530
26465
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
531 if (!from || strcmp(from, js->user->domain) != 0)
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
532 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
533
26465
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25979
diff changeset
534 if (type == JABBER_IQ_ERROR)
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
535 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
536
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
537 while(js->chat_servers) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
538 g_free(js->chat_servers->data);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
539 js->chat_servers = g_list_delete_link(js->chat_servers, js->chat_servers);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
540 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
541
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
542 query = xmlnode_get_child(packet, "query");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
543
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
544 for(child = xmlnode_get_child(query, "item"); child;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
545 child = xmlnode_get_next_twin(child)) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
546 JabberIq *iq;
17364
d42de194a364 skip some unneeded queries that we don't particularly need or want
Nathan Walp <nwalp@pidgin.im>
parents: 17362
diff changeset
547 const char *jid, *node;
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
548
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
549 if(!(jid = xmlnode_get_attrib(child, "jid")))
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
550 continue;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
551
17364
d42de194a364 skip some unneeded queries that we don't particularly need or want
Nathan Walp <nwalp@pidgin.im>
parents: 17362
diff changeset
552 /* we don't actually care about the specific nodes,
d42de194a364 skip some unneeded queries that we don't particularly need or want
Nathan Walp <nwalp@pidgin.im>
parents: 17362
diff changeset
553 * so we won't query them */
d42de194a364 skip some unneeded queries that we don't particularly need or want
Nathan Walp <nwalp@pidgin.im>
parents: 17362
diff changeset
554 if((node = xmlnode_get_attrib(child, "node")))
d42de194a364 skip some unneeded queries that we don't particularly need or want
Nathan Walp <nwalp@pidgin.im>
parents: 17362
diff changeset
555 continue;
d42de194a364 skip some unneeded queries that we don't particularly need or want
Nathan Walp <nwalp@pidgin.im>
parents: 17362
diff changeset
556
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
557 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
558 xmlnode_set_attrib(iq->node, "to", jid);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
559 jabber_iq_send(iq);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
560 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
561 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
562
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
563 void jabber_disco_items_server(JabberStream *js)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
564 {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
565 JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_GET,
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
566 "http://jabber.org/protocol/disco#items");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
567
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
568 xmlnode_set_attrib(iq->node, "to", js->user->domain);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
569
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
570 jabber_iq_set_callback(iq, jabber_disco_server_items_result_cb, NULL);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
571 jabber_iq_send(iq);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
572
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: 19697
diff changeset
573 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
574 xmlnode_set_attrib(iq->node, "to", js->user->domain);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
575 jabber_iq_set_callback(iq, jabber_disco_server_info_result_cb, NULL);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
576 jabber_iq_send(iq);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
577 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
578
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
579 void jabber_disco_info_do(JabberStream *js, const char *who, JabberDiscoInfoCallback *callback, gpointer data)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
580 {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
581 JabberID *jid;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
582 JabberBuddy *jb;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
583 JabberBuddyResource *jbr = NULL;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
584 struct _jabber_disco_info_cb_data *jdicd;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
585 JabberIq *iq;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
586
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
587 if((jid = jabber_id_new(who))) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
588 if(jid->resource && (jb = jabber_buddy_find(js, who, TRUE)))
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
589 jbr = jabber_buddy_find_resource(jb, jid->resource);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
590 jabber_id_free(jid);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
591 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
592
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
593 if(jbr && jbr->capabilities & JABBER_CAP_RETRIEVED) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
594 callback(js, who, jbr->capabilities, data);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
595 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
596 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
597
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
598 jdicd = g_new0(struct _jabber_disco_info_cb_data, 1);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
599 jdicd->data = data;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
600 jdicd->callback = callback;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
601
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
602 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
603 xmlnode_set_attrib(iq->node, "to", who);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
604
26598
1df3579a974b Split the jabber_disco_info_do IQ callback from the IQ handler and use the IQ callback semantics.
Paul Aurich <paul@darkrain42.org>
parents: 26596
diff changeset
605 jabber_iq_set_callback(iq, jabber_disco_info_cb, jdicd);
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
606 jabber_iq_send(iq);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
607 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
608
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
609 static void
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
610 jabber_disco_list_data_destroy(struct jabber_disco_list_data *data)
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
611 {
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
612 g_free(data->server);
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
613 g_free(data);
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
614 }
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
615
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
616 static void
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
617 disco_proto_data_destroy_cb(PurpleDiscoList *list)
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
618 {
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
619 struct jabber_disco_list_data *data;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
620
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
621 data = purple_disco_list_get_protocol_data(list);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
622 jabber_disco_list_data_destroy(data);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
623 }
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
624
26260
d6b2944f04b3 s/category/type/ and s/muc/chat/ in the core and gateway type is a string.
Paul Aurich <paul@darkrain42.org>
parents: 26259
diff changeset
625 static PurpleDiscoServiceType
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
626 jabber_disco_category_from_string(const gchar *str)
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
627 {
26260
d6b2944f04b3 s/category/type/ and s/muc/chat/ in the core and gateway type is a string.
Paul Aurich <paul@darkrain42.org>
parents: 26259
diff changeset
628 if (!g_ascii_strcasecmp(str, "gateway"))
d6b2944f04b3 s/category/type/ and s/muc/chat/ in the core and gateway type is a string.
Paul Aurich <paul@darkrain42.org>
parents: 26259
diff changeset
629 return PURPLE_DISCO_SERVICE_TYPE_GATEWAY;
d6b2944f04b3 s/category/type/ and s/muc/chat/ in the core and gateway type is a string.
Paul Aurich <paul@darkrain42.org>
parents: 26259
diff changeset
630 else if (!g_ascii_strcasecmp(str, "directory"))
d6b2944f04b3 s/category/type/ and s/muc/chat/ in the core and gateway type is a string.
Paul Aurich <paul@darkrain42.org>
parents: 26259
diff changeset
631 return PURPLE_DISCO_SERVICE_TYPE_DIRECTORY;
d6b2944f04b3 s/category/type/ and s/muc/chat/ in the core and gateway type is a string.
Paul Aurich <paul@darkrain42.org>
parents: 26259
diff changeset
632 else if (!g_ascii_strcasecmp(str, "conference"))
d6b2944f04b3 s/category/type/ and s/muc/chat/ in the core and gateway type is a string.
Paul Aurich <paul@darkrain42.org>
parents: 26259
diff changeset
633 return PURPLE_DISCO_SERVICE_TYPE_CHAT;
15373
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
634
26260
d6b2944f04b3 s/category/type/ and s/muc/chat/ in the core and gateway type is a string.
Paul Aurich <paul@darkrain42.org>
parents: 26259
diff changeset
635 return PURPLE_DISCO_SERVICE_TYPE_OTHER;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
636 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
637
26603
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
638 static struct {
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
639 const char *from;
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
640 const char *to;
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
641 } disco_type_mappings[] = {
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
642 { "gadu-gadu", "gg" },
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
643 { "sametime", "meanwhile" },
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
644 { "myspaceim", "myspace" },
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
645 { "xmpp", "jabber" },
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
646 { NULL, NULL }
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
647 };
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
648
26260
d6b2944f04b3 s/category/type/ and s/muc/chat/ in the core and gateway type is a string.
Paul Aurich <paul@darkrain42.org>
parents: 26259
diff changeset
649 static const gchar *
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
650 jabber_disco_type_from_string(const gchar *str)
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
651 {
26603
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
652 int i = 0;
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
653
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
654 g_return_val_if_fail(str != NULL, "");
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
655
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
656 for ( ; disco_type_mappings[i].from; ++i) {
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
657 if (!strcasecmp(str, disco_type_mappings[i].from))
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
658 return disco_type_mappings[i].to;
6b3a23ecbb42 Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents: 26602
diff changeset
659 }
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
660
26260
d6b2944f04b3 s/category/type/ and s/muc/chat/ in the core and gateway type is a string.
Paul Aurich <paul@darkrain42.org>
parents: 26259
diff changeset
661 /* fallback to the string itself */
d6b2944f04b3 s/category/type/ and s/muc/chat/ in the core and gateway type is a string.
Paul Aurich <paul@darkrain42.org>
parents: 26259
diff changeset
662 return str;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
663 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
664
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
665 static void
26595
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
666 jabber_disco_service_info_cb(JabberStream *js, const char *from,
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
667 JabberIqType type, const char *id,
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
668 xmlnode *packet, gpointer data);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
669
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
670 static void
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
671 jabber_disco_service_items_cb(JabberStream *js, const char *who, const char *node,
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
672 GSList *items, gpointer data)
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
673 {
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
674 GSList *l;
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
675 struct _disco_data *disco_data;
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
676 struct jabber_disco_list_data *list_data;
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
677 PurpleDiscoList *list;
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
678 PurpleDiscoService *parent;
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
679 const char *parent_node;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
680 gboolean has_items = FALSE;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
681
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
682 disco_data = data;
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
683 list_data = disco_data->list_data;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
684 list = list_data->list;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
685
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
686 --list_data->fetch_count;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
687
26256
cda9031ecabc Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents: 26255
diff changeset
688 if (list_data->list == NULL) {
cda9031ecabc Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents: 26255
diff changeset
689 if (list_data->fetch_count == 0)
cda9031ecabc Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents: 26255
diff changeset
690 jabber_disco_list_data_destroy(list_data);
cda9031ecabc Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents: 26255
diff changeset
691
cda9031ecabc Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents: 26255
diff changeset
692 return;
cda9031ecabc Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents: 26255
diff changeset
693 }
cda9031ecabc Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents: 26255
diff changeset
694
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
695 if (items == NULL) {
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
696 if (list_data->fetch_count == 0)
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
697 purple_disco_list_set_in_progress(list, FALSE);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
698
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
699 purple_disco_list_unref(list);
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
700 return;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
701 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
702
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
703 parent = disco_data->parent;
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
704 parent_node = disco_data->node;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
705
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
706 for (l = items; l; l = l->next) {
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
707 JabberDiscoItem *item = l->data;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
708 JabberIq *iq;
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
709 struct _disco_data *req_data;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
710 char *full_node;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
711
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
712 if (parent_node) {
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
713 if (item->node) {
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
714 full_node = g_strdup_printf("%s/%s", parent_node, item->node);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
715 } else {
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
716 continue;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
717 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
718 } else {
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
719 full_node = g_strdup(item->node);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
720 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
721
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
722 req_data = g_new0(struct _disco_data, 1);
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
723 req_data->list_data = list_data;
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
724 req_data->parent = parent;
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
725 req_data->node = full_node;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
726
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
727 has_items = TRUE;
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
728
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
729 ++list_data->fetch_count;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
730 purple_disco_list_ref(list);
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
731
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
732 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
733 xmlnode_set_attrib(iq->node, "to", item->jid);
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
734 if (full_node)
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
735 xmlnode_set_attrib(xmlnode_get_child(iq->node, "query"),
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
736 "node", full_node);
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
737 jabber_iq_set_callback(iq, jabber_disco_service_info_cb, req_data);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
738
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
739 jabber_iq_send(iq);
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
740 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
741
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
742 g_slist_foreach(items, (GFunc)jabber_disco_item_free, NULL);
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
743 g_slist_free(items);
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
744
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
745 if (list_data->fetch_count == 0)
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
746 purple_disco_list_set_in_progress(list, FALSE);
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
747
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
748 purple_disco_list_unref(list);
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
749
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
750 g_free(disco_data->node);
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
751 g_free(disco_data);
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
752 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
753
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
754 static void
26595
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
755 jabber_disco_service_info_cb(JabberStream *js, const char *from,
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
756 JabberIqType type, const char *id,
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
757 xmlnode *packet, gpointer data)
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
758 {
26599
f1dd84b4964e Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents: 26598
diff changeset
759 struct _disco_data *disco_data;
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
760 struct jabber_disco_list_data *list_data;
26601
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
761 xmlnode *query, *identity, *child;
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
762 const char *anode;
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
763 char *aname, *node;
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
764
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
765 PurpleDiscoList *list;
26601
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
766 PurpleDiscoService *parent, *service;
26595
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
767 PurpleDiscoServiceType service_type;
26599
f1dd84b4964e Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents: 26598
diff changeset
768 PurpleDiscoServiceFlags flags;
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
769 struct jabber_disco_service_data *service_data;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
770
26599
f1dd84b4964e Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents: 26598
diff changeset
771 disco_data = data;
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
772 list_data = disco_data->list_data;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
773 list = list_data->list;
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
774 parent = disco_data->parent;
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
775
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
776 node = disco_data->node;
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
777 disco_data->node = NULL;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
778 g_free(disco_data);
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
779
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
780 --list_data->fetch_count;
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
781
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
782 if (!purple_disco_list_get_in_progress(list)) {
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
783 purple_disco_list_unref(list);
26256
cda9031ecabc Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents: 26255
diff changeset
784 return;
cda9031ecabc Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents: 26255
diff changeset
785 }
cda9031ecabc Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents: 26255
diff changeset
786
26595
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
787 if (!from || type == JABBER_IQ_ERROR
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
788 || (!(query = xmlnode_get_child(packet, "query")))
26599
f1dd84b4964e Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents: 26598
diff changeset
789 || (!(identity = xmlnode_get_child(query, "identity")))) {
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
790 if (list_data->fetch_count == 0)
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
791 purple_disco_list_set_in_progress(list, FALSE);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
792
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
793 purple_disco_list_unref(list);
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
794 return;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
795 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
796
26601
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
797 service_type = jabber_disco_category_from_string(
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
798 xmlnode_get_attrib(identity, "category"));
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
799
26599
f1dd84b4964e Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents: 26598
diff changeset
800 /* Default to allowing things to be add-able */
f1dd84b4964e Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents: 26598
diff changeset
801 flags = PURPLE_DISCO_ADD;
f1dd84b4964e Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents: 26598
diff changeset
802
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
803 for (child = xmlnode_get_child(query, "feature"); child;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
804 child = xmlnode_get_next_twin(child)) {
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
805 const char *var;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
806
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
807 if (!(var = xmlnode_get_attrib(child, "var")))
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
808 continue;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
809
26599
f1dd84b4964e Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents: 26598
diff changeset
810 if (g_str_equal(var, "jabber:iq:register"))
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
811 flags |= PURPLE_DISCO_REGISTER;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
812
26599
f1dd84b4964e Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents: 26598
diff changeset
813 if (g_str_equal(var, "http://jabber.org/protocol/disco#items"))
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
814 flags |= PURPLE_DISCO_BROWSE;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
815
26605
217a3ad87fc4 Discovered why that default assumption of PURPLE_DISCO_BROWSE was in there...
Paul Aurich <paul@darkrain42.org>
parents: 26604
diff changeset
816 if (g_str_equal(var, "http://jabber.org/protocol/muc")) {
217a3ad87fc4 Discovered why that default assumption of PURPLE_DISCO_BROWSE was in there...
Paul Aurich <paul@darkrain42.org>
parents: 26604
diff changeset
817 flags |= PURPLE_DISCO_BROWSE;
26595
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
818 service_type = PURPLE_DISCO_SERVICE_TYPE_CHAT;
26605
217a3ad87fc4 Discovered why that default assumption of PURPLE_DISCO_BROWSE was in there...
Paul Aurich <paul@darkrain42.org>
parents: 26604
diff changeset
819 }
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
820 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
821
26601
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
822 if ((anode = xmlnode_get_attrib(query, "node")))
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
823 aname = g_strdup_printf("%s%s", from, anode);
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
824 else
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
825 aname = g_strdup(from);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
826
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
827 service_data = g_new0(struct jabber_disco_service_data, 1);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
828 service_data->jid = g_strdup(from);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
829 if (anode)
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
830 service_data->node = g_strdup(anode);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
831
26601
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
832 service = purple_disco_list_service_new(service_type, aname,
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
833 xmlnode_get_attrib(identity, "name"), flags, service_data);
26601
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
834 g_free(aname);
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
835
26595
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
836 if (service_type == PURPLE_DISCO_SERVICE_TYPE_GATEWAY)
26601
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
837 purple_disco_service_set_gateway_type(service,
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
838 jabber_disco_type_from_string(xmlnode_get_attrib(identity,
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
839 "type")));
26260
d6b2944f04b3 s/category/type/ and s/muc/chat/ in the core and gateway type is a string.
Paul Aurich <paul@darkrain42.org>
parents: 26259
diff changeset
840
26601
31c240da2cd3 More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents: 26599
diff changeset
841 purple_disco_list_service_add(list, service, parent);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
842
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
843 if (list_data->fetch_count == 0)
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
844 purple_disco_list_set_in_progress(list, FALSE);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
845
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
846 purple_disco_list_unref(list);
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
847
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
848 g_free(node);
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
849 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
850
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
851 static void
26595
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
852 jabber_disco_server_items_cb(JabberStream *js, const char *from,
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
853 JabberIqType type, const char *id,
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
854 xmlnode *packet, gpointer data)
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
855 {
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
856 struct jabber_disco_list_data *list_data;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
857 xmlnode *query, *child;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
858 gboolean has_items = FALSE;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
859
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
860 list_data = data;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
861 --list_data->fetch_count;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
862
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
863 if (!from || type == JABBER_IQ_ERROR ||
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
864 !purple_disco_list_get_in_progress(list_data->list)) {
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
865 purple_disco_list_unref(list_data->list);
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
866 return;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
867 }
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
868
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
869 query = xmlnode_get_child(packet, "query");
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
870
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
871 for(child = xmlnode_get_child(query, "item"); child;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
872 child = xmlnode_get_next_twin(child)) {
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
873 JabberIq *iq;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
874 const char *jid;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
875 struct _disco_data *disco_data;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
876
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
877 if(!(jid = xmlnode_get_attrib(child, "jid")))
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
878 continue;
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
879
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
880 disco_data = g_new0(struct _disco_data, 1);
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
881 disco_data->list_data = list_data;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
882
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
883 has_items = TRUE;
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
884 ++list_data->fetch_count;
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
885 purple_disco_list_ref(list_data->list);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
886 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info");
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
887 xmlnode_set_attrib(iq->node, "to", jid);
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
888 jabber_iq_set_callback(iq, jabber_disco_service_info_cb, disco_data);
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
889
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
890 jabber_iq_send(iq);
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
891 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
892
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
893 if (!has_items)
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
894 purple_disco_list_set_in_progress(list_data->list, FALSE);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
895
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
896 purple_disco_list_unref(list_data->list);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
897 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
898
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
899 static void
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
900 jabber_disco_server_info_cb(JabberStream *js, const char *who, JabberCapabilities caps, gpointer data)
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
901 {
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
902 struct jabber_disco_list_data *list_data;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
903
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
904 list_data = data;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
905 --list_data->fetch_count;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
906
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
907 if (!list_data->list) {
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
908 purple_disco_list_unref(list_data->list);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
909
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
910 if (list_data->fetch_count == 0)
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
911 jabber_disco_list_data_destroy(list_data);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
912
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
913 return;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
914 }
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
915
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
916 if (caps & JABBER_CAP_ITEMS) {
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
917 JabberIq *iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
918 xmlnode_set_attrib(iq->node, "to", who);
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
919 jabber_iq_set_callback(iq, jabber_disco_server_items_cb, list_data);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
920
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
921 ++list_data->fetch_count;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
922 purple_disco_list_ref(list_data->list);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
923
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
924 jabber_iq_send(iq);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
925 } else {
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
926 purple_notify_error(NULL, _("Error"), _("Server doesn't support service discovery"), NULL);
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
927 purple_disco_list_set_in_progress(list_data->list, FALSE);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
928 }
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
929
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
930 purple_disco_list_unref(list_data->list);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
931 }
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
932
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
933 static void discolist_cancel_cb(struct jabber_disco_list_data *list_data, const char *server)
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
934 {
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
935 purple_disco_list_set_in_progress(list_data->list, FALSE);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
936 purple_disco_list_unref(list_data->list);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
937 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
938
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
939 static void discolist_ok_cb(struct jabber_disco_list_data *list_data, const char *server)
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
940 {
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
941 JabberStream *js;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
942
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
943 js = list_data->js;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
944
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
945 if (!server || !*server) {
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
946 purple_notify_error(js->gc, _("Invalid Server"), _("Invalid Server"), NULL);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
947
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
948 purple_disco_list_set_in_progress(list_data->list, FALSE);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
949 purple_disco_list_unref(list_data->list);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
950 return;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
951 }
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
952
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
953 list_data->server = g_strdup(server);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
954 if (js->last_disco_server)
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
955 g_free(js->last_disco_server);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
956 js->last_disco_server = g_strdup(server);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
957
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
958 purple_disco_list_set_in_progress(list_data->list, TRUE);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
959
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
960 ++list_data->fetch_count;
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
961 jabber_disco_info_do(js, list_data->server, jabber_disco_server_info_cb, list_data);
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
962 }
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
963
26596
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
964 static void
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
965 jabber_disco_service_close(PurpleDiscoService *service)
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
966 {
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
967 struct jabber_disco_service_data *data;
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
968
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
969 data = purple_disco_service_get_protocol_data(service);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
970 g_free(data->jid);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
971 g_free(data->node);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
972 g_free(data);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
973 }
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
974
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
975 #if 0
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
976 static void
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
977 jabber_disco_cancel(PurpleDiscoList *list)
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
978 {
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
979 /* This space intentionally letft blank */
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
980 }
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
981 #endif
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
982
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
983 static void
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
984 jabber_disco_list_expand(PurpleDiscoList *list, PurpleDiscoService *service)
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
985 {
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
986 PurpleAccount *account;
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
987 PurpleConnection *pc;
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
988 JabberStream *js;
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
989 struct jabber_disco_list_data *list_data;
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
990 struct jabber_disco_service_data *service_data;
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
991 struct _disco_data *disco_data;
26254
c619bef09bec Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents: 26253
diff changeset
992
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
993 account = purple_disco_list_get_account(list);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
994 pc = purple_account_get_connection(account);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
995 js = purple_connection_get_protocol_data(pc);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
996
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
997 list_data = purple_disco_list_get_protocol_data(list);
26256
cda9031ecabc Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents: 26255
diff changeset
998
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
999 ++list_data->fetch_count;
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1000 purple_disco_list_ref(list);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1001 disco_data = g_new0(struct _disco_data, 1);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1002 disco_data->list_data = list_data;
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1003 disco_data->parent = service;
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1004
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1005 service_data = purple_disco_service_get_protocol_data(service);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1006
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1007 jabber_disco_items_do(js, service_data->jid, service_data->node,
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1008 jabber_disco_service_items_cb, disco_data);
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
1009 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
1010
26596
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1011 static void
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
1012 jabber_disco_service_register(PurpleConnection *gc, PurpleDiscoService *service)
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
1013 {
26252
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
1014 JabberStream *js = purple_connection_get_protocol_data(gc);
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
1015
535c866b433c Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents: 26250
diff changeset
1016 jabber_register_gateway(js, purple_disco_service_get_name(service));
26596
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1017 }
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
1018
26596
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1019
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1020 PurpleDiscoList *
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1021 jabber_disco_get_list(PurpleConnection *gc)
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1022 {
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1023 PurpleAccount *account;
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1024 PurpleDiscoList *list;
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1025 JabberStream *js;
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1026 struct jabber_disco_list_data *disco_list_data;
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1027
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1028 account = purple_connection_get_account(gc);
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1029 js = purple_connection_get_protocol_data(gc);
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1030
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1031 /* We start with a ref */
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1032 list = purple_disco_list_new(account);
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1033
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1034 disco_list_data = g_new0(struct jabber_disco_list_data, 1);
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1035 disco_list_data->list = list;
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1036 disco_list_data->js = js;
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1037 purple_disco_list_set_protocol_data(list, disco_list_data,
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1038 disco_proto_data_destroy_cb);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1039 purple_disco_list_set_service_close_func(list, jabber_disco_service_close);
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1040 #if 0
26596
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1041 purple_disco_list_set_cancel_func(list, jabber_disco_cancel);
26604
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1042 #endif
ff33b65b2448 Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents: 26603
diff changeset
1043 purple_disco_list_set_expand_func(list, jabber_disco_list_expand);
26596
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1044 purple_disco_list_set_register_func(list, jabber_disco_service_register);
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1045
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1046 purple_request_input(gc, _("Server name request"), _("Enter an XMPP Server"),
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1047 _("Select an XMPP server to query"),
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1048 js->last_disco_server ? js->last_disco_server : js->user->domain,
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1049 FALSE, FALSE, NULL,
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1050 _("Find Services"), PURPLE_CALLBACK(discolist_ok_cb),
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1051 _("Cancel"), PURPLE_CALLBACK(discolist_cancel_cb),
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1052 account, NULL, NULL, disco_list_data);
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1053
1de01f9594c8 Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents: 26595
diff changeset
1054 return list;
26247
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
1055 }
f5e613e05332 Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents: 25952
diff changeset
1056
26258
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1057 static void
26595
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
1058 jabber_disco_items_cb(JabberStream *js, const char *from, JabberIqType type,
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
1059 const char *id, xmlnode *packet, gpointer data)
26258
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1060 {
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1061 struct _jabber_disco_items_cb_data *jdicd;
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1062 xmlnode *query, *child;
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
1063 const char *node = NULL;
26258
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1064 GSList *items = NULL;
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1065
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1066 jdicd = data;
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1067
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1068 query = xmlnode_get_child(packet, "query");
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1069
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
1070 if (query)
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
1071 node = xmlnode_get_attrib(query, "node");
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
1072
26595
30221bc3da0e Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents: 26593
diff changeset
1073 if (!from || !query || type == JABBER_IQ_ERROR) {
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
1074 jdicd->callback(js, from, node, NULL, jdicd->data);
26258
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1075 g_free(jdicd);
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1076 return;
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1077 }
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1078
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1079 for (child = xmlnode_get_child(query, "item"); child;
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1080 child = xmlnode_get_next_twin(child)) {
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1081 JabberDiscoItem *item;
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1082
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1083 item = g_new0(JabberDiscoItem, 1);
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1084 item->jid = g_strdup(xmlnode_get_attrib(child, "jid"));
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1085 item->node = g_strdup(xmlnode_get_attrib(child, "node"));
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1086 item->name = g_strdup(xmlnode_get_attrib(child, "name"));
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1087
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1088 items = g_slist_prepend(items, item);
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1089 }
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1090
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1091 items = g_slist_reverse(items);
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
1092 jdicd->callback(js, from, node, items, jdicd->data);
26258
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1093 g_free(jdicd);
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1094 }
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1095
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
1096 void jabber_disco_items_do(JabberStream *js, const char *who, const char *node,
26258
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1097 JabberDiscoItemsCallback *callback, gpointer data)
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1098 {
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1099 struct _jabber_disco_items_cb_data *jdicd;
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1100 JabberIq *iq;
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1101
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1102 jdicd = g_new0(struct _jabber_disco_items_cb_data, 1);
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1103 jdicd->data = data;
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1104 jdicd->callback = callback;
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1105
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1106 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");
26259
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
1107 if (node)
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
1108 xmlnode_set_attrib(xmlnode_get_child(iq->node, "query"), "node", node);
9d0bad6f4b0d Add a node parameter to jabber_disco_items_do and use it in the new disco-listing code.
Paul Aurich <paul@darkrain42.org>
parents: 26258
diff changeset
1109
26258
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1110 xmlnode_set_attrib(iq->node, "to", who);
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1111
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1112 jabber_iq_set_callback(iq, jabber_disco_items_cb, jdicd);
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1113 jabber_iq_send(iq);
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1114 }
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1115
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1116 void jabber_disco_item_free(JabberDiscoItem *item)
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1117 {
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1118 g_free((char *)item->jid);
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1119 g_free((char *)item->node);
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1120 g_free((char *)item->name);
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1121 g_free(item);
b5fe3f47487b jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents: 26257
diff changeset
1122 }