Mercurial > pidgin
annotate libpurple/protocols/jabber/disco.c @ 26971:58ff88dba33a
Fix merge.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Wed, 29 Apr 2009 23:23:51 +0000 |
parents | 413006df9828 |
children | 55e96ee47d0a |
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" |
26971 | 25 #include "request.h" |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
26 |
25353
9195955395b6
Only (re)publish XMPP avatars at login if the server's avatar differs
Paul Aurich <paul@darkrain42.org>
parents:
24855
diff
changeset
|
27 #include "adhoccommands.h" |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
28 #include "buddy.h" |
25353
9195955395b6
Only (re)publish XMPP avatars at login if the server's avatar differs
Paul Aurich <paul@darkrain42.org>
parents:
24855
diff
changeset
|
29 #include "disco.h" |
15373
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 "jabber.h" |
24938
bd598b606ca4
Restructure Jingle code to more easily support multiple application types.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
23867
diff
changeset
|
33 #include "jingle/jingle.h" |
25353
9195955395b6
Only (re)publish XMPP avatars at login if the server's avatar differs
Paul Aurich <paul@darkrain42.org>
parents:
24855
diff
changeset
|
34 #include "pep.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" |
25353
9195955395b6
Only (re)publish XMPP avatars at login if the server's avatar differs
Paul Aurich <paul@darkrain42.org>
parents:
24855
diff
changeset
|
37 #include "useravatar.h" |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
38 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
39 struct _jabber_disco_info_cb_data { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
40 gpointer data; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
41 JabberDiscoInfoCallback *callback; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
42 }; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
43 |
26258
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
44 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
|
45 gpointer data; |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
46 JabberDiscoItemsCallback *callback; |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
47 }; |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
48 |
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
|
49 #define SUPPORT_FEATURE(x) { \ |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
50 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
|
51 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
|
52 } |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
53 |
26252
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
54 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
|
55 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
|
56 PurpleDiscoList *list; |
26252
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
57 char *server; |
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
58 int fetch_count; |
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
59 }; |
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
60 |
26604
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
61 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
|
62 char *jid; |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
63 char *node; |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
64 }; |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
65 |
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
|
66 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
|
67 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
|
68 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
|
69 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
|
70 { |
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
|
71 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
|
72 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
|
73 "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
|
74 |
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 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
|
76 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
|
77 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
|
78 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
|
79 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
|
80 |
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 |
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 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
|
83 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
|
84 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
|
85 |
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 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
|
87 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
|
88 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
|
89 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
|
90 } |
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 } |
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 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
|
94 "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
|
95 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
|
96 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
|
97 |
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
98 /* 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
|
99 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
|
100 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
|
101 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
|
102 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
|
103 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
|
104 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
|
105 } |
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
|
106 } |
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
|
107 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
108 |
25648
050052891c55
Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents:
25638
diff
changeset
|
109 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
|
110 JabberIqType type, const char *id, |
26487
bc7fac8e2f79
propagate from branch 'im.pidgin.pidgin' (head f144c6bda9daf701aa891c875fce7a4dedd611ae)
Paul Aurich <paul@darkrain42.org>
diff
changeset
|
111 xmlnode *in_query) |
bc7fac8e2f79
propagate from branch 'im.pidgin.pidgin' (head f144c6bda9daf701aa891c875fce7a4dedd611ae)
Paul Aurich <paul@darkrain42.org>
diff
changeset
|
112 { |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
113 |
25648
050052891c55
Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents:
25638
diff
changeset
|
114 if(!from) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
115 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
116 |
25648
050052891c55
Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents:
25638
diff
changeset
|
117 if(type == JABBER_IQ_GET) { |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
118 xmlnode *query, *identity, *feature; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
119 JabberIq *iq; |
25648
050052891c55
Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents:
25638
diff
changeset
|
120 const char *node = xmlnode_get_attrib(in_query, "node"); |
26487
bc7fac8e2f79
propagate from branch 'im.pidgin.pidgin' (head f144c6bda9daf701aa891c875fce7a4dedd611ae)
Paul Aurich <paul@darkrain42.org>
diff
changeset
|
121 char *node_uri = NULL; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
122 |
25164
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25147
diff
changeset
|
123 /* create custom caps node URI */ |
25146
4040da08a733
Entity Capabilities must be per-JabberStream
Paul Aurich <paul@darkrain42.org>
parents:
25145
diff
changeset
|
124 node_uri = g_strconcat(CAPS0115_NODE, "#", jabber_caps_get_own_hash(js), NULL); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
125 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
126 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
|
127 "http://jabber.org/protocol/disco#info"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
128 |
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
|
129 jabber_iq_set_id(iq, id); |
15373
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 xmlnode_set_attrib(iq->node, "to", from); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
132 query = xmlnode_get_child(iq->node, "query"); |
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) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
135 xmlnode_set_attrib(query, "node", node); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
136 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
137 if(!node || !strcmp(node, CAPS0115_NODE "#" VERSION)) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
138 identity = xmlnode_new_child(query, "identity"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
139 xmlnode_set_attrib(identity, "category", "client"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
140 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
|
141 * handheld, pc, phone, |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
142 * web */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
143 xmlnode_set_attrib(identity, "name", PACKAGE); |
25986
2597de135090
Fix up merge (why can't it simply make the changes to my WD first?)
Paul Aurich <paul@darkrain42.org>
parents:
25985
diff
changeset
|
144 } |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
145 |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
146 if(!node || !strcmp(node, node_uri)) { |
25145
1225f3dcf5ab
Fix compilation errors and many warnings
Paul Aurich <paul@darkrain42.org>
parents:
25124
diff
changeset
|
147 GList *features, *identities; |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
148 for(identities = jabber_identities; identities; identities = identities->next) { |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
149 JabberIdentity *ident = (JabberIdentity*)identities->data; |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
150 identity = xmlnode_new_child(query, "identity"); |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
151 xmlnode_set_attrib(identity, "category", ident->category); |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
152 xmlnode_set_attrib(identity, "type", ident->type); |
25164
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25147
diff
changeset
|
153 if (ident->lang) |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25147
diff
changeset
|
154 xmlnode_set_attrib(identity, "xml:lang", ident->lang); |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25147
diff
changeset
|
155 if (ident->name) |
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25147
diff
changeset
|
156 xmlnode_set_attrib(identity, "name", ident->name); |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
157 } |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
158 for(features = jabber_features; features; features = features->next) { |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
159 JabberFeature *feat = (JabberFeature*)features->data; |
25164
f462fa160f06
Sprinkle around more support for xml:lang on JabberIdentities
Paul Aurich <paul@darkrain42.org>
parents:
25147
diff
changeset
|
160 if (!feat->is_enabled || feat->is_enabled(js, feat->namespace)) { |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
161 feature = xmlnode_new_child(query, "feature"); |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
162 xmlnode_set_attrib(feature, "var", 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
|
163 } |
b0733d5d7621
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18685
diff
changeset
|
164 } |
23814
d0ac3c438b71
Check remote JID's capabilities for audio and video XEP support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
23787
diff
changeset
|
165 #ifdef USE_VV |
26457
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26447
diff
changeset
|
166 } else if (g_str_equal(node, CAPS0115_NODE "#" "voice-v1")) { |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26447
diff
changeset
|
167 /* |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26447
diff
changeset
|
168 * HUGE HACK! We advertise this ext (see jabber_presence_create_js |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26447
diff
changeset
|
169 * where we add <c/> to the <presence/>) for the Google Talk |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26447
diff
changeset
|
170 * clients that don't actually check disco#info features. |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26447
diff
changeset
|
171 * |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26447
diff
changeset
|
172 * This specific feature is redundant but is what |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26447
diff
changeset
|
173 * node='http://mail.google.com/xmpp/client/caps', ver='1.1' |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26447
diff
changeset
|
174 * advertises as 'voice-v1'. |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26447
diff
changeset
|
175 */ |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26447
diff
changeset
|
176 xmlnode *feature = xmlnode_new_child(query, "feature"); |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26447
diff
changeset
|
177 xmlnode_set_attrib(feature, "var", "http://www.google.com/xmpp/protocol/voice/v1"); |
23814
d0ac3c438b71
Check remote JID's capabilities for audio and video XEP support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
23787
diff
changeset
|
178 #endif |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
179 } else { |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
180 xmlnode *error, *inf; |
26970
413006df9828
propagate from branch 'im.pidgin.pidgin' (head 13ac492a493b4d31c8b29905174b43a533304300)
Paul Aurich <paul@darkrain42.org>
diff
changeset
|
181 |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
182 /* XXX: gross hack, implement jabber_iq_set_type or something */ |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
183 xmlnode_set_attrib(iq->node, "type", "error"); |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
184 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
|
185 |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
186 error = xmlnode_new_child(query, "error"); |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
187 xmlnode_set_attrib(error, "code", "404"); |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
188 xmlnode_set_attrib(error, "type", "cancel"); |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
189 inf = xmlnode_new_child(error, "item-not-found"); |
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
190 xmlnode_set_namespace(inf, "urn:ietf:params:xml:ns:xmpp-stanzas"); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
191 } |
25017
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
21603
diff
changeset
|
192 g_free(node_uri); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
193 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
|
194 } 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
|
195 /* 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
|
196 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
|
197 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
|
198 |
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
|
199 /* 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
|
200 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
|
201 /* 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
|
202 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
|
203 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
|
204 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
|
205 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
|
206 |
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
|
207 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
|
208 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
|
209 |
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
|
210 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
|
211 } |
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
|
212 } |
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
|
213 |
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
|
214 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
|
215 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
|
216 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
|
217 { |
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
|
218 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
|
219 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
|
220 |
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
|
221 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
|
222 "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
|
223 |
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
|
224 if (type == JABBER_IQ_RESULT && query) { |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
225 xmlnode *child; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
226 JabberID *jid; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
227 JabberBuddy *jb; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
228 JabberBuddyResource *jbr = NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
229 JabberCapabilities capabilities = JABBER_CAP_NONE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
230 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
231 if((jid = jabber_id_new(from))) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
232 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
|
233 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
|
234 jabber_id_free(jid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
235 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
236 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
237 if(jbr) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
238 capabilities = jbr->capabilities; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
239 |
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
|
240 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
|
241 if(child->type != XMLNODE_TYPE_TAG) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
242 continue; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
243 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
244 if(!strcmp(child->name, "identity")) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
245 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
|
246 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
|
247 if(!category || !type) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
248 continue; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
249 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
250 if(!strcmp(category, "conference") && !strcmp(type, "text")) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
251 /* 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
|
252 /* 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
|
253 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
|
254 } 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
|
255 /* 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
|
256 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
|
257 } 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
|
258 /* 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
|
259 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
|
260 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
|
261 |
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
|
262 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
|
263 |
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
|
264 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
|
265 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
|
266 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
|
267 |
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
|
268 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
|
269 "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
|
270 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
|
271 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
|
272 jabber_iq_send(iq); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
273 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
274 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
275 } else if(!strcmp(child->name, "feature")) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
276 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
|
277 if(!var) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
278 continue; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
279 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
280 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
|
281 capabilities |= JABBER_CAP_SI; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
282 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
|
283 capabilities |= JABBER_CAP_SI_FILE_XFER; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
284 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
|
285 capabilities |= JABBER_CAP_BYTESTREAMS; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
286 else if(!strcmp(var, "jabber:iq:search")) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
287 capabilities |= JABBER_CAP_IQ_SEARCH; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
288 else if(!strcmp(var, "jabber:iq:register")) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
289 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
|
290 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
|
291 capabilities |= JABBER_CAP_PING; |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
292 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
|
293 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
|
294 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
|
295 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
|
296 } |
25129
b4ec5481a67a
Implements file transfers using in-band bytestreams for XMPP
Marcus Lundblad <ml@update.uu.se>
parents:
23600
diff
changeset
|
297 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
|
298 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
|
299 capabilities |= JABBER_CAP_IBB; |
b4ec5481a67a
Implements file transfers using in-band bytestreams for XMPP
Marcus Lundblad <ml@update.uu.se>
parents:
23600
diff
changeset
|
300 } |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
301 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
302 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
303 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
304 capabilities |= JABBER_CAP_RETRIEVED; |
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 if(jbr) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
307 jbr->capabilities = capabilities; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
308 |
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
|
309 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
|
310 } 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
|
311 JabberID *jid; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
312 JabberBuddy *jb; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
313 JabberBuddyResource *jbr = NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
314 JabberCapabilities capabilities = JABBER_CAP_NONE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
315 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
316 if((jid = jabber_id_new(from))) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
317 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
|
318 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
|
319 jabber_id_free(jid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
320 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
321 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
322 if(jbr) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
323 capabilities = jbr->capabilities; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
324 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
325 jdicd->callback(js, from, capabilities, jdicd->data); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
326 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
327 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
328 |
25648
050052891c55
Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents:
25638
diff
changeset
|
329 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
|
330 JabberIqType type, const char *id, |
26487
bc7fac8e2f79
propagate from branch 'im.pidgin.pidgin' (head f144c6bda9daf701aa891c875fce7a4dedd611ae)
Paul Aurich <paul@darkrain42.org>
diff
changeset
|
331 xmlnode *query) |
bc7fac8e2f79
propagate from branch 'im.pidgin.pidgin' (head f144c6bda9daf701aa891c875fce7a4dedd611ae)
Paul Aurich <paul@darkrain42.org>
diff
changeset
|
332 { |
25648
050052891c55
Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents:
25638
diff
changeset
|
333 if(type == JABBER_IQ_GET) { |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
334 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
|
335 "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
|
336 |
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
|
337 /* preserve node */ |
25648
050052891c55
Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents:
25638
diff
changeset
|
338 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
|
339 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
|
340 if(node) |
050052891c55
Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents:
25638
diff
changeset
|
341 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
|
342 |
25648
050052891c55
Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents:
25638
diff
changeset
|
343 jabber_iq_set_id(iq, id); |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
344 |
25648
050052891c55
Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents:
25638
diff
changeset
|
345 if (from) |
050052891c55
Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents:
25638
diff
changeset
|
346 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
|
347 jabber_iq_send(iq); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
348 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
349 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
350 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
351 static void |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
352 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
|
353 { |
23600
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
354 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
|
355 |
25425
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
25353
diff
changeset
|
356 /* |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
25353
diff
changeset
|
357 * This *should* happen only if the server supports vcard-temp, but there |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
25353
diff
changeset
|
358 * are apparently some servers that don't advertise it even though they |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
25353
diff
changeset
|
359 * support it. |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
25353
diff
changeset
|
360 */ |
18163
703872bf33c6
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18153
diff
changeset
|
361 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
|
362 |
25353
9195955395b6
Only (re)publish XMPP avatars at login if the server's avatar differs
Paul Aurich <paul@darkrain42.org>
parents:
24855
diff
changeset
|
363 if (js->pep) |
9195955395b6
Only (re)publish XMPP avatars at login if the server's avatar differs
Paul Aurich <paul@darkrain42.org>
parents:
24855
diff
changeset
|
364 jabber_avatar_fetch_mine(js); |
18163
703872bf33c6
server-side jabber vcards now take precedence over local vcards, so
Nathan Walp <nwalp@pidgin.im>
parents:
18153
diff
changeset
|
365 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
366 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
|
367 /* 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
|
368 jabber_roster_request(js); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
369 } |
17362 | 370 |
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
|
371 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
|
372 /* 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
|
373 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
|
374 } |
23600
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
375 |
24855
0700833f0c5d
Commit patch #7670: Implement xep-0191 (simple blocking) for jabber protocols
Mark Doliner <mark@kingant.net>
parents:
23600
diff
changeset
|
376 /* 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
|
377 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
|
378 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
|
379 } |
0700833f0c5d
Commit patch #7670: Implement xep-0191 (simple blocking) for jabber protocols
Mark Doliner <mark@kingant.net>
parents:
23600
diff
changeset
|
380 |
23600
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
381 /* 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
|
382 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
|
383 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
|
384 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
|
385 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
|
386 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
|
387 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
|
388 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
|
389 |
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
390 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
|
391 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
|
392 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
|
393 continue; |
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
394 |
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
395 /* 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
|
396 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
|
397 *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
|
398 |
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
399 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
|
400 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
|
401 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
|
402 |
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
403 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
|
404 "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
|
405 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
|
406 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
|
407 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
|
408 } |
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
409 |
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
410 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
|
411 } |
10382f1e1353
Use Service Discovery to look up information about the manually specified FT
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21603
diff
changeset
|
412 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
413 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
414 |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
415 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
|
416 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
|
417 PurpleDiscoService *parent; |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
418 char *node; |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
419 }; |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
420 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
421 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
|
422 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
|
423 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
|
424 xmlnode *packet, gpointer data) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
425 { |
17362 | 426 xmlnode *query, *child; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
427 |
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
|
428 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
|
429 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
|
430 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
431 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
432 |
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
|
433 if (type == JABBER_IQ_ERROR) { |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
434 /* 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
|
435 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
|
436 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
437 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
438 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
439 query = xmlnode_get_child(packet, "query"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
440 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
441 if (!query) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
442 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
|
443 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
444 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
445 |
17362 | 446 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
|
447 child = xmlnode_get_next_twin(child)) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
448 const char *category, *type, *name; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
449 category = xmlnode_get_attrib(child, "category"); |
17834
a75079eae085
added preliminary frame for pep-support
Andreas Monitzer <pidgin@monitzer.com>
parents:
17364
diff
changeset
|
450 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
|
451 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
|
452 js->pep = TRUE; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
453 if (!category || strcmp(category, "server")) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
454 continue; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
455 if (!type || strcmp(type, "im")) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
456 continue; |
17362 | 457 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
458 name = xmlnode_get_attrib(child, "name"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
459 if (!name) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
460 continue; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
461 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
462 g_free(js->server_name); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
463 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
|
464 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
|
465 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
|
466 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
|
467 |
88f183f7dfc7
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents:
24986
diff
changeset
|
468 /* 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
|
469 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
|
470 } else { |
88f183f7dfc7
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents:
24986
diff
changeset
|
471 /* 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
|
472 } |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
473 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
474 |
17362 | 475 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
|
476 child = xmlnode_get_next_twin(child)) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
477 const char *var; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
478 var = xmlnode_get_attrib(child, "var"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
479 if (!var) |
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 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
482 if (!strcmp("google:mail:notify", var)) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
483 js->server_caps |= JABBER_CAP_GMAIL_NOTIFY; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
484 jabber_gmail_init(js); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
485 } else if (!strcmp("google:roster", var)) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
486 js->server_caps |= JABBER_CAP_GOOGLE_ROSTER; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
487 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
|
488 } 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
|
489 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
|
490 } 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
|
491 js->server_caps |= JABBER_CAP_BLOCKING; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
492 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
493 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
494 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
495 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
|
496 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
497 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
498 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
|
499 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
|
500 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
|
501 xmlnode *packet, gpointer data) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
502 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
503 xmlnode *query, *child; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
504 |
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
|
505 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
|
506 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
507 |
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
|
508 if (type == JABBER_IQ_ERROR) |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
509 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
510 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
511 while(js->chat_servers) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
512 g_free(js->chat_servers->data); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
513 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
|
514 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
515 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
516 query = xmlnode_get_child(packet, "query"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
517 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
518 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
|
519 child = xmlnode_get_next_twin(child)) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
520 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
|
521 const char *jid, *node; |
15373
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 if(!(jid = xmlnode_get_attrib(child, "jid"))) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
524 continue; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
525 |
17364
d42de194a364
skip some unneeded queries that we don't particularly need or want
Nathan Walp <nwalp@pidgin.im>
parents:
17362
diff
changeset
|
526 /* 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
|
527 * 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
|
528 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
|
529 continue; |
d42de194a364
skip some unneeded queries that we don't particularly need or want
Nathan Walp <nwalp@pidgin.im>
parents:
17362
diff
changeset
|
530 |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
531 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
|
532 xmlnode_set_attrib(iq->node, "to", jid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
533 jabber_iq_send(iq); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
534 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
535 } |
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 void jabber_disco_items_server(JabberStream *js) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
538 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
539 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
|
540 "http://jabber.org/protocol/disco#items"); |
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 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
|
543 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
544 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
|
545 jabber_iq_send(iq); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
546 |
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
|
547 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
|
548 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
|
549 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
|
550 jabber_iq_send(iq); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
551 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
552 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
553 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
|
554 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
555 JabberID *jid; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
556 JabberBuddy *jb; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
557 JabberBuddyResource *jbr = NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
558 struct _jabber_disco_info_cb_data *jdicd; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
559 JabberIq *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 if((jid = jabber_id_new(who))) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
562 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
|
563 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
|
564 jabber_id_free(jid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
565 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
566 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
567 if(jbr && jbr->capabilities & JABBER_CAP_RETRIEVED) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
568 callback(js, who, jbr->capabilities, data); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
569 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
570 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
571 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
572 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
|
573 jdicd->data = data; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
574 jdicd->callback = callback; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
575 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
576 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
|
577 xmlnode_set_attrib(iq->node, "to", who); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
578 |
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
|
579 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
|
580 jabber_iq_send(iq); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
581 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
582 |
26252
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
583 static void |
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
584 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
|
585 { |
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
586 g_free(data->server); |
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
587 g_free(data); |
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
588 } |
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
589 |
26254
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
590 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
|
591 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
|
592 { |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
593 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
|
594 |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
595 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
|
596 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
|
597 } |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
598 |
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
|
599 static PurpleDiscoServiceType |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
600 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
|
601 { |
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
|
602 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
|
603 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
|
604 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
|
605 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
|
606 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
|
607 return PURPLE_DISCO_SERVICE_TYPE_CHAT; |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
608 |
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
|
609 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
|
610 } |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
611 |
26616
464dbfad4474
Constify the disco_type_mappings struct
Paul Aurich <paul@darkrain42.org>
parents:
26608
diff
changeset
|
612 static const struct { |
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
|
613 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
|
614 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
|
615 } 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
|
616 { "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
|
617 { "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
|
618 { "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
|
619 { "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
|
620 { 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
|
621 }; |
6b3a23ecbb42
Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents:
26602
diff
changeset
|
622 |
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
|
623 static const gchar * |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
624 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
|
625 { |
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
|
626 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
|
627 |
6b3a23ecbb42
Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents:
26602
diff
changeset
|
628 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
|
629 |
6b3a23ecbb42
Remove most of the mappings, add in the ones necessary from our prpls, and
Paul Aurich <paul@darkrain42.org>
parents:
26602
diff
changeset
|
630 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
|
631 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
|
632 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
|
633 } |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
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 /* 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
|
636 return str; |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
637 } |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
638 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
639 static void |
26595
30221bc3da0e
Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents:
26593
diff
changeset
|
640 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
|
641 JabberIqType type, const char *id, |
30221bc3da0e
Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents:
26593
diff
changeset
|
642 xmlnode *packet, gpointer data); |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
643 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
644 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
|
645 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
|
646 GSList *items, gpointer data) |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
647 { |
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
|
648 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
|
649 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
|
650 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
|
651 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
|
652 PurpleDiscoService *parent; |
26608
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
653 PurpleDiscoServiceType parent_type; |
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
|
654 const char *parent_node; |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
655 |
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
|
656 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
|
657 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
|
658 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
|
659 |
26252
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
660 --list_data->fetch_count; |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
661 |
26256
cda9031ecabc
Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents:
26255
diff
changeset
|
662 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
|
663 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
|
664 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
|
665 |
cda9031ecabc
Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents:
26255
diff
changeset
|
666 return; |
cda9031ecabc
Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents:
26255
diff
changeset
|
667 } |
cda9031ecabc
Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents:
26255
diff
changeset
|
668 |
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
|
669 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
|
670 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
|
671 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
|
672 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
673 purple_disco_list_unref(list); |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
674 return; |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
675 } |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
676 |
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
|
677 parent = disco_data->parent; |
26608
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
678 parent_type = purple_disco_service_get_type(parent); |
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
|
679 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
|
680 |
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
|
681 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
|
682 JabberDiscoItem *item = l->data; |
26608
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
683 |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
684 if (parent_type & PURPLE_DISCO_SERVICE_TYPE_CHAT) { |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
685 /* A chat server's items are chats. I promise. */ |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
686 PurpleDiscoService *service; |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
687 struct jabber_disco_service_data *service_data; |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
688 JabberID *jid = jabber_id_new(item->jid); |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
689 |
26608
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
690 if (jid) { |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
691 service_data = g_new0(struct jabber_disco_service_data, 1); |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
692 service_data->jid = g_strdup(item->jid); |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
693 |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
694 service = purple_disco_list_service_new(PURPLE_DISCO_SERVICE_TYPE_CHAT, |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
695 jid->node, item->name, PURPLE_DISCO_ADD, service_data); |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
696 |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
697 purple_disco_list_service_add(list, service, parent); |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
698 |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
699 jabber_id_free(jid); |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
700 } |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
701 } else { |
26608
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
702 JabberIq *iq; |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
703 struct _disco_data *req_data; |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
704 char *full_node; |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
705 |
26608
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
706 if (parent_node && !item->node) |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
707 continue; |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
708 |
26608
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
709 if (parent_node) |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
710 full_node = g_strconcat(parent_node, "/", item->node, NULL); |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
711 else |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
712 full_node = g_strdup(item->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 |
26608
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
714 req_data = g_new0(struct _disco_data, 1); |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
715 req_data->list_data = list_data; |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
716 req_data->parent = parent; |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
717 req_data->node = full_node; |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
718 |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
719 ++list_data->fetch_count; |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
720 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
|
721 |
26608
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
722 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#info"); |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
723 xmlnode_set_attrib(iq->node, "to", item->jid); |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
724 if (full_node) |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
725 xmlnode_set_attrib(xmlnode_get_child(iq->node, "query"), |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
726 "node", full_node); |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
727 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
|
728 |
26608
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
729 jabber_iq_send(iq); |
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
730 } |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
731 } |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
732 |
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 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
|
734 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
|
735 |
26254
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
736 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
|
737 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
|
738 |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
739 purple_disco_list_unref(list); |
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 g_free(disco_data->node); |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
742 g_free(disco_data); |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
743 } |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
744 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
745 static void |
26595
30221bc3da0e
Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents:
26593
diff
changeset
|
746 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
|
747 JabberIqType type, const char *id, |
30221bc3da0e
Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents:
26593
diff
changeset
|
748 xmlnode *packet, gpointer data) |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
749 { |
26599
f1dd84b4964e
Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents:
26598
diff
changeset
|
750 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
|
751 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
|
752 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
|
753 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
|
754 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
|
755 |
26254
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
756 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
|
757 PurpleDiscoService *parent, *service; |
26595
30221bc3da0e
Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents:
26593
diff
changeset
|
758 PurpleDiscoServiceType service_type; |
26599
f1dd84b4964e
Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents:
26598
diff
changeset
|
759 PurpleDiscoServiceFlags flags; |
26604
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
760 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
|
761 |
26599
f1dd84b4964e
Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents:
26598
diff
changeset
|
762 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
|
763 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
|
764 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
|
765 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
|
766 |
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
|
767 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
|
768 disco_data->node = NULL; |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
769 g_free(disco_data); |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
770 |
26252
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
771 --list_data->fetch_count; |
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
772 |
26604
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
773 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
|
774 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
|
775 return; |
cda9031ecabc
Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents:
26255
diff
changeset
|
776 } |
cda9031ecabc
Clean up Jabber's references and protocol_data if the window is closed
Paul Aurich <paul@darkrain42.org>
parents:
26255
diff
changeset
|
777 |
26595
30221bc3da0e
Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents:
26593
diff
changeset
|
778 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
|
779 || (!(query = xmlnode_get_child(packet, "query"))) |
26599
f1dd84b4964e
Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents:
26598
diff
changeset
|
780 || (!(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
|
781 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
|
782 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
|
783 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
784 purple_disco_list_unref(list); |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
785 return; |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
786 } |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
787 |
26601
31c240da2cd3
More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents:
26599
diff
changeset
|
788 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
|
789 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
|
790 |
26599
f1dd84b4964e
Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents:
26598
diff
changeset
|
791 /* Default to allowing things to be add-able */ |
f1dd84b4964e
Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents:
26598
diff
changeset
|
792 flags = PURPLE_DISCO_ADD; |
f1dd84b4964e
Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents:
26598
diff
changeset
|
793 |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
794 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
|
795 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
|
796 const char *var; |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
797 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
798 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
|
799 continue; |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
800 |
26599
f1dd84b4964e
Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents:
26598
diff
changeset
|
801 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
|
802 flags |= PURPLE_DISCO_REGISTER; |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
803 |
26599
f1dd84b4964e
Various minor nitpicky changes
Paul Aurich <paul@darkrain42.org>
parents:
26598
diff
changeset
|
804 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
|
805 flags |= PURPLE_DISCO_BROWSE; |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
806 |
26605
217a3ad87fc4
Discovered why that default assumption of PURPLE_DISCO_BROWSE was in there...
Paul Aurich <paul@darkrain42.org>
parents:
26604
diff
changeset
|
807 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
|
808 flags |= PURPLE_DISCO_BROWSE; |
26595
30221bc3da0e
Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents:
26593
diff
changeset
|
809 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
|
810 } |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
811 } |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
812 |
26601
31c240da2cd3
More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents:
26599
diff
changeset
|
813 if ((anode = xmlnode_get_attrib(query, "node"))) |
26608
9fb8d8d9783a
Move the handling of chat rooms to jabber_disco_service_items_cb.
Paul Aurich <paul@darkrain42.org>
parents:
26605
diff
changeset
|
814 aname = g_strconcat(from, anode, NULL); |
26601
31c240da2cd3
More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents:
26599
diff
changeset
|
815 else |
31c240da2cd3
More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents:
26599
diff
changeset
|
816 aname = g_strdup(from); |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
817 |
26604
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
818 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
|
819 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
|
820 if (anode) |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
821 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
|
822 |
26601
31c240da2cd3
More minor cleanup (no functional changes other than not printing a log msg)
Paul Aurich <paul@darkrain42.org>
parents:
26599
diff
changeset
|
823 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
|
824 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
|
825 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
|
826 |
26595
30221bc3da0e
Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents:
26593
diff
changeset
|
827 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
|
828 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
|
829 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
|
830 "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
|
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 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
|
833 |
26254
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
834 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
|
835 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
|
836 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
837 purple_disco_list_unref(list); |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
838 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
839 g_free(node); |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
840 } |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
841 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
842 static void |
26595
30221bc3da0e
Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents:
26593
diff
changeset
|
843 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
|
844 JabberIqType type, const char *id, |
30221bc3da0e
Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents:
26593
diff
changeset
|
845 xmlnode *packet, gpointer data) |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
846 { |
26252
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
847 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
|
848 xmlnode *query, *child; |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
849 gboolean has_items = FALSE; |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
850 |
26254
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
851 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
|
852 --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
|
853 |
26604
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
854 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
|
855 !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
|
856 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
|
857 return; |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
858 } |
26252
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
859 |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
860 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
|
861 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
862 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
|
863 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
|
864 JabberIq *iq; |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
865 const char *jid; |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
866 struct _disco_data *disco_data; |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
867 |
26254
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
868 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
|
869 continue; |
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 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
|
872 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
|
873 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
874 has_items = TRUE; |
26252
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
875 ++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
|
876 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
|
877 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
|
878 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
|
879 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
|
880 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
881 jabber_iq_send(iq); |
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 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
884 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
|
885 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
|
886 |
26254
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
887 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
|
888 } |
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 static void |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
891 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
|
892 { |
26254
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
893 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
|
894 |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
895 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
|
896 --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
|
897 |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
898 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
|
899 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
|
900 |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
901 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
|
902 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
|
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 return; |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
905 } |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
906 |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
907 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
|
908 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
|
909 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
|
910 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
|
911 |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
912 ++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
|
913 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
|
914 |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
915 jabber_iq_send(iq); |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
916 } else { |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
917 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
|
918 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
|
919 } |
26254
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 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
|
922 } |
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 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
|
925 { |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
926 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
|
927 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
|
928 } |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
929 |
26254
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
930 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
|
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 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
|
933 |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
934 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
|
935 |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
936 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
|
937 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
|
938 |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
939 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
|
940 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
|
941 return; |
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 |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
944 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
|
945 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
|
946 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
|
947 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
|
948 |
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_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
|
950 |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
951 ++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
|
952 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
|
953 } |
c619bef09bec
Make the prpl be in charge of creating the PurpleDiscoList; UI data is
Paul Aurich <paul@darkrain42.org>
parents:
26253
diff
changeset
|
954 |
26596
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
955 static void |
26604
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
956 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
|
957 { |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
958 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
|
959 |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
960 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
|
961 g_free(data->jid); |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
962 g_free(data->node); |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
963 g_free(data); |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
964 } |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
965 |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
966 #if 0 |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
967 static void |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
968 jabber_disco_cancel(PurpleDiscoList *list) |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
969 { |
26604
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
970 /* 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
|
971 } |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
972 #endif |
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 static void |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
975 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
|
976 { |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
977 PurpleAccount *account; |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
978 PurpleConnection *pc; |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
979 JabberStream *js; |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
980 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
|
981 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
|
982 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
|
983 |
26604
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
984 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
|
985 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
|
986 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
|
987 |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
988 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
|
989 |
26604
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
990 ++list_data->fetch_count; |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
991 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
|
992 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
|
993 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
|
994 disco_data->parent = service; |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
995 |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
996 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
|
997 |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
998 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
|
999 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
|
1000 } |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
1001 |
26596
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1002 static void |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
1003 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
|
1004 { |
26252
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
1005 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
|
1006 |
535c866b433c
Hide the structs, add accessors, and fix various smaller things:
Paul Aurich <paul@darkrain42.org>
parents:
26250
diff
changeset
|
1007 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
|
1008 } |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
1009 |
26596
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1010 |
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1011 PurpleDiscoList * |
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1012 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
|
1013 { |
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1014 PurpleAccount *account; |
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1015 PurpleDiscoList *list; |
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1016 JabberStream *js; |
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1017 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
|
1018 |
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1019 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
|
1020 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
|
1021 |
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1022 /* 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
|
1023 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
|
1024 |
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1025 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
|
1026 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
|
1027 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
|
1028 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
|
1029 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
|
1030 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
|
1031 #if 0 |
26596
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1032 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
|
1033 #endif |
ff33b65b2448
Iteratively expand the disco tree as prompted by the UI.
Paul Aurich <paul@darkrain42.org>
parents:
26603
diff
changeset
|
1034 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
|
1035 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
|
1036 |
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1037 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
|
1038 _("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
|
1039 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
|
1040 FALSE, FALSE, NULL, |
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1041 _("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
|
1042 _("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
|
1043 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
|
1044 |
1de01f9594c8
Use per-PurpleDiscoList ops for canceling a disco and registering.
Paul Aurich <paul@darkrain42.org>
parents:
26595
diff
changeset
|
1045 return list; |
26247
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
1046 } |
f5e613e05332
Applied disco-2.patch from nops with some modifications:
Paul Aurich <paul@darkrain42.org>
parents:
25952
diff
changeset
|
1047 |
26258
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1048 static void |
26595
30221bc3da0e
Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents:
26593
diff
changeset
|
1049 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
|
1050 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
|
1051 { |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1052 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
|
1053 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
|
1054 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
|
1055 GSList *items = NULL; |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1056 |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1057 jdicd = data; |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1058 |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1059 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
|
1060 |
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
|
1061 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
|
1062 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
|
1063 |
26595
30221bc3da0e
Fix merge (convert to IQ-handlers syntax)
Paul Aurich <paul@darkrain42.org>
parents:
26593
diff
changeset
|
1064 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
|
1065 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
|
1066 g_free(jdicd); |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1067 return; |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1068 } |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1069 |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1070 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
|
1071 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
|
1072 JabberDiscoItem *item; |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1073 |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1074 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
|
1075 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
|
1076 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
|
1077 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
|
1078 |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1079 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
|
1080 } |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1081 |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1082 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
|
1083 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
|
1084 g_free(jdicd); |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1085 } |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1086 |
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
|
1087 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
|
1088 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
|
1089 { |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1090 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
|
1091 JabberIq *iq; |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1092 |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1093 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
|
1094 jdicd->data = data; |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1095 jdicd->callback = callback; |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1096 |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1097 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
|
1098 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
|
1099 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
|
1100 |
26258
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1101 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
|
1102 |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1103 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
|
1104 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
|
1105 } |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1106 |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1107 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
|
1108 { |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1109 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
|
1110 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
|
1111 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
|
1112 g_free(item); |
b5fe3f47487b
jabber_disco_items_do(), which functions like jabber_disco_info_do.
Paul Aurich <paul@darkrain42.org>
parents:
26257
diff
changeset
|
1113 } |