annotate libpurple/protocols/jabber/google.c @ 28389:ed30bc20442c

jabber: Simplify; js is the callback data and can't be NULL.
author Paul Aurich <paul@darkrain42.org>
date Fri, 21 Aug 2009 20:47:47 +0000
parents 76c0969e3ea7
children 98d8c11e4937
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1 /**
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
2 * Purple is the legal property of its developers, whose names are too numerous
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
3 * to list here. Please refer to the COPYRIGHT file distributed with this
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
4 * source distribution.
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
19680
44b4e8bd759b The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 18751
diff changeset
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
15374
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 #include "internal.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
22 #include "debug.h"
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
23 #include "mediamanager.h"
15523
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
24 #include "util.h"
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
25 #include "privacy.h"
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
26 #include "dnsquery.h"
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
27 #include "network.h"
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
28
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
29 #include "buddy.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
30 #include "google.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
31 #include "jabber.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
32 #include "presence.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
33 #include "iq.h"
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
34
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
35 #include "jingle/jingle.h"
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
36
25654
cbe97caec684 Use USE_VV instead of USE_FARSIGHT.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25650
diff changeset
37 #ifdef USE_VV
25650
4b9b265a8100 Fix compiling with the --disable-vv switch.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25647
diff changeset
38
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
39 #define NS_GOOGLE_VIDEO "http://www.google.com/session/video"
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
40 #define NS_GOOGLE_PHONE "http://www.google.com/session/phone"
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
41
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
42 typedef struct {
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
43 char *id;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
44 char *initiator;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
45 } GoogleSessionId;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
46
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
47 typedef enum {
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
48 UNINIT,
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
49 SENT_INITIATE,
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
50 RECEIVED_INITIATE,
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
51 IN_PRORESS,
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
52 TERMINATED
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
53 } GoogleSessionState;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
54
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
55 typedef struct {
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
56 GoogleSessionId id;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
57 GoogleSessionState state;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
58 PurpleMedia *media;
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
59 JabberStream *js;
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
60 char *remote_jid;
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
61 gboolean video;
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
62 } GoogleSession;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
63
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
64 static gboolean
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
65 google_session_id_equal(gconstpointer a, gconstpointer b)
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
66 {
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
67 GoogleSessionId *c = (GoogleSessionId*)a;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
68 GoogleSessionId *d = (GoogleSessionId*)b;
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
69
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
70 return !strcmp(c->id, d->id) && !strcmp(c->initiator, d->initiator);
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
71 }
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
72
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
73 static void
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
74 google_session_destroy(GoogleSession *session)
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
75 {
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
76 g_free(session->id.id);
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
77 g_free(session->id.initiator);
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
78 g_free(session->remote_jid);
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
79 g_free(session);
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
80 }
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
81
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
82 static xmlnode *
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
83 google_session_create_xmlnode(GoogleSession *session, const char *type)
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
84 {
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
85 xmlnode *node = xmlnode_new("session");
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
86 xmlnode_set_namespace(node, "http://www.google.com/session");
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
87 xmlnode_set_attrib(node, "id", session->id.id);
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
88 xmlnode_set_attrib(node, "initiator", session->id.initiator);
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
89 xmlnode_set_attrib(node, "type", type);
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
90 return node;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
91 }
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
92
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
93 static void
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
94 google_session_send_terminate(GoogleSession *session)
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
95 {
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
96 xmlnode *sess;
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
97 JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
98
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
99 xmlnode_set_attrib(iq->node, "to", session->remote_jid);
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
100 sess = google_session_create_xmlnode(session, "terminate");
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
101 xmlnode_insert_child(iq->node, sess);
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
102
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
103 jabber_iq_send(iq);
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
104 google_session_destroy(session);
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
105 }
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
106
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
107 static void
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
108 google_session_send_candidates(PurpleMedia *media, gchar *session_id,
26040
0101d6e97f12 Very basic receive only GTalk audio sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26036
diff changeset
109 gchar *participant, GoogleSession *session)
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
110 {
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
111 GList *candidates = purple_media_get_local_candidates(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
112 session->media, session_id, session->remote_jid);
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26093
diff changeset
113 PurpleMediaCandidate *transport;
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
114 gboolean video = FALSE;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
115
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
116 if (!strcmp(session_id, "google-video"))
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
117 video = TRUE;
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
118
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
119 for (;candidates;candidates = candidates->next) {
26437
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
120 JabberIq *iq;
26488
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
121 gchar *ip, *port, *pref, *username, *password;
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
122 PurpleMediaCandidateType type;
26437
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
123 xmlnode *sess;
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
124 xmlnode *candidate;
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
125 guint component_id;
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26093
diff changeset
126 transport = (PurpleMediaCandidate*)(candidates->data);
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
127 component_id = purple_media_candidate_get_component_id(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
128 transport);
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
129
26437
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
130 iq = jabber_iq_new(session->js, JABBER_IQ_SET);
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
131 sess = google_session_create_xmlnode(session, "candidates");
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
132 xmlnode_insert_child(iq->node, sess);
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
133 xmlnode_set_attrib(iq->node, "to", session->remote_jid);
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
134
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
135 candidate = xmlnode_new("candidate");
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
136
26488
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
137 ip = purple_media_candidate_get_ip(transport);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
138 port = g_strdup_printf("%d",
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
139 purple_media_candidate_get_port(transport));
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
140 pref = g_strdup_printf("%f",
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
141 purple_media_candidate_get_priority(transport)
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
142 /1000.0);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
143 username = purple_media_candidate_get_username(transport);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
144 password = purple_media_candidate_get_password(transport);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
145 type = purple_media_candidate_get_candidate_type(transport);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
146
26488
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
147 xmlnode_set_attrib(candidate, "address", ip);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
148 xmlnode_set_attrib(candidate, "port", port);
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
149 xmlnode_set_attrib(candidate, "name",
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
150 component_id == PURPLE_MEDIA_COMPONENT_RTP ?
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
151 video ? "video_rtp" : "rtp" :
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
152 component_id == PURPLE_MEDIA_COMPONENT_RTCP ?
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
153 video ? "video_rtcp" : "rtcp" : "none");
26488
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
154 xmlnode_set_attrib(candidate, "username", username);
26077
2a1873a30474 Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26075
diff changeset
155 /*
2a1873a30474 Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26075
diff changeset
156 * As of this writing, Farsight 2 in Google compatibility
2a1873a30474 Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26075
diff changeset
157 * mode doesn't provide a password. The Gmail client
2a1873a30474 Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26075
diff changeset
158 * requires this to be set.
2a1873a30474 Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26075
diff changeset
159 */
2a1873a30474 Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26075
diff changeset
160 xmlnode_set_attrib(candidate, "password",
26488
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
161 password != NULL ? password : "");
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
162 xmlnode_set_attrib(candidate, "preference", pref);
26488
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
163 xmlnode_set_attrib(candidate, "protocol",
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
164 purple_media_candidate_get_protocol(transport)
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
165 == PURPLE_MEDIA_NETWORK_PROTOCOL_UDP ?
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
166 "udp" : "tcp");
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
167 xmlnode_set_attrib(candidate, "type", type ==
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26093
diff changeset
168 PURPLE_MEDIA_CANDIDATE_TYPE_HOST ? "local" :
26488
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
169 type ==
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26093
diff changeset
170 PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX ? "stun" :
26488
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
171 type ==
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
172 PURPLE_MEDIA_CANDIDATE_TYPE_RELAY ? "relay" :
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
173 NULL);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
174 xmlnode_set_attrib(candidate, "generation", "0");
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
175 xmlnode_set_attrib(candidate, "network", "0");
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
176 xmlnode_insert_child(sess, candidate);
26437
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
177
26488
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
178 g_free(ip);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
179 g_free(port);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
180 g_free(pref);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
181 g_free(username);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
182 g_free(password);
2d332d327a0e Hide and GObjectify PurpleMediaCandidate.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26486
diff changeset
183
26437
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
184 jabber_iq_send(iq);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
185 }
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
186 }
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
187
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
188 static void
26396
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
189 google_session_ready(GoogleSession *session)
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
190 {
26396
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
191 PurpleMedia *media = session->media;
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
192 if (purple_media_codecs_ready(media, NULL) &&
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
193 purple_media_candidates_prepared(media, NULL, NULL)) {
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
194 gchar *me = g_strdup_printf("%s@%s/%s",
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
195 session->js->user->node,
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
196 session->js->user->domain,
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
197 session->js->user->resource);
26396
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
198 JabberIq *iq;
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
199 xmlnode *sess, *desc, *payload;
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
200 GList *codecs, *iter;
26396
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
201 gboolean is_initiator = !strcmp(session->id.initiator, me);
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
202
26396
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
203 if (!is_initiator &&
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
204 !purple_media_accepted(media, NULL, NULL)) {
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
205 g_free(me);
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
206 return;
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
207 }
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
208
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
209 iq = jabber_iq_new(session->js, JABBER_IQ_SET);
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
210
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
211 if (is_initiator) {
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
212 xmlnode_set_attrib(iq->node, "to", session->remote_jid);
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
213 xmlnode_set_attrib(iq->node, "from", session->id.initiator);
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
214 sess = google_session_create_xmlnode(session, "initiate");
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
215 } else {
26437
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
216 google_session_send_candidates(session->media,
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
217 "google-voice", session->remote_jid,
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
218 session);
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
219 google_session_send_candidates(session->media,
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
220 "google-video", session->remote_jid,
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
221 session);
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
222 xmlnode_set_attrib(iq->node, "to", session->remote_jid);
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
223 xmlnode_set_attrib(iq->node, "from", me);
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
224 sess = google_session_create_xmlnode(session, "accept");
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
225 }
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
226 xmlnode_insert_child(iq->node, sess);
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
227 desc = xmlnode_new_child(sess, "description");
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
228 if (session->video)
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
229 xmlnode_set_namespace(desc, NS_GOOGLE_VIDEO);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
230 else
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
231 xmlnode_set_namespace(desc, NS_GOOGLE_PHONE);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
232
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
233 codecs = purple_media_get_codecs(media, "google-video");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
234
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
235 for (iter = codecs; iter; iter = g_list_next(iter)) {
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
236 PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
237 gchar *id = g_strdup_printf("%d",
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
238 purple_media_codec_get_id(codec));
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
239 gchar *encoding_name =
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
240 purple_media_codec_get_encoding_name(codec);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
241 payload = xmlnode_new_child(desc, "payload-type");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
242 xmlnode_set_attrib(payload, "id", id);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
243 xmlnode_set_attrib(payload, "name", encoding_name);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
244 xmlnode_set_attrib(payload, "width", "320");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
245 xmlnode_set_attrib(payload, "height", "200");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
246 xmlnode_set_attrib(payload, "framerate", "30");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
247 g_free(encoding_name);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
248 g_free(id);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
249 }
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
250 purple_media_codec_list_free(codecs);
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
251
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
252 codecs = purple_media_get_codecs(media, "google-voice");
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
253
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
254 for (iter = codecs; iter; iter = g_list_next(iter)) {
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
255 PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data;
26486
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26466
diff changeset
256 gchar *id = g_strdup_printf("%d",
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26466
diff changeset
257 purple_media_codec_get_id(codec));
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26466
diff changeset
258 gchar *encoding_name =
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26466
diff changeset
259 purple_media_codec_get_encoding_name(codec);
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26466
diff changeset
260 gchar *clock_rate = g_strdup_printf("%d",
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26466
diff changeset
261 purple_media_codec_get_clock_rate(codec));
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
262 payload = xmlnode_new_child(desc, "payload-type");
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
263 if (session->video)
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
264 xmlnode_set_namespace(payload, NS_GOOGLE_PHONE);
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
265 xmlnode_set_attrib(payload, "id", id);
27080
f0621e47ccf3 Make Gmail accept speex as the codec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27079
diff changeset
266 /*
f0621e47ccf3 Make Gmail accept speex as the codec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27079
diff changeset
267 * Hack to make Gmail accept speex as the codec.
f0621e47ccf3 Make Gmail accept speex as the codec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27079
diff changeset
268 * It shouldn't have to be case sensitive.
f0621e47ccf3 Make Gmail accept speex as the codec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27079
diff changeset
269 */
f0621e47ccf3 Make Gmail accept speex as the codec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27079
diff changeset
270 if (purple_strequal(encoding_name, "SPEEX"))
f0621e47ccf3 Make Gmail accept speex as the codec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27079
diff changeset
271 xmlnode_set_attrib(payload, "name", "speex");
f0621e47ccf3 Make Gmail accept speex as the codec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27079
diff changeset
272 else
f0621e47ccf3 Make Gmail accept speex as the codec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27079
diff changeset
273 xmlnode_set_attrib(payload, "name", encoding_name);
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
274 xmlnode_set_attrib(payload, "clockrate", clock_rate);
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
275 g_free(clock_rate);
26486
217574ec2a34 Hide and gobjectify PurpleMediaCodec.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26466
diff changeset
276 g_free(encoding_name);
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
277 g_free(id);
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
278 }
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
279 purple_media_codec_list_free(codecs);
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
280
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
281 jabber_iq_send(iq);
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
282
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
283 if (is_initiator) {
26437
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
284 google_session_send_candidates(session->media,
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
285 "google-voice", session->remote_jid,
29bc149cbd07 Send candidates more like GMail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26436
diff changeset
286 session);
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
287 google_session_send_candidates(session->media,
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
288 "google-video", session->remote_jid,
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
289 session);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
290 }
26400
007cd8dad384 Don't let initiate or accept be sent again with Google Voice.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26396
diff changeset
291
007cd8dad384 Don't let initiate or accept be sent again with Google Voice.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26396
diff changeset
292 g_signal_handlers_disconnect_by_func(G_OBJECT(session->media),
007cd8dad384 Don't let initiate or accept be sent again with Google Voice.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26396
diff changeset
293 G_CALLBACK(google_session_ready), session);
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
294 }
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
295 }
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
296
26112
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
297 static void
26411
86bc2d34f689 Rename state-changed enum and values.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
298 google_session_state_changed_cb(PurpleMedia *media, PurpleMediaState state,
26112
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
299 gchar *sid, gchar *name, GoogleSession *session)
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
300 {
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
301 if (sid == NULL && name == NULL) {
26411
86bc2d34f689 Rename state-changed enum and values.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26405
diff changeset
302 if (state == PURPLE_MEDIA_STATE_END) {
26112
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
303 google_session_destroy(session);
26404
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
304 }
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
305 }
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
306 }
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
307
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
308 static void
26405
51b986bbe260 Use the right enum for the parameter.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26404
diff changeset
309 google_session_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type,
26448
4e1286e76f1f Create purple_media_stream_info. Add local parameter to stream-info signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26447
diff changeset
310 gchar *sid, gchar *name, gboolean local,
4e1286e76f1f Create purple_media_stream_info. Add local parameter to stream-info signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26447
diff changeset
311 GoogleSession *session)
26404
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
312 {
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
313 if (type == PURPLE_MEDIA_INFO_HANGUP) {
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
314 xmlnode *sess;
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
315 JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
26112
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
316
26404
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
317 xmlnode_set_attrib(iq->node, "to", session->remote_jid);
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
318 sess = google_session_create_xmlnode(session, "terminate");
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
319 xmlnode_insert_child(iq->node, sess);
26112
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
320
26404
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
321 jabber_iq_send(iq);
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
322 } else if (type == PURPLE_MEDIA_INFO_REJECT) {
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
323 xmlnode *sess;
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
324 JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
325
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
326 xmlnode_set_attrib(iq->node, "to", session->remote_jid);
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
327 sess = google_session_create_xmlnode(session, "reject");
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
328 xmlnode_insert_child(iq->node, sess);
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
329
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
330 jabber_iq_send(iq);
26112
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
331 }
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
332 }
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
333
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
334 static GParameter *
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
335 jabber_google_session_get_params(JabberStream *js, guint *num)
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
336 {
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
337 guint num_params;
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
338 GParameter *params = jingle_get_params(js, &num_params);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
339 GParameter *new_params = g_new0(GParameter, num_params + 1);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
340
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
341 memcpy(new_params, params, sizeof(GParameter) * num_params);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
342
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
343 purple_debug_info("jabber", "setting Google jingle compatibility param\n");
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
344 new_params[num_params].name = "compatibility-mode";
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
345 g_value_init(&new_params[num_params].value, G_TYPE_UINT);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
346 g_value_set_uint(&new_params[num_params].value, 1); /* NICE_COMPATIBILITY_GOOGLE */
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
347
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
348 g_free(params);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
349 *num = num_params + 1;
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
350 return new_params;
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
351 }
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
352
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
353
26447
34eb898478b4 Don't assume a PurpleMedia instance will be created immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26437
diff changeset
354 gboolean
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
355 jabber_google_session_initiate(JabberStream *js, const gchar *who, PurpleMediaSessionType type)
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
356 {
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
357 GoogleSession *session;
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
358 JabberBuddy *jb;
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
359 JabberBuddyResource *jbr;
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
360 gchar *jid;
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
361 GParameter *params;
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
362 guint num_params;
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
363
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
364 /* construct JID to send to */
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
365 jb = jabber_buddy_find(js, who, FALSE);
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
366 if (!jb) {
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
367 purple_debug_error("jingle-rtp",
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
368 "Could not find Jabber buddy\n");
26447
34eb898478b4 Don't assume a PurpleMedia instance will be created immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26437
diff changeset
369 return FALSE;
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
370 }
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
371 jbr = jabber_buddy_find_resource(jb, NULL);
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
372 if (!jbr) {
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
373 purple_debug_error("jingle-rtp",
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
374 "Could not find buddy's resource\n");
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
375 }
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
376
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
377 if ((strchr(who, '/') == NULL) && jbr && (jbr->name != NULL)) {
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
378 jid = g_strdup_printf("%s/%s", who, jbr->name);
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
379 } else {
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
380 jid = g_strdup(who);
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
381 }
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
382
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
383 session = g_new0(GoogleSession, 1);
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
384 session->id.id = jabber_get_next_id(js);
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
385 session->id.initiator = g_strdup_printf("%s@%s/%s", js->user->node,
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
386 js->user->domain, js->user->resource);
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
387 session->state = SENT_INITIATE;
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
388 session->js = js;
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
389 session->remote_jid = jid;
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
390
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
391 if (type & PURPLE_MEDIA_VIDEO)
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
392 session->video = TRUE;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
393
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
394 session->media = purple_media_manager_create_media(
26606
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26558
diff changeset
395 purple_media_manager_get(),
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26558
diff changeset
396 purple_connection_get_account(js->gc),
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
397 "fsrtpconference", session->remote_jid, TRUE);
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
398
26207
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
399 purple_media_set_prpl_data(session->media, session);
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
400
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
401 params = jabber_google_session_get_params(js, &num_params);
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
402
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
403 if (purple_media_add_stream(session->media, "google-voice",
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
404 session->remote_jid, PURPLE_MEDIA_AUDIO,
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
405 TRUE, "nice", num_params, params) == FALSE ||
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
406 (session->video && purple_media_add_stream(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
407 session->media, "google-video",
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
408 session->remote_jid, PURPLE_MEDIA_VIDEO,
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
409 TRUE, "nice", num_params, params) == FALSE)) {
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
410 purple_media_error(session->media, "Error adding stream.");
26451
2862fee7acf2 Remove purple_media_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26448
diff changeset
411 purple_media_stream_info(session->media,
2862fee7acf2 Remove purple_media_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26448
diff changeset
412 PURPLE_MEDIA_INFO_HANGUP, NULL, NULL, TRUE);
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
413 google_session_destroy(session);
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
414 g_free(params);
26447
34eb898478b4 Don't assume a PurpleMedia instance will be created immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26437
diff changeset
415 return FALSE;
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
416 }
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
417
26396
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
418 g_signal_connect_swapped(G_OBJECT(session->media),
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
419 "candidates-prepared",
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
420 G_CALLBACK(google_session_ready), session);
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
421 g_signal_connect_swapped(G_OBJECT(session->media), "codecs-changed",
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
422 G_CALLBACK(google_session_ready), session);
26112
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
423 g_signal_connect(G_OBJECT(session->media), "state-changed",
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
424 G_CALLBACK(google_session_state_changed_cb), session);
26404
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
425 g_signal_connect(G_OBJECT(session->media), "stream-info",
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
426 G_CALLBACK(google_session_stream_info_cb), session);
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
427
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
428 g_free(params);
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
429
26447
34eb898478b4 Don't assume a PurpleMedia instance will be created immediately.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26437
diff changeset
430 return (session->media != NULL) ? TRUE : FALSE;
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
431 }
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
432
28137
da33da2e1a1e Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <paul@darkrain42.org>
parents: 28015
diff changeset
433 static gboolean
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
434 google_session_handle_initiate(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
435 {
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
436 JabberIq *result;
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
437 GList *codecs = NULL, *video_codecs = NULL;
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
438 xmlnode *desc_element, *codec_element;
26106
ac4d7695dbc7 Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26103
diff changeset
439 PurpleMediaCodec *codec;
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
440 const char *xmlns;
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
441 GParameter *params;
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
442 guint num_params;
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
443
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
444 if (session->state != UNINIT) {
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
445 purple_debug_error("jabber", "Received initiate for active session.\n");
28137
da33da2e1a1e Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <paul@darkrain42.org>
parents: 28015
diff changeset
446 return FALSE;
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
447 }
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
448
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
449 desc_element = xmlnode_get_child(sess, "description");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
450 xmlns = xmlnode_get_namespace(desc_element);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
451
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
452 if (purple_strequal(xmlns, NS_GOOGLE_PHONE))
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
453 session->video = FALSE;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
454 else if (purple_strequal(xmlns, NS_GOOGLE_VIDEO))
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
455 session->video = TRUE;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
456 else {
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
457 purple_debug_error("jabber", "Received initiate with "
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
458 "invalid namespace %s.\n", xmlns);
28137
da33da2e1a1e Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <paul@darkrain42.org>
parents: 28015
diff changeset
459 return FALSE;
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
460 }
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
461
26606
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26558
diff changeset
462 session->media = purple_media_manager_create_media(
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26558
diff changeset
463 purple_media_manager_get(),
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26558
diff changeset
464 purple_connection_get_account(js->gc),
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26558
diff changeset
465 "fsrtpconference", session->remote_jid, FALSE);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
466
26207
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
467 purple_media_set_prpl_data(session->media, session);
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
468
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
469 params = jabber_google_session_get_params(js, &num_params);
26040
0101d6e97f12 Very basic receive only GTalk audio sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26036
diff changeset
470
26466
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26453
diff changeset
471 if (purple_media_add_stream(session->media, "google-voice",
bea334b214fa Add purple_media_is_initiator.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26453
diff changeset
472 session->remote_jid, PURPLE_MEDIA_AUDIO, FALSE,
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
473 "nice", num_params, params) == FALSE ||
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
474 (session->video && purple_media_add_stream(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
475 session->media, "google-video",
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
476 session->remote_jid, PURPLE_MEDIA_VIDEO,
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
477 FALSE, "nice", num_params, params) == FALSE)) {
26075
f45301cc2c84 End google call if stream creation fails.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
478 purple_media_error(session->media, "Error adding stream.");
26451
2862fee7acf2 Remove purple_media_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26448
diff changeset
479 purple_media_stream_info(session->media,
2862fee7acf2 Remove purple_media_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26448
diff changeset
480 PURPLE_MEDIA_INFO_HANGUP, NULL, NULL, TRUE);
26075
f45301cc2c84 End google call if stream creation fails.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
481 google_session_send_terminate(session);
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
482 g_free(params);
28137
da33da2e1a1e Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <paul@darkrain42.org>
parents: 28015
diff changeset
483 return FALSE;
26075
f45301cc2c84 End google call if stream creation fails.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26063
diff changeset
484 }
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25637
diff changeset
485
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
486 g_free(params);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
487
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
488 for (codec_element = xmlnode_get_child(desc_element, "payload-type");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
489 codec_element; codec_element = codec_element->next) {
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
490 const char *id, *encoding_name, *clock_rate,
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
491 *width, *height, *framerate;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
492 gboolean video;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
493 if (codec_element->name &&
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
494 strcmp(codec_element->name, "payload-type"))
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
495 continue;
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
496
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
497 xmlns = xmlnode_get_namespace(codec_element);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
498 encoding_name = xmlnode_get_attrib(codec_element, "name");
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
499 id = xmlnode_get_attrib(codec_element, "id");
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
500
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
501 if (!session->video ||
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
502 (xmlns && !strcmp(xmlns, NS_GOOGLE_PHONE))) {
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
503 clock_rate = xmlnode_get_attrib(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
504 codec_element, "clockrate");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
505 video = FALSE;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
506 } else {
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
507 width = xmlnode_get_attrib(codec_element, "width");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
508 height = xmlnode_get_attrib(codec_element, "height");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
509 framerate = xmlnode_get_attrib(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
510 codec_element, "framerate");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
511 clock_rate = "90000";
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
512 video = TRUE;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
513 }
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
514
26839
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
515 if (id) {
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
516 codec = purple_media_codec_new(atoi(id), encoding_name,
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
517 video ? PURPLE_MEDIA_VIDEO :
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
518 PURPLE_MEDIA_AUDIO,
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
519 clock_rate ? atoi(clock_rate) : 0);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
520 if (video)
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
521 video_codecs = g_list_append(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
522 video_codecs, codec);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
523 else
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
524 codecs = g_list_append(codecs, codec);
26839
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
525 }
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
526 }
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
527
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
528 if (codecs)
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
529 purple_media_set_remote_codecs(session->media, "google-voice",
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
530 session->remote_jid, codecs);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
531 if (video_codecs)
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
532 purple_media_set_remote_codecs(session->media, "google-video",
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
533 session->remote_jid, video_codecs);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
534
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
535 purple_media_codec_list_free(codecs);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
536 purple_media_codec_list_free(video_codecs);
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
537
26396
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
538 g_signal_connect_swapped(G_OBJECT(session->media), "accepted",
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
539 G_CALLBACK(google_session_ready), session);
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
540 g_signal_connect_swapped(G_OBJECT(session->media),
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
541 "candidates-prepared",
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
542 G_CALLBACK(google_session_ready), session);
2ad89aff8d68 Remove ready-new from use.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26213
diff changeset
543 g_signal_connect_swapped(G_OBJECT(session->media), "codecs-changed",
26113
7bbac147f276 Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26112
diff changeset
544 G_CALLBACK(google_session_ready), session);
26112
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
545 g_signal_connect(G_OBJECT(session->media), "state-changed",
027ce238eb40 Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26106
diff changeset
546 G_CALLBACK(google_session_state_changed_cb), session);
26404
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
547 g_signal_connect(G_OBJECT(session->media), "stream-info",
90c7f3e477b3 Use stream-info instead of state-changed for hangup and reject.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26400
diff changeset
548 G_CALLBACK(google_session_stream_info_cb), session);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
549
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
550 result = jabber_iq_new(js, JABBER_IQ_RESULT);
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
551 jabber_iq_set_id(result, iq_id);
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
552 xmlnode_set_attrib(result->node, "to", session->remote_jid);
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
553 jabber_iq_send(result);
28137
da33da2e1a1e Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <paul@darkrain42.org>
parents: 28015
diff changeset
554
da33da2e1a1e Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <paul@darkrain42.org>
parents: 28015
diff changeset
555 return TRUE;
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
556 }
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
557
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
558 static void
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
559 google_session_handle_candidates(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
560 {
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
561 JabberIq *result;
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
562 GList *list = NULL, *video_list = NULL;
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
563 xmlnode *cand;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
564 static int name = 0;
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
565 char n[4];
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
566
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
567 for (cand = xmlnode_get_child(sess, "candidate"); cand;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
568 cand = xmlnode_get_next_twin(cand)) {
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26093
diff changeset
569 PurpleMediaCandidate *info;
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
570 const gchar *cname = xmlnode_get_attrib(cand, "name");
26839
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
571 const gchar *type = xmlnode_get_attrib(cand, "type");
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
572 const gchar *protocol = xmlnode_get_attrib(cand, "protocol");
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
573 const gchar *address = xmlnode_get_attrib(cand, "address");
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
574 const gchar *port = xmlnode_get_attrib(cand, "port");
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
575 guint component_id;
26839
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
576
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
577 if (cname && type && address && port) {
26839
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
578 PurpleMediaCandidateType candidate_type;
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
579
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
580 g_snprintf(n, sizeof(n), "S%d", name++);
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
581
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
582 if (g_str_equal(type, "local"))
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
583 candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
584 else if (g_str_equal(type, "stun"))
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
585 candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX;
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
586 else if (g_str_equal(type, "relay"))
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
587 candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_RELAY;
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
588 else
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
589 candidate_type = PURPLE_MEDIA_CANDIDATE_TYPE_HOST;
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
590
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
591 if (purple_strequal(cname, "rtcp") ||
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
592 purple_strequal(cname, "video_rtcp"))
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
593 component_id = PURPLE_MEDIA_COMPONENT_RTCP;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
594 else
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
595 component_id = PURPLE_MEDIA_COMPONENT_RTP;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
596
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
597 info = purple_media_candidate_new(n, component_id,
26839
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
598 candidate_type,
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
599 purple_strequal(protocol, "udp") ?
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26093
diff changeset
600 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP :
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26093
diff changeset
601 PURPLE_MEDIA_NETWORK_PROTOCOL_TCP,
26839
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
602 address,
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
603 atoi(port));
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
604 g_object_set(info, "username", xmlnode_get_attrib(cand, "username"),
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
605 "password", xmlnode_get_attrib(cand, "password"), NULL);
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
606 if (!strncmp(cname, "video_", 6))
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
607 video_list = g_list_append(video_list, info);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
608 else
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
609 list = g_list_append(list, info);
26839
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
610 }
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
611 }
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
612
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
613 if (list)
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
614 purple_media_add_remote_candidates(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
615 session->media, "google-voice",
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
616 session->remote_jid, list);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
617 if (video_list)
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
618 purple_media_add_remote_candidates(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
619 session->media, "google-video",
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
620 session->remote_jid, video_list);
26103
f7cf50180e1d Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26093
diff changeset
621 purple_media_candidate_list_free(list);
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
622 purple_media_candidate_list_free(video_list);
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
623
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
624 result = jabber_iq_new(js, JABBER_IQ_RESULT);
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
625 jabber_iq_set_id(result, iq_id);
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
626 xmlnode_set_attrib(result->node, "to", session->remote_jid);
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
627 jabber_iq_send(result);
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
628 }
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
629
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
630 static void
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
631 google_session_handle_accept(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
632 {
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
633 xmlnode *desc_element = xmlnode_get_child(sess, "description");
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
634 xmlnode *codec_element = xmlnode_get_child(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
635 desc_element, "payload-type");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
636 GList *codecs = NULL, *video_codecs = NULL;
26436
d8d6fb37c789 Fix Gtalk bug where it would terminate the session after 15 seconds.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26416
diff changeset
637 JabberIq *result = NULL;
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
638 const gchar *xmlns = xmlnode_get_namespace(desc_element);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
639 gboolean video = (xmlns && !strcmp(xmlns, NS_GOOGLE_VIDEO));
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
640
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
641 for (; codec_element; codec_element = codec_element->next) {
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
642 const gchar *xmlns, *encoding_name, *id,
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
643 *clock_rate, *width, *height, *framerate;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
644 gboolean video_codec = FALSE;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
645
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
646 if (!purple_strequal(codec_element->name, "payload-type"))
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
647 continue;
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
648
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
649 xmlns = xmlnode_get_namespace(codec_element);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
650 encoding_name = xmlnode_get_attrib(codec_element, "name");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
651 id = xmlnode_get_attrib(codec_element, "id");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
652
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
653 if (!video || purple_strequal(xmlns, NS_GOOGLE_PHONE))
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
654 clock_rate = xmlnode_get_attrib(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
655 codec_element, "clockrate");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
656 else {
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
657 clock_rate = "90000";
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
658 width = xmlnode_get_attrib(codec_element, "width");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
659 height = xmlnode_get_attrib(codec_element, "height");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
660 framerate = xmlnode_get_attrib(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
661 codec_element, "framerate");
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
662 video_codec = TRUE;
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
663 }
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
664
26839
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
665 if (id && encoding_name) {
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
666 PurpleMediaCodec *codec = purple_media_codec_new(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
667 atoi(id), encoding_name,
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
668 video_codec ? PURPLE_MEDIA_VIDEO :
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
669 PURPLE_MEDIA_AUDIO,
26839
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
670 clock_rate ? atoi(clock_rate) : 0);
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
671 if (video_codec)
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
672 video_codecs = g_list_append(
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
673 video_codecs, codec);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
674 else
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
675 codecs = g_list_append(codecs, codec);
26839
43e1cdbc6b4b Avoid crashing on some more atoi calls and ensure required parameters are !NULL
Paul Aurich <paul@darkrain42.org>
parents: 26633
diff changeset
676 }
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
677 }
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
678
27079
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
679 if (codecs)
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
680 purple_media_set_remote_codecs(session->media, "google-voice",
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
681 session->remote_jid, codecs);
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
682 if (video_codecs)
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
683 purple_media_set_remote_codecs(session->media, "google-video",
72bcdcb0629f Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 27028
diff changeset
684 session->remote_jid, video_codecs);
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
685
26453
12c7db418c3e Remove purple_media_accept.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26451
diff changeset
686 purple_media_stream_info(session->media, PURPLE_MEDIA_INFO_ACCEPT,
12c7db418c3e Remove purple_media_accept.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26451
diff changeset
687 NULL, NULL, FALSE);
26436
d8d6fb37c789 Fix Gtalk bug where it would terminate the session after 15 seconds.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26416
diff changeset
688
d8d6fb37c789 Fix Gtalk bug where it would terminate the session after 15 seconds.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26416
diff changeset
689 result = jabber_iq_new(js, JABBER_IQ_RESULT);
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
690 jabber_iq_set_id(result, iq_id);
26436
d8d6fb37c789 Fix Gtalk bug where it would terminate the session after 15 seconds.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26416
diff changeset
691 xmlnode_set_attrib(result->node, "to", session->remote_jid);
d8d6fb37c789 Fix Gtalk bug where it would terminate the session after 15 seconds.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26416
diff changeset
692 jabber_iq_send(result);
26081
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
693 }
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
694
44a528094cbf Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26077
diff changeset
695 static void
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
696 google_session_handle_reject(JabberStream *js, GoogleSession *session, xmlnode *sess)
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
697 {
26140
ac56e5707a72 Added purple_media_end and removed the purple_media_got_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26122
diff changeset
698 purple_media_end(session->media, NULL, NULL);
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
699 }
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
700
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
701 static void
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
702 google_session_handle_terminate(JabberStream *js, GoogleSession *session, xmlnode *sess)
25548
70cdff43ec76 You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents: 25545
diff changeset
703 {
26140
ac56e5707a72 Added purple_media_end and removed the purple_media_got_hangup.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26122
diff changeset
704 purple_media_end(session->media, NULL, NULL);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
705 }
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
706
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
707 static void
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
708 google_session_parse_iq(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
709 {
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
710 const char *type = xmlnode_get_attrib(sess, "type");
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
711
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
712 if (!strcmp(type, "initiate")) {
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
713 google_session_handle_initiate(js, session, sess, iq_id);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
714 } else if (!strcmp(type, "accept")) {
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
715 google_session_handle_accept(js, session, sess, iq_id);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
716 } else if (!strcmp(type, "reject")) {
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
717 google_session_handle_reject(js, session, sess);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
718 } else if (!strcmp(type, "terminate")) {
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
719 google_session_handle_terminate(js, session, sess);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
720 } else if (!strcmp(type, "candidates")) {
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
721 google_session_handle_candidates(js, session, sess, iq_id);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
722 }
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
723 }
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
724
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
725 void
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
726 jabber_google_session_parse(JabberStream *js, const char *from,
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
727 JabberIqType type, const char *iq_id,
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
728 xmlnode *session_node)
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
729 {
26207
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
730 GoogleSession *session = NULL;
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
731 GoogleSessionId id;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
732
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
733 xmlnode *desc_node;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
734
26207
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
735 GList *iter = NULL;
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
736
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
737 if (type != JABBER_IQ_SET)
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
738 return;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
739
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25637
diff changeset
740 id.id = (gchar*)xmlnode_get_attrib(session_node, "id");
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
741 if (!id.id)
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
742 return;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
743
25647
e1c8ec1259de Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25637
diff changeset
744 id.initiator = (gchar*)xmlnode_get_attrib(session_node, "initiator");
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
745 if (!id.initiator)
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
746 return;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
747
26606
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26558
diff changeset
748 iter = purple_media_manager_get_media_by_account(
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26558
diff changeset
749 purple_media_manager_get(),
df9042312063 Switch media to store accounts rather than connections.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26558
diff changeset
750 purple_connection_get_account(js->gc));
26207
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
751 for (; iter; iter = g_list_delete_link(iter, iter)) {
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
752 GoogleSession *gsession =
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
753 purple_media_get_prpl_data(iter->data);
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
754 if (google_session_id_equal(&(gsession->id), &id)) {
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
755 session = gsession;
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
756 break;
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
757 }
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
758 }
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
759 if (iter != NULL) {
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
760 g_list_free(iter);
a773b465935e Remove static sessions variable from google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26162
diff changeset
761 }
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
762
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
763 if (session) {
26558
cd1f3a1750a1 And google session handling
Paul Aurich <paul@darkrain42.org>
parents: 26553
diff changeset
764 google_session_parse_iq(js, session, session_node, iq_id);
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
765 return;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
766 }
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
767
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
768 /* If the session doesn't exist, this has to be an initiate message */
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
769 if (strcmp(xmlnode_get_attrib(session_node, "type"), "initiate"))
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
770 return;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
771 desc_node = xmlnode_get_child(session_node, "description");
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
772 if (!desc_node)
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
773 return;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
774 session = g_new0(GoogleSession, 1);
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
775 session->id.id = g_strdup(id.id);
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
776 session->id.initiator = g_strdup(id.initiator);
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
777 session->state = UNINIT;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
778 session->js = js;
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
779 session->remote_jid = g_strdup(session->id.initiator);
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
780
28137
da33da2e1a1e Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <paul@darkrain42.org>
parents: 28015
diff changeset
781 if (!google_session_handle_initiate(js, session, session_node, iq_id))
da33da2e1a1e Fix a bunch of memory leaks reported by Josh Mueller. Refs #9822.
Paul Aurich <paul@darkrain42.org>
parents: 28015
diff changeset
782 google_session_destroy(session);
26416
6f0200f1e497 Clean up usage of USE_VV in the XMPP protocol.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 26411
diff changeset
783 }
25654
cbe97caec684 Use USE_VV instead of USE_FARSIGHT.
Mike Ruprecht <maiku@soc.pidgin.im>
parents: 25650
diff changeset
784 #endif /* USE_VV */
25545
315151da0dc6 Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents: 18751
diff changeset
785
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
786 static void
26547
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25983
diff changeset
787 jabber_gmail_parse(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: 25983
diff changeset
788 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: 25983
diff changeset
789 xmlnode *packet, gpointer nul)
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
790 {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
791 xmlnode *child;
26547
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25983
diff changeset
792 xmlnode *message;
27410
e01ef82ba0f2 disapproval of revision '7a65a44ab2e57a47d160be267b0f41062f5c540d'
Paul Aurich <paul@darkrain42.org>
parents: 27346
diff changeset
793 const char *to, *url;
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
794 const char *in_str;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
795 char *to_name;
20169
575d8c84ccba Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents: 19680
diff changeset
796
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
797 int i, count = 1, returned_count;
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
798
18491
8f172a8b8cce Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 18161
diff changeset
799 const char **tos, **froms, **urls;
8f172a8b8cce Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 18161
diff changeset
800 char **subjects;
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
801
26547
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25983
diff changeset
802 if (type == JABBER_IQ_ERROR)
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
803 return;
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
804
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
805 child = xmlnode_get_child(packet, "mailbox");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
806 if (!child)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
807 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
808
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
809 in_str = xmlnode_get_attrib(child, "total-matched");
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
810 if (in_str && *in_str)
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
811 count = atoi(in_str);
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
812
20169
575d8c84ccba Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents: 19680
diff changeset
813 /* If Gmail doesn't tell us who the mail is to, let's use our JID */
575d8c84ccba Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents: 19680
diff changeset
814 to = xmlnode_get_attrib(packet, "to");
575d8c84ccba Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents: 19680
diff changeset
815
20218
99ceb1329a5b applied changes from 3fcc47961d378fa0cd4eeb00dc6923b16a3a4151
Richard Laager <rlaager@wiktel.com>
parents: 20211
diff changeset
816 message = xmlnode_get_child(child, "mail-thread-info");
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
817
20218
99ceb1329a5b applied changes from 3fcc47961d378fa0cd4eeb00dc6923b16a3a4151
Richard Laager <rlaager@wiktel.com>
parents: 20211
diff changeset
818 if (count == 0 || !message) {
25891
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
819 if (count > 0) {
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
820 char *bare_jid = jabber_get_bare_jid(to);
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
821 const char *default_tos[2] = { bare_jid };
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
822
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
823 purple_notify_emails(js->gc, count, FALSE, NULL, NULL, default_tos, NULL, NULL, NULL);
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
824 g_free(bare_jid);
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
825 } else {
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
826 purple_notify_emails(js->gc, count, FALSE, NULL, NULL, NULL, NULL, NULL, NULL);
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
827 }
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
828
20169
575d8c84ccba Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents: 19680
diff changeset
829 return;
575d8c84ccba Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents: 19680
diff changeset
830 }
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
831
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
832 /* Loop once to see how many messages were returned so we can allocate arrays
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
833 * accordingly */
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
834 for (returned_count = 0; message; returned_count++, message=xmlnode_get_next_twin(message));
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
835
25891
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
836 froms = g_new0(const char* , returned_count + 1);
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
837 tos = g_new0(const char* , returned_count + 1);
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
838 subjects = g_new0(char* , returned_count + 1);
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
839 urls = g_new0(const char* , returned_count + 1);
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
840
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
841 to = xmlnode_get_attrib(packet, "to");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
842 to_name = jabber_get_bare_jid(to);
27410
e01ef82ba0f2 disapproval of revision '7a65a44ab2e57a47d160be267b0f41062f5c540d'
Paul Aurich <paul@darkrain42.org>
parents: 27346
diff changeset
843 url = xmlnode_get_attrib(child, "url");
e01ef82ba0f2 disapproval of revision '7a65a44ab2e57a47d160be267b0f41062f5c540d'
Paul Aurich <paul@darkrain42.org>
parents: 27346
diff changeset
844 if (!url || !*url)
e01ef82ba0f2 disapproval of revision '7a65a44ab2e57a47d160be267b0f41062f5c540d'
Paul Aurich <paul@darkrain42.org>
parents: 27346
diff changeset
845 url = "http://www.gmail.com";
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
846
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
847 message= xmlnode_get_child(child, "mail-thread-info");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
848 for (i=0; message; message = xmlnode_get_next_twin(message), i++) {
26547
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25983
diff changeset
849 xmlnode *sender_node, *subject_node;
27410
e01ef82ba0f2 disapproval of revision '7a65a44ab2e57a47d160be267b0f41062f5c540d'
Paul Aurich <paul@darkrain42.org>
parents: 27346
diff changeset
850 const char *from, *tid;
26547
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25983
diff changeset
851 char *subject;
ae41d8e827e3 Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents: 25983
diff changeset
852
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
853 subject_node = xmlnode_get_child(message, "subject");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
854 sender_node = xmlnode_get_child(message, "senders");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
855 sender_node = xmlnode_get_child(sender_node, "sender");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
856
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
857 while (sender_node && (!xmlnode_get_attrib(sender_node, "unread") ||
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
858 !strcmp(xmlnode_get_attrib(sender_node, "unread"),"0")))
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
859 sender_node = xmlnode_get_next_twin(sender_node);
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
860
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
861 if (!sender_node) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
862 i--;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
863 continue;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
864 }
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
865
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
866 from = xmlnode_get_attrib(sender_node, "name");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
867 if (!from || !*from)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
868 from = xmlnode_get_attrib(sender_node, "address");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
869 subject = xmlnode_get_data(subject_node);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
870 /*
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
871 * url = xmlnode_get_attrib(message, "url");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
872 */
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
873 tos[i] = (to_name != NULL ? to_name : "");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
874 froms[i] = (from != NULL ? from : "");
18491
8f172a8b8cce Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 18161
diff changeset
875 subjects[i] = (subject != NULL ? subject : g_strdup(""));
20333
53afc5cce143 applied changes from d4b316d73ebaf93803ca2642e78b8821c3b5d5c7
Luke Schierer <lschiere@pidgin.im>
parents: 20317
diff changeset
876 urls[i] = url;
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
877
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
878 tid = xmlnode_get_attrib(message, "tid");
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
879 if (tid &&
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
880 (js->gmail_last_tid == NULL || strcmp(tid, js->gmail_last_tid) > 0)) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
881 g_free(js->gmail_last_tid);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
882 js->gmail_last_tid = g_strdup(tid);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
883 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
884 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
885
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
886 if (i>0)
18492
94c23019a864 Only display the "detailed" email notifications for gtalk if we really have all the details to show. Fixes #1813.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 18491
diff changeset
887 purple_notify_emails(js->gc, count, count == i, (const char**) subjects, froms, tos,
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
888 urls, NULL, NULL);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
889
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
890 g_free(to_name);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
891 g_free(tos);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
892 g_free(froms);
25891
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
893 for (i = 0; i < returned_count; i++)
2260e5b0ca91 *** Plucked rev f9080d0b (khc@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents: 23399
diff changeset
894 g_free(subjects[i]);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
895 g_free(subjects);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
896 g_free(urls);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
897
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
898 in_str = xmlnode_get_attrib(child, "result-time");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
899 if (in_str && *in_str) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
900 g_free(js->gmail_last_time);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
901 js->gmail_last_time = g_strdup(in_str);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
902 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
903 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
904
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
905 void
25933
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25067
diff changeset
906 jabber_gmail_poke(JabberStream *js, const char *from, JabberIqType type,
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25067
diff changeset
907 const char *id, xmlnode *new_mail)
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
908 {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
909 xmlnode *query;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
910 JabberIq *iq;
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
911
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
912 /* bail if the user isn't interested */
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
913 if (!purple_account_get_check_mail(js->gc->account))
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
914 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
915
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
916 /* Is this an initial incoming mail notification? If so, send a request for more info */
25933
050052891c55 Pass IQ handlers type, from, id, and the child node
Paul Aurich <paul@darkrain42.org>
parents: 25067
diff changeset
917 if (type != JABBER_IQ_SET)
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
918 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
919
26921
bb537c36d92f Ack the mail notification IQ. Refs #8240.
Paul Aurich <paul@darkrain42.org>
parents: 26839
diff changeset
920 /* Acknowledge the notification */
bb537c36d92f Ack the mail notification IQ. Refs #8240.
Paul Aurich <paul@darkrain42.org>
parents: 26839
diff changeset
921 iq = jabber_iq_new(js, JABBER_IQ_RESULT);
26933
edff8cc58d66 Avoid an assertion when acking the gmail poke
Paul Aurich <paul@darkrain42.org>
parents: 26921
diff changeset
922 if (from)
edff8cc58d66 Avoid an assertion when acking the gmail poke
Paul Aurich <paul@darkrain42.org>
parents: 26921
diff changeset
923 xmlnode_set_attrib(iq->node, "to", from);
26921
bb537c36d92f Ack the mail notification IQ. Refs #8240.
Paul Aurich <paul@darkrain42.org>
parents: 26839
diff changeset
924 xmlnode_set_attrib(iq->node, "id", id);
bb537c36d92f Ack the mail notification IQ. Refs #8240.
Paul Aurich <paul@darkrain42.org>
parents: 26839
diff changeset
925 jabber_iq_send(iq);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
926
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
927 purple_debug(PURPLE_DEBUG_MISC, "jabber",
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
928 "Got new mail notification. Sending request for more info\n");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
929
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
930 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "google:mail:notify");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
931 jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
932 query = xmlnode_get_child(iq->node, "query");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
933
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
934 if (js->gmail_last_time)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
935 xmlnode_set_attrib(query, "newer-than-time", js->gmail_last_time);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
936 if (js->gmail_last_tid)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
937 xmlnode_set_attrib(query, "newer-than-tid", js->gmail_last_tid);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
938
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
939 jabber_iq_send(iq);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
940 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
941 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
942
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
943 void jabber_gmail_init(JabberStream *js) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
944 JabberIq *iq;
27335
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
945 xmlnode *usersetting, *mailnotifications;
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
946
27335
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
947 if (!purple_account_get_check_mail(purple_connection_get_account(js->gc)))
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
948 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
949
27335
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
950 /*
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
951 * Quoting http://code.google.com/apis/talk/jep_extensions/usersettings.html:
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
952 * To ensure better compatibility with other clients, rather than
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
953 * setting this value to "false" to turn off notifications, it is
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
954 * recommended that a client set this to "true" and filter incoming
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
955 * email notifications itself.
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
956 */
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
957 iq = jabber_iq_new(js, JABBER_IQ_SET);
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
958 usersetting = xmlnode_new_child(iq->node, "usersetting");
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
959 xmlnode_set_namespace(usersetting, "google:setting");
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
960 mailnotifications = xmlnode_new_child(usersetting, "mailnotifications");
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
961 xmlnode_set_attrib(mailnotifications, "value", "true");
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
962 jabber_iq_send(iq);
beb33c984100 Fix Google Mail notifications when they inexplicably weren't working. Fixes #3300.
Paul Aurich <paul@darkrain42.org>
parents: 27219
diff changeset
963
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
964 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "google:mail:notify");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
965 jabber_iq_set_callback(iq, jabber_gmail_parse, NULL);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
966 jabber_iq_send(iq);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
967 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
968
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
969 void jabber_google_roster_init(JabberStream *js)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
970 {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
971 JabberIq *iq;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
972 xmlnode *query;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
973
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
974 iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
975 query = xmlnode_get_child(iq->node, "query");
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
976
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
977 xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
978 xmlnode_set_attrib(query, "gr:ext", "2");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
979
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
980 jabber_iq_send(iq);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
981 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
982
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
983 void jabber_google_roster_outgoing(JabberStream *js, xmlnode *query, xmlnode *item)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
984 {
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
985 PurpleAccount *account = purple_connection_get_account(js->gc);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
986 GSList *list = account->deny;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
987 const char *jid = xmlnode_get_attrib(item, "jid");
28015
7f1caec89081 --warnings;
Paul Aurich <paul@darkrain42.org>
parents: 28001
diff changeset
988 char *jid_norm = (char *)jabber_normalize(account, jid);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
989
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
990 while (list) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
991 if (!strcmp(jid_norm, (char*)list->data)) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
992 xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
28001
19d283331b9d Fix a small leak and remove a duplicate xmlnode_set_attrib.
Paul Aurich <paul@darkrain42.org>
parents: 27603
diff changeset
993 xmlnode_set_attrib(query, "gr:ext", "2");
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
994 xmlnode_set_attrib(item, "gr:t", "B");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
995 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
996 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
997 list = list->next;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
998 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
999 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1000
15467
2c81b0a81790 Make deleting Google Talk buddies work
Sean Egan <seanegan@gmail.com>
parents: 15374
diff changeset
1001 gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item)
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1002 {
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1003 PurpleAccount *account = purple_connection_get_account(js->gc);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1004 const char *jid = xmlnode_get_attrib(item, "jid");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1005 gboolean on_block_list = FALSE;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1006
20317
ac46ffeb5b2b applied changes from 6b5f1f48667171fe73de619dd8f80cacd231a2e2
Luke Schierer <lschiere@pidgin.im>
parents: 20281
diff changeset
1007 char *jid_norm;
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1008
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1009 const char *grt = xmlnode_get_attrib_with_namespace(item, "t", "google:roster");
17051
1863cdac4be3 If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@gmail.com>
parents: 16943
diff changeset
1010 const char *subscription = xmlnode_get_attrib(item, "subscription");
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1011
17292
a7c07b57f3e4 This should be better
Sean Egan <seanegan@gmail.com>
parents: 17281
diff changeset
1012 if (!subscription || !strcmp(subscription, "none")) {
17051
1863cdac4be3 If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@gmail.com>
parents: 16943
diff changeset
1013 /* The Google Talk servers will automatically add people from your Gmail address book
1863cdac4be3 If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@gmail.com>
parents: 16943
diff changeset
1014 * with subscription=none. If we see someone with subscription=none, ignore them.
1863cdac4be3 If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@gmail.com>
parents: 16943
diff changeset
1015 */
1863cdac4be3 If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@gmail.com>
parents: 16943
diff changeset
1016 return FALSE;
1863cdac4be3 If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@gmail.com>
parents: 16943
diff changeset
1017 }
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1018
20317
ac46ffeb5b2b applied changes from 6b5f1f48667171fe73de619dd8f80cacd231a2e2
Luke Schierer <lschiere@pidgin.im>
parents: 20281
diff changeset
1019 jid_norm = g_strdup(jabber_normalize(account, jid));
ac46ffeb5b2b applied changes from 6b5f1f48667171fe73de619dd8f80cacd231a2e2
Luke Schierer <lschiere@pidgin.im>
parents: 20281
diff changeset
1020
27570
93a41017dca9 Various roster cleanups. Refs #7008.
Paul Aurich <paul@darkrain42.org>
parents: 27080
diff changeset
1021 on_block_list = NULL != g_slist_find_custom(account->deny, jid_norm,
93a41017dca9 Various roster cleanups. Refs #7008.
Paul Aurich <paul@darkrain42.org>
parents: 27080
diff changeset
1022 (GCompareFunc)strcmp);
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1023
15467
2c81b0a81790 Make deleting Google Talk buddies work
Sean Egan <seanegan@gmail.com>
parents: 15374
diff changeset
1024 if (grt && (*grt == 'H' || *grt == 'h')) {
27570
93a41017dca9 Various roster cleanups. Refs #7008.
Paul Aurich <paul@darkrain42.org>
parents: 27080
diff changeset
1025 /* Hidden; don't show this buddy. */
93a41017dca9 Various roster cleanups. Refs #7008.
Paul Aurich <paul@darkrain42.org>
parents: 27080
diff changeset
1026 GSList *buddies = purple_find_buddies(account, jid_norm);
93a41017dca9 Various roster cleanups. Refs #7008.
Paul Aurich <paul@darkrain42.org>
parents: 27080
diff changeset
1027 if (buddies)
93a41017dca9 Various roster cleanups. Refs #7008.
Paul Aurich <paul@darkrain42.org>
parents: 27080
diff changeset
1028 purple_debug_info("jabber", "Removing %s from local buddy list\n",
93a41017dca9 Various roster cleanups. Refs #7008.
Paul Aurich <paul@darkrain42.org>
parents: 27080
diff changeset
1029 jid_norm);
93a41017dca9 Various roster cleanups. Refs #7008.
Paul Aurich <paul@darkrain42.org>
parents: 27080
diff changeset
1030
93a41017dca9 Various roster cleanups. Refs #7008.
Paul Aurich <paul@darkrain42.org>
parents: 27080
diff changeset
1031 for ( ; buddies; buddies = g_slist_delete_link(buddies, buddies)) {
93a41017dca9 Various roster cleanups. Refs #7008.
Paul Aurich <paul@darkrain42.org>
parents: 27080
diff changeset
1032 purple_blist_remove_buddy(buddies->data);
93a41017dca9 Various roster cleanups. Refs #7008.
Paul Aurich <paul@darkrain42.org>
parents: 27080
diff changeset
1033 }
93a41017dca9 Various roster cleanups. Refs #7008.
Paul Aurich <paul@darkrain42.org>
parents: 27080
diff changeset
1034
18491
8f172a8b8cce Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 18161
diff changeset
1035 g_free(jid_norm);
15467
2c81b0a81790 Make deleting Google Talk buddies work
Sean Egan <seanegan@gmail.com>
parents: 15374
diff changeset
1036 return FALSE;
2c81b0a81790 Make deleting Google Talk buddies work
Sean Egan <seanegan@gmail.com>
parents: 15374
diff changeset
1037 }
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1038
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1039 if (!on_block_list && (grt && (*grt == 'B' || *grt == 'b'))) {
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1040 purple_debug_info("jabber", "Blocking %s\n", jid_norm);
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1041 purple_privacy_deny_add(account, jid_norm, TRUE);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1042 } else if (on_block_list && (!grt || (*grt != 'B' && *grt != 'b' ))){
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1043 purple_debug_info("jabber", "Unblocking %s\n", jid_norm);
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1044 purple_privacy_deny_remove(account, jid_norm, TRUE);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1045 }
18491
8f172a8b8cce Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 18161
diff changeset
1046
8f172a8b8cce Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents: 18161
diff changeset
1047 g_free(jid_norm);
15467
2c81b0a81790 Make deleting Google Talk buddies work
Sean Egan <seanegan@gmail.com>
parents: 15374
diff changeset
1048 return TRUE;
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1049 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1050
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1051 void jabber_google_roster_add_deny(PurpleConnection *gc, const char *who)
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1052 {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1053 JabberStream *js;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1054 GSList *buddies;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1055 JabberIq *iq;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1056 xmlnode *query;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1057 xmlnode *item;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1058 xmlnode *group;
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1059 PurpleBuddy *b;
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1060 JabberBuddy *jb;
25294
8aa7d8bcbc7d Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 25288
diff changeset
1061 const char *balias;
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1062
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1063 js = (JabberStream*)(gc->proto_data);
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1064
27518
739f57076303 keep the compiler happy:
Stu Tomlinson <stu@nosnilmot.com>
parents: 27497
diff changeset
1065 if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1066 return;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1067
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1068 jb = jabber_buddy_find(js, who, TRUE);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1069
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1070 buddies = purple_find_buddies(js->gc->account, who);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1071 if(!buddies)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1072 return;
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1073
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1074 b = buddies->data;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1075
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1076 iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1077
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1078 query = xmlnode_get_child(iq->node, "query");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1079 item = xmlnode_new_child(query, "item");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1080
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1081 while(buddies) {
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1082 PurpleGroup *g;
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1083
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1084 b = buddies->data;
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1085 g = purple_buddy_get_group(b);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1086
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1087 group = xmlnode_new_child(item, "group");
24120
16734635febf Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23399
diff changeset
1088 xmlnode_insert_data(group, purple_group_get_name(g), -1);
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1089
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1090 buddies = buddies->next;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1091 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1092
25294
8aa7d8bcbc7d Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 25288
diff changeset
1093 balias = purple_buddy_get_local_buddy_alias(b);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1094 xmlnode_set_attrib(item, "jid", who);
25294
8aa7d8bcbc7d Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 25288
diff changeset
1095 xmlnode_set_attrib(item, "name", balias ? balias : "");
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1096 xmlnode_set_attrib(item, "gr:t", "B");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1097 xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1098 xmlnode_set_attrib(query, "gr:ext", "2");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1099
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1100 jabber_iq_send(iq);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1101
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1102 /* Synthesize a sign-off */
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1103 if (jb) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1104 JabberBuddyResource *jbr;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1105 GList *l = jb->resources;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1106 while (l) {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1107 jbr = l->data;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1108 if (jbr && jbr->name)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1109 {
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1110 purple_debug(PURPLE_DEBUG_MISC, "jabber", "Removing resource %s\n", jbr->name);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1111 jabber_buddy_remove_resource(jb, jbr->name);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1112 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1113 l = l->next;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1114 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1115 }
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1116 purple_prpl_got_user_status(purple_connection_get_account(gc), who, "offline", NULL);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1117 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1118
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1119 void jabber_google_roster_rem_deny(PurpleConnection *gc, const char *who)
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1120 {
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1121 JabberStream *js;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1122 GSList *buddies;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1123 JabberIq *iq;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1124 xmlnode *query;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1125 xmlnode *item;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1126 xmlnode *group;
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1127 PurpleBuddy *b;
25294
8aa7d8bcbc7d Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 25288
diff changeset
1128 const char *balias;
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1129
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1130 g_return_if_fail(gc != NULL);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1131 g_return_if_fail(who != NULL);
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1132
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1133 js = (JabberStream*)(gc->proto_data);
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1134
27518
739f57076303 keep the compiler happy:
Stu Tomlinson <stu@nosnilmot.com>
parents: 27497
diff changeset
1135 if (!js || !(js->server_caps & JABBER_CAP_GOOGLE_ROSTER))
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1136 return;
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1137
25286
ede22bc33d56 More struct hiding work
Richard Laager <rlaager@wiktel.com>
parents: 23399
diff changeset
1138 buddies = purple_find_buddies(purple_connection_get_account(js->gc), who);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1139 if(!buddies)
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1140 return;
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1141
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1142 b = buddies->data;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1143
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1144 iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster");
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1145
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1146 query = xmlnode_get_child(iq->node, "query");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1147 item = xmlnode_new_child(query, "item");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1148
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1149 while(buddies) {
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1150 PurpleGroup *g;
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1151
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1152 b = buddies->data;
15823
32c366eeeb99 sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@gmail.com>
parents: 15523
diff changeset
1153 g = purple_buddy_get_group(b);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1154
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1155 group = xmlnode_new_child(item, "group");
24120
16734635febf Start hiding blist.h internals in prpls.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 23399
diff changeset
1156 xmlnode_insert_data(group, purple_group_get_name(g), -1);
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1157
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1158 buddies = buddies->next;
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1159 }
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1160
25294
8aa7d8bcbc7d Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 25288
diff changeset
1161 balias = purple_buddy_get_local_buddy_alias(b);
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1162 xmlnode_set_attrib(item, "jid", who);
25294
8aa7d8bcbc7d Alias foo. I think blist.h structs are now completely hidden.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents: 25288
diff changeset
1163 xmlnode_set_attrib(item, "name", balias ? balias : "");
15374
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1164 xmlnode_set_attrib(query, "xmlns:gr", "google:roster");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1165 xmlnode_set_attrib(query, "gr:ext", "2");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1166
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1167 jabber_iq_send(iq);
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1168
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1169 /* See if he's online */
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1170 jabber_presence_subscription_set(js, who, "probe");
5fe8042783c1 Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff changeset
1171 }
15523
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1172
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1173 /* This does two passes on the string. The first pass goes through
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1174 * and determine if all the structured text is properly balanced, and
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1175 * how many instances of each there is. The second pass goes and converts
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1176 * everything to HTML, depending on what's figured out by the first pass.
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1177 * It will short circuit once it knows it has no more replacements to make
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1178 */
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1179 char *jabber_google_format_to_html(const char *text)
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1180 {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1181 const char *p;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1182
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1183 /* The start of the screen may be consdiered a space for this purpose */
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1184 gboolean preceding_space = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1185
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1186 gboolean in_bold = FALSE, in_italic = FALSE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1187 gboolean in_tag = FALSE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1188
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1189 gint bold_count = 0, italic_count = 0;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1190
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1191 GString *str;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1192
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1193 for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1194 gunichar c = g_utf8_get_char(p);
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1195 if (c == '*' && !in_tag) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1196 if (in_bold && (g_unichar_isspace(*(p+1)) ||
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1197 *(p+1) == '\0' ||
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1198 *(p+1) == '<')) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1199 bold_count++;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1200 in_bold = FALSE;
16943
3d0aec991e5d Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@gmail.com>
parents: 15823
diff changeset
1201 } else if (preceding_space && !in_bold && !g_unichar_isspace(*(p+1))) {
15523
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1202 bold_count++;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1203 in_bold = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1204 }
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1205 preceding_space = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1206 } else if (c == '_' && !in_tag) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1207 if (in_italic && (g_unichar_isspace(*(p+1)) ||
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1208 *(p+1) == '\0' ||
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1209 *(p+1) == '<')) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1210 italic_count++;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1211 in_italic = FALSE;
16943
3d0aec991e5d Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@gmail.com>
parents: 15823
diff changeset
1212 } else if (preceding_space && !in_italic && !g_unichar_isspace(*(p+1))) {
15523
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1213 italic_count++;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1214 in_italic = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1215 }
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1216 preceding_space = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1217 } else if (c == '<' && !in_tag) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1218 in_tag = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1219 } else if (c == '>' && in_tag) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1220 in_tag = FALSE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1221 } else if (!in_tag) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1222 if (g_unichar_isspace(c))
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1223 preceding_space = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1224 else
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1225 preceding_space = FALSE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1226 }
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1227 }
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1228
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1229 str = g_string_new(NULL);
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1230 in_bold = in_italic = in_tag = FALSE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1231 preceding_space = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1232
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1233 for (p = text; *p != '\0'; p = g_utf8_next_char(p)) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1234 gunichar c = g_utf8_get_char(p);
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1235
15523
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1236 if (bold_count < 2 && italic_count < 2 && !in_bold && !in_italic) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1237 g_string_append(str, p);
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1238 return g_string_free(str, FALSE);
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1239 }
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1240
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1241
15523
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1242 if (c == '*' && !in_tag) {
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1243 if (in_bold &&
15523
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1244 (g_unichar_isspace(*(p+1))||*(p+1)=='<')) { /* This is safe in UTF-8 */
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1245 str = g_string_append(str, "</b>");
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1246 in_bold = FALSE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1247 bold_count--;
16943
3d0aec991e5d Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@gmail.com>
parents: 15823
diff changeset
1248 } else if (preceding_space && bold_count > 1 && !g_unichar_isspace(*(p+1))) {
15523
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1249 str = g_string_append(str, "<b>");
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1250 bold_count--;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1251 in_bold = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1252 } else {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1253 str = g_string_append_unichar(str, c);
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1254 }
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1255 preceding_space = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1256 } else if (c == '_' && !in_tag) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1257 if (in_italic &&
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1258 (g_unichar_isspace(*(p+1))||*(p+1)=='<')) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1259 str = g_string_append(str, "</i>");
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1260 italic_count--;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1261 in_italic = FALSE;
16943
3d0aec991e5d Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@gmail.com>
parents: 15823
diff changeset
1262 } else if (preceding_space && italic_count > 1 && !g_unichar_isspace(*(p+1))) {
15523
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1263 str = g_string_append(str, "<i>");
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1264 italic_count--;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1265 in_italic = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1266 } else {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1267 str = g_string_append_unichar(str, c);
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1268 }
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1269 preceding_space = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1270 } else if (c == '<' && !in_tag) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1271 str = g_string_append_unichar(str, c);
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1272 in_tag = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1273 } else if (c == '>' && in_tag) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1274 str = g_string_append_unichar(str, c);
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1275 in_tag = FALSE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1276 } else if (!in_tag) {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1277 str = g_string_append_unichar(str, c);
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1278 if (g_unichar_isspace(c))
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1279 preceding_space = TRUE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1280 else
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1281 preceding_space = FALSE;
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1282 } else {
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1283 str = g_string_append_unichar(str, c);
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1284 }
18161
3a1a9e8c1506 whitespace
Nathan Walp <nwalp@pidgin.im>
parents: 17292
diff changeset
1285 }
15523
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1286 return g_string_free(str, FALSE);
ccbdf500f13a Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents: 15467
diff changeset
1287 }
20571
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1288
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1289 void jabber_google_presence_incoming(JabberStream *js, const char *user, JabberBuddyResource *jbr)
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1290 {
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1291 if (!js->googletalk)
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1292 return;
27562
834236111afc We have a convenience function to do this. Also, plug a leak of the status
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27518
diff changeset
1293 if (jbr->status && purple_str_has_prefix(jbr->status, "♫ ")) {
20571
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1294 purple_prpl_got_user_status(js->gc->account, user, "tune",
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1295 PURPLE_TUNE_TITLE, jbr->status + strlen("♫ "), NULL);
27562
834236111afc We have a convenience function to do this. Also, plug a leak of the status
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27518
diff changeset
1296 g_free(jbr->status);
20571
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1297 jbr->status = NULL;
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1298 } else {
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1299 purple_prpl_got_user_status_deactive(js->gc->account, user, "tune");
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1300 }
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1301 }
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1302
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1303 char *jabber_google_presence_outgoing(PurpleStatus *tune)
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1304 {
21634
1853d9d0cc65 don't set the current tune title if it's NULL
Ka-Hing Cheung <khc@hxbc.us>
parents: 21220
diff changeset
1305 const char *attr = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE);
1853d9d0cc65 don't set the current tune title if it's NULL
Ka-Hing Cheung <khc@hxbc.us>
parents: 21220
diff changeset
1306 return attr ? g_strdup_printf("♫ %s", attr) : g_strdup("");
20571
c97e3ab9ef11 Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents: 20211
diff changeset
1307 }
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1308
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1309 static void
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
1310 jabber_google_stun_lookup_cb(GSList *hosts, gpointer data,
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1311 const char *error_message)
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1312 {
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1313 JabberStream *js = (JabberStream *) data;
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1314
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1315 if (error_message) {
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1316 purple_debug_error("jabber", "Google STUN lookup failed: %s\n",
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1317 error_message);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1318 g_slist_free(hosts);
28388
76c0969e3ea7 jabber: Unset the PurpleDnsQueryData when a query fails. Refs #9274.
Paul Aurich <paul@darkrain42.org>
parents: 28137
diff changeset
1319 js->stun_query = NULL;
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1320 return;
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1321 }
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1322
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1323 if (hosts && g_slist_next(hosts)) {
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
1324 struct sockaddr *addr = g_slist_next(hosts)->data;
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1325 char dst[INET6_ADDRSTRLEN];
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1326 int port;
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1327
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1328 if (addr->sa_family == AF_INET6) {
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
1329 inet_ntop(addr->sa_family, &((struct sockaddr_in6 *) addr)->sin6_addr,
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1330 dst, sizeof(dst));
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1331 port = ntohs(((struct sockaddr_in6 *) addr)->sin6_port);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1332 } else {
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
1333 inet_ntop(addr->sa_family, &((struct sockaddr_in *) addr)->sin_addr,
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1334 dst, sizeof(dst));
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1335 port = ntohs(((struct sockaddr_in *) addr)->sin_port);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1336 }
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1337
28389
ed30bc20442c jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <paul@darkrain42.org>
parents: 28388
diff changeset
1338 if (js->stun_ip)
ed30bc20442c jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <paul@darkrain42.org>
parents: 28388
diff changeset
1339 g_free(js->stun_ip);
ed30bc20442c jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <paul@darkrain42.org>
parents: 28388
diff changeset
1340 js->stun_ip = g_strdup(dst);
ed30bc20442c jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <paul@darkrain42.org>
parents: 28388
diff changeset
1341 js->stun_port = port;
ed30bc20442c jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <paul@darkrain42.org>
parents: 28388
diff changeset
1342
ed30bc20442c jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <paul@darkrain42.org>
parents: 28388
diff changeset
1343 purple_debug_info("jabber", "set Google STUN IP/port address: "
ed30bc20442c jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <paul@darkrain42.org>
parents: 28388
diff changeset
1344 "%s:%d\n", dst, port);
ed30bc20442c jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <paul@darkrain42.org>
parents: 28388
diff changeset
1345
ed30bc20442c jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <paul@darkrain42.org>
parents: 28388
diff changeset
1346 /* unmark ongoing query */
ed30bc20442c jabber: Simplify; js is the callback data and can't be NULL.
Paul Aurich <paul@darkrain42.org>
parents: 28388
diff changeset
1347 js->stun_query = NULL;
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1348 }
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1349
26633
5d1140b0b10a Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents: 26606
diff changeset
1350 while (hosts != NULL) {
5d1140b0b10a Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents: 26606
diff changeset
1351 hosts = g_slist_delete_link(hosts, hosts);
5d1140b0b10a Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents: 26606
diff changeset
1352 /* Free the address */
5d1140b0b10a Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents: 26606
diff changeset
1353 g_free(hosts->data);
5d1140b0b10a Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents: 26606
diff changeset
1354 hosts = g_slist_delete_link(hosts, hosts);
5d1140b0b10a Don't leak the struct sockaddr* from purple_dnsquery_a.
Paul Aurich <paul@darkrain42.org>
parents: 26606
diff changeset
1355 }
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1356 }
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1357
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1358 static void
26553
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1359 jabber_google_jingle_info_common(JabberStream *js, const char *from,
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1360 JabberIqType type, xmlnode *query)
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1361 {
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1362 const xmlnode *stun = xmlnode_get_child(query, "stun");
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1363 gchar *my_bare_jid;
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1364
26553
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1365 /*
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1366 * Make sure that random people aren't sending us STUN servers. Per
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1367 * http://code.google.com/apis/talk/jep_extensions/jingleinfo.html, these
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1368 * stanzas are stamped from our bare JID.
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1369 */
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1370 if (from) {
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1371 my_bare_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1372 if (!purple_strequal(from, my_bare_jid)) {
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1373 purple_debug_warning("jabber", "got google:jingleinfo with invalid from (%s)\n",
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1374 from);
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1375 g_free(my_bare_jid);
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1376 return;
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1377 }
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1378
26553
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1379 g_free(my_bare_jid);
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1380 }
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1381
26553
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1382 if (type == JABBER_IQ_ERROR || type == JABBER_IQ_GET)
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1383 return;
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1384
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1385 purple_debug_info("jabber", "got google:jingleinfo\n");
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1386
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1387 if (stun) {
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1388 xmlnode *server = xmlnode_get_child(stun, "server");
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1389
26553
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1390 if (server) {
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1391 const gchar *host = xmlnode_get_attrib(server, "host");
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1392 const gchar *udp = xmlnode_get_attrib(server, "udp");
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1393
26553
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1394 if (host && udp) {
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1395 int port = atoi(udp);
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
1396 /* if there, would already be an ongoing query,
26553
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1397 cancel it */
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1398 if (js->stun_query)
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1399 purple_dnsquery_destroy(js->stun_query);
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1400
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
1401 js->stun_query = purple_dnsquery_a(host, port,
26553
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1402 jabber_google_stun_lookup_cb, js);
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1403 }
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1404 }
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1405 }
26553
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1406 /* should perhaps handle relays later on, or maybe wait until
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1407 Google supports a common standard... */
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1408 }
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1409
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1410 static void
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1411 jabber_google_jingle_info_cb(JabberStream *js, const char *from,
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1412 JabberIqType type, const char *id,
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1413 xmlnode *packet, gpointer data)
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1414 {
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1415 xmlnode *query = xmlnode_get_child_with_namespace(packet, "query",
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1416 GOOGLE_JINGLE_INFO_NAMESPACE);
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1417
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1418 if (query)
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1419 jabber_google_jingle_info_common(js, from, type, query);
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1420 else
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1421 purple_debug_warning("jabber", "Got invalid google:jingleinfo\n");
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1422 }
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1423
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1424 void
26553
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1425 jabber_google_handle_jingle_info(JabberStream *js, const char *from,
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1426 JabberIqType type, const char *id,
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1427 xmlnode *child)
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1428 {
26553
91583903b478 Migrate googleinfo:jabber handlers and add some safety checks.
Paul Aurich <paul@darkrain42.org>
parents: 26552
diff changeset
1429 jabber_google_jingle_info_common(js, from, type, child);
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1430 }
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1431
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1432 void
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1433 jabber_google_send_jingle_info(JabberStream *js)
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1434 {
27014
a8537bbcfb79 Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents: 26942
diff changeset
1435 JabberIq *jingle_info =
26162
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1436 jabber_iq_new_query(js, JABBER_IQ_GET, GOOGLE_JINGLE_INFO_NAMESPACE);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1437
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1438 jabber_iq_set_callback(jingle_info, jabber_google_jingle_info_cb,
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1439 NULL);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1440 purple_debug_info("jabber", "sending google:jingleinfo query\n");
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1441 jabber_iq_send(jingle_info);
88f183f7dfc7 Add automatic discovery of GTalk STUN servers when using a Gtalk account
Marcus Lundblad <ml@update.uu.se>
parents: 26140
diff changeset
1442 }