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