Mercurial > pidgin.yaz
annotate libpurple/protocols/jabber/google.c @ 26122:5d9a97a23d6e
Remove some of the deprecated API.
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Tue, 13 Jan 2009 13:43:13 +0000 |
parents | 7bbac147f276 |
children | ac56e5707a72 |
rev | line source |
---|---|
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1 /** |
15823 | 2 * Purple is the legal property of its developers, whose names are too numerous |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
3 * to list here. Please refer to the COPYRIGHT file distributed with this |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
4 * source distribution. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
5 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
6 * This program is free software; you can redistribute it and/or modify |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
7 * it under the terms of the GNU General Public License as published by |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
8 * the Free Software Foundation; either version 2 of the License, or |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
9 * (at your option) any later version. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
10 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
11 * This program is distributed in the hope that it will be useful, |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
14 * GNU General Public License for more details. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
15 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
16 * You should have received a copy of the GNU General Public License |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
17 * along with this program; if not, write to the Free Software |
19680
44b4e8bd759b
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
18751
diff
changeset
|
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
19 */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
20 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
21 #include "internal.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
22 #include "debug.h" |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
23 #include "mediamanager.h" |
15523
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
24 #include "util.h" |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
25 #include "privacy.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
26 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
27 #include "buddy.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
28 #include "google.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
29 #include "jabber.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
30 #include "presence.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
31 #include "iq.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
32 |
25654
cbe97caec684
Use USE_VV instead of USE_FARSIGHT.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25650
diff
changeset
|
33 #ifdef USE_VV |
25650
4b9b265a8100
Fix compiling with the --disable-vv switch.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25647
diff
changeset
|
34 |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
35 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
|
36 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
|
37 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
|
38 } 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
|
39 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
40 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
|
41 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
|
42 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
|
43 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
|
44 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
|
45 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
|
46 } 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
|
47 |
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 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
|
49 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
|
50 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
|
51 PurpleMedia *media; |
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 JabberStream *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
|
53 char *remote_jid; |
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 } 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
|
55 |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
56 GHashTable *sessions = NULL; |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
57 |
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 static guint |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
59 google_session_id_hash(gconstpointer key) |
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 { |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
61 GoogleSessionId *id = (GoogleSessionId*)key; |
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 |
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 guint id_hash = g_str_hash(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
|
64 guint init_hash = g_str_hash(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
|
65 |
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 return 23 * id_hash + init_hash; |
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 } |
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 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
69 static gboolean |
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 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
|
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 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
|
73 GoogleSessionId *d = (GoogleSessionId*)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
|
74 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
75 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
|
76 } |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
77 |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
78 static void |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
79 google_session_destroy(GoogleSession *session) |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
80 { |
26088
d703474d6b81
Fix a GLib warning when add_stream fails in google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26083
diff
changeset
|
81 if (sessions != NULL) |
d703474d6b81
Fix a GLib warning when add_stream fails in google.c.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26083
diff
changeset
|
82 g_hash_table_remove(sessions, &(session->id)); |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
83 g_free(session->id.id); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
84 g_free(session->id.initiator); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
85 g_free(session->remote_jid); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
86 g_free(session); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
87 } |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
88 |
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 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
|
90 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
|
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 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
|
93 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
|
94 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
|
95 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
|
96 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
|
97 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
|
98 } |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
99 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
100 static void |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
101 google_session_send_terminate(GoogleSession *session) |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
102 { |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
103 xmlnode *sess; |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
104 JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
105 |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
106 xmlnode_set_attrib(iq->node, "to", session->remote_jid); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
107 sess = google_session_create_xmlnode(session, "terminate"); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
108 xmlnode_insert_child(iq->node, sess); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
109 |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
110 jabber_iq_send(iq); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
111 google_session_destroy(session); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
112 } |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
113 |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
114 static void |
26113
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
115 google_session_send_candidates(PurpleMedia *media, gchar *session_id, |
26040
0101d6e97f12
Very basic receive only GTalk audio sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26036
diff
changeset
|
116 gchar *participant, GoogleSession *session) |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
117 { |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
118 JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET); |
25671
12a16471f94e
Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25654
diff
changeset
|
119 GList *candidates = purple_media_get_local_candidates(session->media, "google-voice", |
12a16471f94e
Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25654
diff
changeset
|
120 session->remote_jid); |
26103
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
121 PurpleMediaCandidate *transport; |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
122 xmlnode *sess; |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
123 xmlnode *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
|
124 sess = google_session_create_xmlnode(session, "candidates"); |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
125 xmlnode_insert_child(iq->node, sess); |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
126 xmlnode_set_attrib(iq->node, "to", session->remote_jid); |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
127 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
128 for (;candidates;candidates = candidates->next) { |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
129 char port[8]; |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
130 char pref[8]; |
26103
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
131 transport = (PurpleMediaCandidate*)(candidates->data); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
132 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
133 if (!strcmp(transport->ip, "127.0.0.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
|
134 continue; |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
135 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
136 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
|
137 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
138 g_snprintf(port, sizeof(port), "%d", transport->port); |
25647
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
139 g_snprintf(pref, sizeof(pref), "%d", transport->priority); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
140 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
141 xmlnode_set_attrib(candidate, "address", transport->ip); |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
142 xmlnode_set_attrib(candidate, "port", port); |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
143 xmlnode_set_attrib(candidate, "name", "rtp"); |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
144 xmlnode_set_attrib(candidate, "username", transport->username); |
26077
2a1873a30474
Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26075
diff
changeset
|
145 /* |
2a1873a30474
Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26075
diff
changeset
|
146 * As of this writing, Farsight 2 in Google compatibility |
2a1873a30474
Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26075
diff
changeset
|
147 * mode doesn't provide a password. The Gmail client |
2a1873a30474
Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26075
diff
changeset
|
148 * requires this to be set. |
2a1873a30474
Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26075
diff
changeset
|
149 */ |
2a1873a30474
Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26075
diff
changeset
|
150 xmlnode_set_attrib(candidate, "password", |
2a1873a30474
Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26075
diff
changeset
|
151 transport->password != NULL ? |
2a1873a30474
Fix receiving voice calls from Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26075
diff
changeset
|
152 transport->password : ""); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
153 xmlnode_set_attrib(candidate, "preference", pref); |
26103
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
154 xmlnode_set_attrib(candidate, "protocol", transport->proto == |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
155 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP ? "udp" : "tcp"); |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
156 xmlnode_set_attrib(candidate, "type", transport->type == |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
157 PURPLE_MEDIA_CANDIDATE_TYPE_HOST ? "local" : |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
158 transport->type == |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
159 PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX ? "stun" : |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
160 transport->type == |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
161 PURPLE_MEDIA_CANDIDATE_TYPE_RELAY ? "relay" : NULL); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
162 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
|
163 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
|
164 xmlnode_insert_child(sess, 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
|
165 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
166 } |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
167 jabber_iq_send(iq); |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
168 } |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
169 |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
170 static void |
26081
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
171 google_session_ready(PurpleMedia *media, gchar *id, |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
172 gchar *participant, GoogleSession *session) |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
173 { |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
174 if (id == NULL && participant == NULL) { |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
175 gchar *me = g_strdup_printf("%s@%s/%s", |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
176 session->js->user->node, |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
177 session->js->user->domain, |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
178 session->js->user->resource); |
26113
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
179 JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
180 xmlnode *sess, *desc, *payload; |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
181 GList *codecs, *iter; |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
182 |
26081
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
183 if (!strcmp(session->id.initiator, me)) { |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
184 xmlnode_set_attrib(iq->node, "to", session->remote_jid); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
185 xmlnode_set_attrib(iq->node, "from", session->id.initiator); |
26113
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
186 sess = google_session_create_xmlnode(session, "initiate"); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
187 } else { |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
188 xmlnode_set_attrib(iq->node, "to", session->remote_jid); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
189 xmlnode_set_attrib(iq->node, "from", me); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
190 sess = google_session_create_xmlnode(session, "accept"); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
191 } |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
192 xmlnode_insert_child(iq->node, sess); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
193 desc = xmlnode_new_child(sess, "description"); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
194 xmlnode_set_namespace(desc, "http://www.google.com/session/phone"); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
195 |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
196 codecs = purple_media_get_codecs(media, "google-voice"); |
26081
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
197 |
26113
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
198 for (iter = codecs; iter; iter = g_list_next(iter)) { |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
199 PurpleMediaCodec *codec = (PurpleMediaCodec*)iter->data; |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
200 gchar *id = g_strdup_printf("%d", codec->id); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
201 gchar *clock_rate = g_strdup_printf("%d", codec->clock_rate); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
202 payload = xmlnode_new_child(desc, "payload-type"); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
203 xmlnode_set_attrib(payload, "id", id); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
204 xmlnode_set_attrib(payload, "name", codec->encoding_name); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
205 xmlnode_set_attrib(payload, "clockrate", clock_rate); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
206 g_free(clock_rate); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
207 g_free(id); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
208 } |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
209 purple_media_codec_list_free(codecs); |
26081
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
210 |
26113
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
211 jabber_iq_send(iq); |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
212 |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
213 google_session_send_candidates(session->media, |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
214 "google-voice", session->remote_jid, session); |
26081
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
215 } |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
216 } |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
217 |
26112
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
218 static void |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
219 google_session_state_changed_cb(PurpleMedia *media, |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
220 PurpleMediaStateChangedType type, |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
221 gchar *sid, gchar *name, GoogleSession *session) |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
222 { |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
223 if (sid == NULL && name == NULL) { |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
224 if (type == PURPLE_MEDIA_STATE_CHANGED_END) { |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
225 google_session_destroy(session); |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
226 } else if (type == PURPLE_MEDIA_STATE_CHANGED_HANGUP) { |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
227 xmlnode *sess; |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
228 JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET); |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
229 |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
230 xmlnode_set_attrib(iq->node, "to", session->remote_jid); |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
231 sess = google_session_create_xmlnode(session, "terminate"); |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
232 xmlnode_insert_child(iq->node, sess); |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
233 |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
234 jabber_iq_send(iq); |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
235 } else if (type == PURPLE_MEDIA_STATE_CHANGED_REJECTED) { |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
236 xmlnode *sess; |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
237 JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET); |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
238 |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
239 xmlnode_set_attrib(iq->node, "to", session->remote_jid); |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
240 sess = google_session_create_xmlnode(session, "reject"); |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
241 xmlnode_insert_child(iq->node, sess); |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
242 |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
243 jabber_iq_send(iq); |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
244 } |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
245 |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
246 } |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
247 } |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
248 |
26081
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
249 PurpleMedia* |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
250 jabber_google_session_initiate(JabberStream *js, const gchar *who, PurpleMediaSessionType type) |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
251 { |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
252 GoogleSession *session; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
253 JabberBuddy *jb; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
254 JabberBuddyResource *jbr; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
255 gchar *jid; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
256 GParameter param; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
257 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
258 /* construct JID to send to */ |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
259 jb = jabber_buddy_find(js, who, FALSE); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
260 if (!jb) { |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
261 purple_debug_error("jingle-rtp", |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
262 "Could not find Jabber buddy\n"); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
263 return NULL; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
264 } |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
265 jbr = jabber_buddy_find_resource(jb, NULL); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
266 if (!jbr) { |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
267 purple_debug_error("jingle-rtp", |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
268 "Could not find buddy's resource\n"); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
269 } |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
270 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
271 if ((strchr(who, '/') == NULL) && jbr && (jbr->name != NULL)) { |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
272 jid = g_strdup_printf("%s/%s", who, jbr->name); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
273 } else { |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
274 jid = g_strdup(who); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
275 } |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
276 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
277 session = g_new0(GoogleSession, 1); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
278 session->id.id = jabber_get_next_id(js); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
279 session->id.initiator = g_strdup_printf("%s@%s/%s", js->user->node, |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
280 js->user->domain, js->user->resource); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
281 session->state = SENT_INITIATE; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
282 session->js = js; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
283 session->remote_jid = jid; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
284 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
285 session->media = purple_media_manager_create_media( |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
286 purple_media_manager_get(), js->gc, |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
287 "fsrtpconference", session->remote_jid, TRUE); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
288 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
289 /* GTalk requires the NICE_COMPATIBILITY_GOOGLE param */ |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
290 param.name = "compatibility-mode"; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
291 memset(¶m.value, 0, sizeof(GValue)); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
292 g_value_init(¶m.value, G_TYPE_UINT); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
293 g_value_set_uint(¶m.value, 1); /* NICE_COMPATIBILITY_GOOGLE */ |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
294 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
295 if (purple_media_add_stream(session->media, "google-voice", |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
296 session->remote_jid, PURPLE_MEDIA_AUDIO, |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
297 "nice", 1, ¶m) == FALSE) { |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
298 purple_media_error(session->media, "Error adding stream."); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
299 purple_media_hangup(session->media); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
300 google_session_destroy(session); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
301 return NULL; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
302 } |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
303 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
304 g_signal_connect(G_OBJECT(session->media), "ready-new", |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
305 G_CALLBACK(google_session_ready), session); |
26112
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
306 g_signal_connect(G_OBJECT(session->media), "state-changed", |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
307 G_CALLBACK(google_session_state_changed_cb), session); |
26081
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
308 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
309 if (sessions == NULL) |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
310 sessions = g_hash_table_new(google_session_id_hash, |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
311 google_session_id_equal); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
312 g_hash_table_insert(sessions, &(session->id), session); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
313 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
314 return session->media; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
315 } |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
316 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
317 static void |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
318 google_session_handle_initiate(JabberStream *js, GoogleSession *session, xmlnode *packet, xmlnode *sess) |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
319 { |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
320 JabberIq *result; |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
321 GList *codecs = NULL; |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
322 xmlnode *desc_element, *codec_element; |
26106
ac4d7695dbc7
Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26103
diff
changeset
|
323 PurpleMediaCodec *codec; |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
324 const char *id, *encoding_name, *clock_rate; |
26040
0101d6e97f12
Very basic receive only GTalk audio sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26036
diff
changeset
|
325 GParameter param; |
25637
92e71f6e10d4
Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25557
diff
changeset
|
326 |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
327 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
|
328 purple_debug_error("jabber", "Received initiate for active session.\n"); |
25647
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
329 return; |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
330 } |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
331 |
25647
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
332 session->media = purple_media_manager_create_media(purple_media_manager_get(), js->gc, |
26063
c7d4b67b3332
Add initiator property to PurpleMedia.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26040
diff
changeset
|
333 "fsrtpconference", session->remote_jid, FALSE); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
334 |
26040
0101d6e97f12
Very basic receive only GTalk audio sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26036
diff
changeset
|
335 /* GTalk requires the NICE_COMPATIBILITY_GOOGLE param */ |
0101d6e97f12
Very basic receive only GTalk audio sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26036
diff
changeset
|
336 param.name = "compatibility-mode"; |
0101d6e97f12
Very basic receive only GTalk audio sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26036
diff
changeset
|
337 memset(¶m.value, 0, sizeof(GValue)); |
0101d6e97f12
Very basic receive only GTalk audio sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26036
diff
changeset
|
338 g_value_init(¶m.value, G_TYPE_UINT); |
0101d6e97f12
Very basic receive only GTalk audio sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26036
diff
changeset
|
339 g_value_set_uint(¶m.value, 1); /* NICE_COMPATIBILITY_GOOGLE */ |
0101d6e97f12
Very basic receive only GTalk audio sessions.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26036
diff
changeset
|
340 |
26075
f45301cc2c84
End google call if stream creation fails.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26063
diff
changeset
|
341 if (purple_media_add_stream(session->media, "google-voice", session->remote_jid, |
f45301cc2c84
End google call if stream creation fails.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26063
diff
changeset
|
342 PURPLE_MEDIA_AUDIO, "nice", 1, ¶m) == FALSE) { |
f45301cc2c84
End google call if stream creation fails.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26063
diff
changeset
|
343 purple_media_error(session->media, "Error adding stream."); |
f45301cc2c84
End google call if stream creation fails.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26063
diff
changeset
|
344 purple_media_hangup(session->media); |
f45301cc2c84
End google call if stream creation fails.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26063
diff
changeset
|
345 google_session_send_terminate(session); |
f45301cc2c84
End google call if stream creation fails.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26063
diff
changeset
|
346 return; |
f45301cc2c84
End google call if stream creation fails.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26063
diff
changeset
|
347 } |
25647
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
348 |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
349 desc_element = xmlnode_get_child(sess, "description"); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
350 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
351 for (codec_element = xmlnode_get_child(desc_element, "payload-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
|
352 codec_element; |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
353 codec_element = xmlnode_get_next_twin(codec_element)) { |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
354 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
|
355 id = xmlnode_get_attrib(codec_element, "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
|
356 clock_rate = xmlnode_get_attrib(codec_element, "clockrate"); |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
357 |
26106
ac4d7695dbc7
Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26103
diff
changeset
|
358 codec = purple_media_codec_new(atoi(id), encoding_name, PURPLE_MEDIA_AUDIO, |
25647
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
359 clock_rate ? atoi(clock_rate) : 0); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
360 codecs = g_list_append(codecs, codec); |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
361 } |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
362 |
25671
12a16471f94e
Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25654
diff
changeset
|
363 purple_media_set_remote_codecs(session->media, "google-voice", session->remote_jid, codecs); |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
364 |
26113
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
365 g_signal_connect(G_OBJECT(session->media), "ready-new", |
7bbac147f276
Convert the GTalk code to completely use the new ready signal.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26112
diff
changeset
|
366 G_CALLBACK(google_session_ready), session); |
26112
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
367 g_signal_connect(G_OBJECT(session->media), "state-changed", |
027ce238eb40
Use the state-changed signal in GTalk code.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26106
diff
changeset
|
368 G_CALLBACK(google_session_state_changed_cb), session); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
369 |
26106
ac4d7695dbc7
Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26103
diff
changeset
|
370 purple_media_codec_list_free(codecs); |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
371 |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
372 result = jabber_iq_new(js, JABBER_IQ_RESULT); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
373 jabber_iq_set_id(result, xmlnode_get_attrib(packet, "id")); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
374 xmlnode_set_attrib(result->node, "to", session->remote_jid); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
375 jabber_iq_send(result); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
376 } |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
377 |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
378 static void |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
379 google_session_handle_candidates(JabberStream *js, GoogleSession *session, xmlnode *packet, xmlnode *sess) |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
380 { |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
381 JabberIq *result; |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
382 GList *list = NULL; |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
383 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
|
384 static int name = 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
|
385 char n[4]; |
25637
92e71f6e10d4
Patch from Marcus Lundblad ('mlundblad') to improve audio support in xmpp.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
25557
diff
changeset
|
386 |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
387 for (cand = xmlnode_get_child(sess, "candidate"); cand; cand = xmlnode_get_next_twin(cand)) { |
26103
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
388 PurpleMediaCandidate *info; |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
389 g_snprintf(n, sizeof(n), "S%d", name++); |
26103
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
390 info = purple_media_candidate_new(n, PURPLE_MEDIA_COMPONENT_RTP, |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
391 !strcmp(xmlnode_get_attrib(cand, "type"), "local") ? |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
392 PURPLE_MEDIA_CANDIDATE_TYPE_HOST : |
25647
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
393 !strcmp(xmlnode_get_attrib(cand, "type"), "stun") ? |
26103
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
394 PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX : |
25647
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
395 !strcmp(xmlnode_get_attrib(cand, "type"), "relay") ? |
26103
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
396 PURPLE_MEDIA_CANDIDATE_TYPE_RELAY : |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
397 PURPLE_MEDIA_CANDIDATE_TYPE_HOST, |
25647
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
398 !strcmp(xmlnode_get_attrib(cand, "protocol"),"udp") ? |
26103
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
399 PURPLE_MEDIA_NETWORK_PROTOCOL_UDP : |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
400 PURPLE_MEDIA_NETWORK_PROTOCOL_TCP, |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
401 xmlnode_get_attrib(cand, "address"), |
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
402 atoi(xmlnode_get_attrib(cand, "port"))); |
25647
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
403 |
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
404 info->username = g_strdup(xmlnode_get_attrib(cand, "username")); |
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
405 info->password = g_strdup(xmlnode_get_attrib(cand, "password")); |
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
406 |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
407 list = g_list_append(list, info); |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
408 } |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
409 |
25671
12a16471f94e
Refactored PurpleMedia to make creating audio or video sessions virtually identical. Audio, video, and audio/video sessions now work. Also added videotestsrc to the video plugin preference.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25654
diff
changeset
|
410 purple_media_add_remote_candidates(session->media, "google-voice", session->remote_jid, list); |
26103
f7cf50180e1d
Duplicate FsCandidate to remove it from the public interface.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26093
diff
changeset
|
411 purple_media_candidate_list_free(list); |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
412 |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
413 result = jabber_iq_new(js, JABBER_IQ_RESULT); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
414 jabber_iq_set_id(result, xmlnode_get_attrib(packet, "id")); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
415 xmlnode_set_attrib(result->node, "to", session->remote_jid); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
416 jabber_iq_send(result); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
417 } |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
418 |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
419 static void |
26081
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
420 google_session_handle_accept(JabberStream *js, GoogleSession *session, xmlnode *packet, xmlnode *sess) |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
421 { |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
422 xmlnode *desc_element = xmlnode_get_child(sess, "description"); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
423 xmlnode *codec_element = xmlnode_get_child(desc_element, "payload-type"); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
424 GList *codecs = NULL; |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
425 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
426 for (; codec_element; codec_element = |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
427 xmlnode_get_next_twin(codec_element)) { |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
428 const gchar *encoding_name = |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
429 xmlnode_get_attrib(codec_element, "name"); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
430 const gchar *id = xmlnode_get_attrib(codec_element, "id"); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
431 const gchar *clock_rate = |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
432 xmlnode_get_attrib(codec_element, "clockrate"); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
433 |
26106
ac4d7695dbc7
Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26103
diff
changeset
|
434 PurpleMediaCodec *codec = purple_media_codec_new(atoi(id), |
ac4d7695dbc7
Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26103
diff
changeset
|
435 encoding_name, PURPLE_MEDIA_AUDIO, |
ac4d7695dbc7
Wrap FsCodec and remove the Farsight2 include from media.h.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26103
diff
changeset
|
436 clock_rate ? atoi(clock_rate) : 0); |
26081
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
437 codecs = g_list_append(codecs, codec); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
438 } |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
439 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
440 purple_media_set_remote_codecs(session->media, "google-voice", |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
441 session->remote_jid, codecs); |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
442 |
26122
5d9a97a23d6e
Remove some of the deprecated API.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26113
diff
changeset
|
443 purple_media_accept(session->media); |
26081
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
444 } |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
445 |
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
446 static void |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
447 google_session_handle_reject(JabberStream *js, GoogleSession *session, xmlnode *packet, xmlnode *sess) |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
448 { |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
449 purple_media_got_hangup(session->media); |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
450 } |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
451 |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
452 static void |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
453 google_session_handle_terminate(JabberStream *js, GoogleSession *session, xmlnode *packet, xmlnode *sess) |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
454 { |
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
455 purple_media_got_hangup(session->media); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
456 } |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
457 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
458 static void |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
459 google_session_parse_iq(JabberStream *js, GoogleSession *session, xmlnode *packet) |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
460 { |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
461 xmlnode *sess = xmlnode_get_child(packet, "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
|
462 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
|
463 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
464 if (!strcmp(type, "initiate")) { |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
465 google_session_handle_initiate(js, session, packet, sess); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
466 } else if (!strcmp(type, "accept")) { |
26081
44a528094cbf
Support initiating voice calls to GTalk and Gmail.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
26077
diff
changeset
|
467 google_session_handle_accept(js, session, packet, sess); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
468 } else if (!strcmp(type, "reject")) { |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
469 google_session_handle_reject(js, session, packet, sess); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
470 } else if (!strcmp(type, "terminate")) { |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
471 google_session_handle_terminate(js, session, packet, sess); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
472 } else if (!strcmp(type, "candidates")) { |
25548
70cdff43ec76
You can actually receive Google Talk voice calls with crappy UI now
Sean Egan <seanegan@gmail.com>
parents:
25545
diff
changeset
|
473 google_session_handle_candidates(js, session, packet, sess); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
474 } |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
475 } |
25654
cbe97caec684
Use USE_VV instead of USE_FARSIGHT.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25650
diff
changeset
|
476 #endif /* USE_VV */ |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
477 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
478 void |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
479 jabber_google_session_parse(JabberStream *js, xmlnode *packet) |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
480 { |
25654
cbe97caec684
Use USE_VV instead of USE_FARSIGHT.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25650
diff
changeset
|
481 #ifdef USE_VV |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
482 GoogleSession *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
|
483 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
|
484 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
485 xmlnode *session_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
|
486 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
|
487 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
488 if (strcmp(xmlnode_get_attrib(packet, "type"), "set")) |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
489 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
|
490 |
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 session_node = xmlnode_get_child(packet, "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
|
492 if (!session_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
|
493 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
|
494 |
25647
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
495 id.id = (gchar*)xmlnode_get_attrib(session_node, "id"); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
496 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
|
497 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
|
498 |
25647
e1c8ec1259de
Updates voice and video to use Farsight 2, gets XMPP voice conferences
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25637
diff
changeset
|
499 id.initiator = (gchar*)xmlnode_get_attrib(session_node, "initiator"); |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
500 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
|
501 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
|
502 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
503 if (sessions == NULL) |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
504 sessions = g_hash_table_new(google_session_id_hash, google_session_id_equal); |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
505 session = (GoogleSession*)g_hash_table_lookup(sessions, &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
|
506 |
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 if (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
|
508 google_session_parse_iq(js, session, packet); |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
509 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
|
510 } |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
511 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
512 /* 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
|
513 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
|
514 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
|
515 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
|
516 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
|
517 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
|
518 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
|
519 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
|
520 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
|
521 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
|
522 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
|
523 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
|
524 g_hash_table_insert(sessions, &(session->id), 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
|
525 |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
526 google_session_parse_iq(js, session, packet); |
25650
4b9b265a8100
Fix compiling with the --disable-vv switch.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25647
diff
changeset
|
527 #else |
4b9b265a8100
Fix compiling with the --disable-vv switch.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25647
diff
changeset
|
528 /* TODO: send proper error response */ |
25654
cbe97caec684
Use USE_VV instead of USE_FARSIGHT.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
25650
diff
changeset
|
529 #endif /* USE_VV */ |
25545
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
530 } |
315151da0dc6
Basic Google Talk voice call support. No UI; receiving a call auto-accepts it.
Sean Egan <seanegan@gmail.com>
parents:
18751
diff
changeset
|
531 |
18161 | 532 static void |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
533 jabber_gmail_parse(JabberStream *js, xmlnode *packet, gpointer nul) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
534 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
535 const char *type = xmlnode_get_attrib(packet, "type"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
536 xmlnode *child; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
537 xmlnode *message, *sender_node, *subject_node; |
18491
8f172a8b8cce
Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18161
diff
changeset
|
538 const char *from, *to, *url, *tid; |
8f172a8b8cce
Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18161
diff
changeset
|
539 char *subject; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
540 const char *in_str; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
541 char *to_name; |
20169
575d8c84ccba
Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents:
19680
diff
changeset
|
542 char *default_tos[1]; |
575d8c84ccba
Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents:
19680
diff
changeset
|
543 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
544 int i, count = 1, returned_count; |
18161 | 545 |
18491
8f172a8b8cce
Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18161
diff
changeset
|
546 const char **tos, **froms, **urls; |
8f172a8b8cce
Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18161
diff
changeset
|
547 char **subjects; |
18161 | 548 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
549 if (strcmp(type, "result")) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
550 return; |
18161 | 551 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
552 child = xmlnode_get_child(packet, "mailbox"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
553 if (!child) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
554 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
555 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
556 in_str = xmlnode_get_attrib(child, "total-matched"); |
18161 | 557 if (in_str && *in_str) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
558 count = atoi(in_str); |
18161 | 559 |
20169
575d8c84ccba
Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents:
19680
diff
changeset
|
560 /* If Gmail doesn't tell us who the mail is to, let's use our JID */ |
575d8c84ccba
Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents:
19680
diff
changeset
|
561 to = xmlnode_get_attrib(packet, "to"); |
575d8c84ccba
Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents:
19680
diff
changeset
|
562 default_tos[0] = jabber_get_bare_jid(to); |
575d8c84ccba
Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents:
19680
diff
changeset
|
563 |
20218
99ceb1329a5b
applied changes from 3fcc47961d378fa0cd4eeb00dc6923b16a3a4151
Richard Laager <rlaager@wiktel.com>
parents:
20211
diff
changeset
|
564 message = xmlnode_get_child(child, "mail-thread-info"); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
565 |
20218
99ceb1329a5b
applied changes from 3fcc47961d378fa0cd4eeb00dc6923b16a3a4151
Richard Laager <rlaager@wiktel.com>
parents:
20211
diff
changeset
|
566 if (count == 0 || !message) { |
20281
d41907afb521
Don't display mail notifications for 0 new emails in Google Talk
Evan Schoenberg <evan.s@dreskin.net>
parents:
20218
diff
changeset
|
567 if (count > 0) |
d41907afb521
Don't display mail notifications for 0 new emails in Google Talk
Evan Schoenberg <evan.s@dreskin.net>
parents:
20218
diff
changeset
|
568 purple_notify_emails(js->gc, count, FALSE, NULL, NULL, (const char**) default_tos, NULL, NULL, NULL); |
20169
575d8c84ccba
Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents:
19680
diff
changeset
|
569 g_free(default_tos[0]); |
575d8c84ccba
Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents:
19680
diff
changeset
|
570 return; |
575d8c84ccba
Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents:
19680
diff
changeset
|
571 } |
18161 | 572 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
573 /* 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
|
574 * accordingly */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
575 for (returned_count = 0; message; returned_count++, message=xmlnode_get_next_twin(message)); |
18161 | 576 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
577 froms = g_new0(const char* , returned_count); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
578 tos = g_new0(const char* , returned_count); |
18491
8f172a8b8cce
Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18161
diff
changeset
|
579 subjects = g_new0(char* , returned_count); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
580 urls = g_new0(const char* , returned_count); |
18161 | 581 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
582 to = xmlnode_get_attrib(packet, "to"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
583 to_name = jabber_get_bare_jid(to); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
584 url = xmlnode_get_attrib(child, "url"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
585 if (!url || !*url) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
586 url = "http://www.gmail.com"; |
18161 | 587 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
588 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
|
589 for (i=0; message; message = xmlnode_get_next_twin(message), i++) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
590 subject_node = xmlnode_get_child(message, "subject"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
591 sender_node = xmlnode_get_child(message, "senders"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
592 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
|
593 |
18161 | 594 while (sender_node && (!xmlnode_get_attrib(sender_node, "unread") || |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
595 !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
|
596 sender_node = xmlnode_get_next_twin(sender_node); |
18161 | 597 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
598 if (!sender_node) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
599 i--; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
600 continue; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
601 } |
18161 | 602 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
603 from = xmlnode_get_attrib(sender_node, "name"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
604 if (!from || !*from) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
605 from = xmlnode_get_attrib(sender_node, "address"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
606 subject = xmlnode_get_data(subject_node); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
607 /* |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
608 * url = xmlnode_get_attrib(message, "url"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
609 */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
610 tos[i] = (to_name != NULL ? to_name : ""); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
611 froms[i] = (from != NULL ? from : ""); |
18491
8f172a8b8cce
Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18161
diff
changeset
|
612 subjects[i] = (subject != NULL ? subject : g_strdup("")); |
20333
53afc5cce143
applied changes from d4b316d73ebaf93803ca2642e78b8821c3b5d5c7
Luke Schierer <lschiere@pidgin.im>
parents:
20317
diff
changeset
|
613 urls[i] = url; |
18161 | 614 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
615 tid = xmlnode_get_attrib(message, "tid"); |
18161 | 616 if (tid && |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
617 (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
|
618 g_free(js->gmail_last_tid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
619 js->gmail_last_tid = g_strdup(tid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
620 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
621 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
622 |
18161 | 623 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
|
624 purple_notify_emails(js->gc, count, count == i, (const char**) subjects, froms, tos, |
18161 | 625 urls, NULL, NULL); |
20218
99ceb1329a5b
applied changes from 3fcc47961d378fa0cd4eeb00dc6923b16a3a4151
Richard Laager <rlaager@wiktel.com>
parents:
20211
diff
changeset
|
626 else |
20211
a5d366d614f5
applied changes from 606266f42c25624ce35e54483778d855641806be
Richard Laager <rlaager@wiktel.com>
parents:
20169
diff
changeset
|
627 purple_notify_emails(js->gc, count, FALSE, NULL, NULL, (const char**) default_tos, NULL, NULL, NULL); |
20169
575d8c84ccba
Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents:
19680
diff
changeset
|
628 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
629 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
630 g_free(to_name); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
631 g_free(tos); |
20169
575d8c84ccba
Show when Gmail count falls, instead of only when it rises. Fixes #1462
Sean Egan <seanegan@gmail.com>
parents:
19680
diff
changeset
|
632 g_free(default_tos[0]); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
633 g_free(froms); |
18751
0580b246b2c5
Fix a stupid crash (that I introduced) that occurs when parsing gmail notifications. Fixes #2323
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18492
diff
changeset
|
634 for (; i > 0; i--) |
0580b246b2c5
Fix a stupid crash (that I introduced) that occurs when parsing gmail notifications. Fixes #2323
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18492
diff
changeset
|
635 g_free(subjects[i - 1]); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
636 g_free(subjects); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
637 g_free(urls); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
638 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
639 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
|
640 if (in_str && *in_str) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
641 g_free(js->gmail_last_time); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
642 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
|
643 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
644 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
645 |
18161 | 646 void |
647 jabber_gmail_poke(JabberStream *js, xmlnode *packet) | |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
648 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
649 const char *type; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
650 xmlnode *query; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
651 JabberIq *iq; |
18161 | 652 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
653 /* bail if the user isn't interested */ |
15823 | 654 if (!purple_account_get_check_mail(js->gc->account)) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
655 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
656 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
657 type = xmlnode_get_attrib(packet, "type"); |
18161 | 658 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
659 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
660 /* Is this an initial incoming mail notification? If so, send a request for more info */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
661 if (strcmp(type, "set") || !xmlnode_get_child(packet, "new-mail")) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
662 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
663 |
15823 | 664 purple_debug(PURPLE_DEBUG_MISC, "jabber", |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
665 "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
|
666 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
667 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
|
668 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
|
669 query = xmlnode_get_child(iq->node, "query"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
670 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
671 if (js->gmail_last_time) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
672 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
|
673 if (js->gmail_last_tid) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
674 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
|
675 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
676 jabber_iq_send(iq); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
677 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
678 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
679 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
680 void jabber_gmail_init(JabberStream *js) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
681 JabberIq *iq; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
682 |
18161 | 683 if (!purple_account_get_check_mail(js->gc->account)) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
684 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
685 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
686 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
|
687 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
|
688 jabber_iq_send(iq); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
689 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
690 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
691 void jabber_google_roster_init(JabberStream *js) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
692 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
693 JabberIq *iq; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
694 xmlnode *query; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
695 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
696 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
|
697 query = xmlnode_get_child(iq->node, "query"); |
18161 | 698 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
699 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
|
700 xmlnode_set_attrib(query, "gr:ext", "2"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
701 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
702 jabber_iq_send(iq); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
703 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
704 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
705 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
|
706 { |
15823 | 707 PurpleAccount *account = purple_connection_get_account(js->gc); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
708 GSList *list = account->deny; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
709 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
|
710 char *jid_norm = g_strdup(jabber_normalize(account, jid)); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
711 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
712 while (list) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
713 if (!strcmp(jid_norm, (char*)list->data)) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
714 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
|
715 xmlnode_set_attrib(item, "gr:t", "B"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
716 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
|
717 xmlnode_set_attrib(query, "gr:ext", "2"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
718 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
719 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
720 list = list->next; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
721 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
722 |
18491
8f172a8b8cce
Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18161
diff
changeset
|
723 g_free(jid_norm); |
8f172a8b8cce
Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18161
diff
changeset
|
724 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
725 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
726 |
15467
2c81b0a81790
Make deleting Google Talk buddies work
Sean Egan <seanegan@gmail.com>
parents:
15374
diff
changeset
|
727 gboolean jabber_google_roster_incoming(JabberStream *js, xmlnode *item) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
728 { |
15823 | 729 PurpleAccount *account = purple_connection_get_account(js->gc); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
730 GSList *list = account->deny; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
731 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
|
732 gboolean on_block_list = FALSE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
733 |
20317
ac46ffeb5b2b
applied changes from 6b5f1f48667171fe73de619dd8f80cacd231a2e2
Luke Schierer <lschiere@pidgin.im>
parents:
20281
diff
changeset
|
734 char *jid_norm; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
735 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
736 const char *grt = xmlnode_get_attrib_with_namespace(item, "t", "google:roster"); |
17051
1863cdac4be3
If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@gmail.com>
parents:
16943
diff
changeset
|
737 const char *subscription = xmlnode_get_attrib(item, "subscription"); |
18161 | 738 |
17292 | 739 if (!subscription || !strcmp(subscription, "none")) { |
17051
1863cdac4be3
If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@gmail.com>
parents:
16943
diff
changeset
|
740 /* The Google Talk servers will automatically add people from your Gmail address book |
1863cdac4be3
If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@gmail.com>
parents:
16943
diff
changeset
|
741 * with subscription=none. If we see someone with subscription=none, ignore them. |
1863cdac4be3
If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@gmail.com>
parents:
16943
diff
changeset
|
742 */ |
1863cdac4be3
If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@gmail.com>
parents:
16943
diff
changeset
|
743 return FALSE; |
1863cdac4be3
If Google Talk tells you a roster item as a none subscription, we probably don't ever want to show it. Fixes #1189
Sean Egan <seanegan@gmail.com>
parents:
16943
diff
changeset
|
744 } |
18161 | 745 |
20317
ac46ffeb5b2b
applied changes from 6b5f1f48667171fe73de619dd8f80cacd231a2e2
Luke Schierer <lschiere@pidgin.im>
parents:
20281
diff
changeset
|
746 jid_norm = g_strdup(jabber_normalize(account, jid)); |
ac46ffeb5b2b
applied changes from 6b5f1f48667171fe73de619dd8f80cacd231a2e2
Luke Schierer <lschiere@pidgin.im>
parents:
20281
diff
changeset
|
747 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
748 while (list) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
749 if (!strcmp(jid_norm, (char*)list->data)) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
750 on_block_list = TRUE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
751 break; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
752 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
753 list = list->next; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
754 } |
18161 | 755 |
15467
2c81b0a81790
Make deleting Google Talk buddies work
Sean Egan <seanegan@gmail.com>
parents:
15374
diff
changeset
|
756 if (grt && (*grt == 'H' || *grt == 'h')) { |
15823 | 757 PurpleBuddy *buddy = purple_find_buddy(account, jid_norm); |
20218
99ceb1329a5b
applied changes from 3fcc47961d378fa0cd4eeb00dc6923b16a3a4151
Richard Laager <rlaager@wiktel.com>
parents:
20211
diff
changeset
|
758 if (buddy) |
99ceb1329a5b
applied changes from 3fcc47961d378fa0cd4eeb00dc6923b16a3a4151
Richard Laager <rlaager@wiktel.com>
parents:
20211
diff
changeset
|
759 purple_blist_remove_buddy(buddy); |
18491
8f172a8b8cce
Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18161
diff
changeset
|
760 g_free(jid_norm); |
15467
2c81b0a81790
Make deleting Google Talk buddies work
Sean Egan <seanegan@gmail.com>
parents:
15374
diff
changeset
|
761 return FALSE; |
2c81b0a81790
Make deleting Google Talk buddies work
Sean Egan <seanegan@gmail.com>
parents:
15374
diff
changeset
|
762 } |
18161 | 763 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
764 if (!on_block_list && (grt && (*grt == 'B' || *grt == 'b'))) { |
15823 | 765 purple_debug_info("jabber", "Blocking %s\n", jid_norm); |
766 purple_privacy_deny_add(account, jid_norm, TRUE); | |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
767 } else if (on_block_list && (!grt || (*grt != 'B' && *grt != 'b' ))){ |
15823 | 768 purple_debug_info("jabber", "Unblocking %s\n", jid_norm); |
769 purple_privacy_deny_remove(account, jid_norm, TRUE); | |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
770 } |
18491
8f172a8b8cce
Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18161
diff
changeset
|
771 |
8f172a8b8cce
Various leak fixes.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18161
diff
changeset
|
772 g_free(jid_norm); |
15467
2c81b0a81790
Make deleting Google Talk buddies work
Sean Egan <seanegan@gmail.com>
parents:
15374
diff
changeset
|
773 return TRUE; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
774 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
775 |
18161 | 776 void jabber_google_roster_add_deny(PurpleConnection *gc, const char *who) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
777 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
778 JabberStream *js; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
779 GSList *buddies; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
780 JabberIq *iq; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
781 xmlnode *query; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
782 xmlnode *item; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
783 xmlnode *group; |
15823 | 784 PurpleBuddy *b; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
785 JabberBuddy *jb; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
786 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
787 js = (JabberStream*)(gc->proto_data); |
18161 | 788 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
789 if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
790 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
791 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
792 jb = jabber_buddy_find(js, who, TRUE); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
793 |
15823 | 794 buddies = purple_find_buddies(js->gc->account, who); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
795 if(!buddies) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
796 return; |
18161 | 797 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
798 b = buddies->data; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
799 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
800 iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster"); |
18161 | 801 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
802 query = xmlnode_get_child(iq->node, "query"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
803 item = xmlnode_new_child(query, "item"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
804 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
805 while(buddies) { |
15823 | 806 PurpleGroup *g; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
807 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
808 b = buddies->data; |
15823 | 809 g = purple_buddy_get_group(b); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
810 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
811 group = xmlnode_new_child(item, "group"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
812 xmlnode_insert_data(group, g->name, -1); |
18161 | 813 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
814 buddies = buddies->next; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
815 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
816 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
817 xmlnode_set_attrib(item, "jid", who); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
818 xmlnode_set_attrib(item, "name", b->alias ? b->alias : ""); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
819 xmlnode_set_attrib(item, "gr:t", "B"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
820 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
|
821 xmlnode_set_attrib(query, "gr:ext", "2"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
822 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
823 jabber_iq_send(iq); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
824 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
825 /* Synthesize a sign-off */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
826 if (jb) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
827 JabberBuddyResource *jbr; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
828 GList *l = jb->resources; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
829 while (l) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
830 jbr = l->data; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
831 if (jbr && jbr->name) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
832 { |
15823 | 833 purple_debug(PURPLE_DEBUG_MISC, "jabber", "Removing resource %s\n", jbr->name); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
834 jabber_buddy_remove_resource(jb, jbr->name); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
835 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
836 l = l->next; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
837 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
838 } |
15823 | 839 purple_prpl_got_user_status(purple_connection_get_account(gc), who, "offline", NULL); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
840 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
841 |
15823 | 842 void jabber_google_roster_rem_deny(PurpleConnection *gc, const char *who) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
843 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
844 JabberStream *js; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
845 GSList *buddies; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
846 JabberIq *iq; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
847 xmlnode *query; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
848 xmlnode *item; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
849 xmlnode *group; |
15823 | 850 PurpleBuddy *b; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
851 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
852 g_return_if_fail(gc != NULL); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
853 g_return_if_fail(who != NULL); |
18161 | 854 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
855 js = (JabberStream*)(gc->proto_data); |
18161 | 856 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
857 if (!js || !js->server_caps & JABBER_CAP_GOOGLE_ROSTER) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
858 return; |
18161 | 859 |
15823 | 860 buddies = purple_find_buddies(js->gc->account, who); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
861 if(!buddies) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
862 return; |
18161 | 863 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
864 b = buddies->data; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
865 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
866 iq = jabber_iq_new_query(js, JABBER_IQ_SET, "jabber:iq:roster"); |
18161 | 867 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
868 query = xmlnode_get_child(iq->node, "query"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
869 item = xmlnode_new_child(query, "item"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
870 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
871 while(buddies) { |
15823 | 872 PurpleGroup *g; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
873 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
874 b = buddies->data; |
15823 | 875 g = purple_buddy_get_group(b); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
876 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
877 group = xmlnode_new_child(item, "group"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
878 xmlnode_insert_data(group, g->name, -1); |
18161 | 879 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
880 buddies = buddies->next; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
881 } |
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 xmlnode_set_attrib(item, "jid", who); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
884 xmlnode_set_attrib(item, "name", b->alias ? b->alias : ""); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
885 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
|
886 xmlnode_set_attrib(query, "gr:ext", "2"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
887 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
888 jabber_iq_send(iq); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
889 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
890 /* See if he's online */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
891 jabber_presence_subscription_set(js, who, "probe"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
892 } |
15523
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
893 |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
894 /* This does two passes on the string. The first pass goes through |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
895 * and determine if all the structured text is properly balanced, and |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
896 * how many instances of each there is. The second pass goes and converts |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
897 * everything to HTML, depending on what's figured out by the first pass. |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
898 * It will short circuit once it knows it has no more replacements to make |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
899 */ |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
900 char *jabber_google_format_to_html(const char *text) |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
901 { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
902 const char *p; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
903 |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
904 /* The start of the screen may be consdiered a space for this purpose */ |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
905 gboolean preceding_space = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
906 |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
907 gboolean in_bold = FALSE, in_italic = FALSE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
908 gboolean in_tag = FALSE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
909 |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
910 gint bold_count = 0, italic_count = 0; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
911 |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
912 GString *str; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
913 |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
914 for (p = text; *p != '\0'; p = g_utf8_next_char(p)) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
915 gunichar c = g_utf8_get_char(p); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
916 if (c == '*' && !in_tag) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
917 if (in_bold && (g_unichar_isspace(*(p+1)) || |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
918 *(p+1) == '\0' || |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
919 *(p+1) == '<')) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
920 bold_count++; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
921 in_bold = FALSE; |
16943
3d0aec991e5d
Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@gmail.com>
parents:
15823
diff
changeset
|
922 } else if (preceding_space && !in_bold && !g_unichar_isspace(*(p+1))) { |
15523
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
923 bold_count++; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
924 in_bold = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
925 } |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
926 preceding_space = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
927 } else if (c == '_' && !in_tag) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
928 if (in_italic && (g_unichar_isspace(*(p+1)) || |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
929 *(p+1) == '\0' || |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
930 *(p+1) == '<')) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
931 italic_count++; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
932 in_italic = FALSE; |
16943
3d0aec991e5d
Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@gmail.com>
parents:
15823
diff
changeset
|
933 } else if (preceding_space && !in_italic && !g_unichar_isspace(*(p+1))) { |
15523
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
934 italic_count++; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
935 in_italic = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
936 } |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
937 preceding_space = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
938 } else if (c == '<' && !in_tag) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
939 in_tag = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
940 } else if (c == '>' && in_tag) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
941 in_tag = FALSE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
942 } else if (!in_tag) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
943 if (g_unichar_isspace(c)) |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
944 preceding_space = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
945 else |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
946 preceding_space = FALSE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
947 } |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
948 } |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
949 |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
950 str = g_string_new(NULL); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
951 in_bold = in_italic = in_tag = FALSE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
952 preceding_space = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
953 |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
954 for (p = text; *p != '\0'; p = g_utf8_next_char(p)) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
955 gunichar c = g_utf8_get_char(p); |
18161 | 956 |
15523
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
957 if (bold_count < 2 && italic_count < 2 && !in_bold && !in_italic) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
958 g_string_append(str, p); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
959 return g_string_free(str, FALSE); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
960 } |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
961 |
18161 | 962 |
15523
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
963 if (c == '*' && !in_tag) { |
18161 | 964 if (in_bold && |
15523
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
965 (g_unichar_isspace(*(p+1))||*(p+1)=='<')) { /* This is safe in UTF-8 */ |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
966 str = g_string_append(str, "</b>"); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
967 in_bold = FALSE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
968 bold_count--; |
16943
3d0aec991e5d
Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@gmail.com>
parents:
15823
diff
changeset
|
969 } else if (preceding_space && bold_count > 1 && !g_unichar_isspace(*(p+1))) { |
15523
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
970 str = g_string_append(str, "<b>"); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
971 bold_count--; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
972 in_bold = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
973 } else { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
974 str = g_string_append_unichar(str, c); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
975 } |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
976 preceding_space = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
977 } else if (c == '_' && !in_tag) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
978 if (in_italic && |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
979 (g_unichar_isspace(*(p+1))||*(p+1)=='<')) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
980 str = g_string_append(str, "</i>"); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
981 italic_count--; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
982 in_italic = FALSE; |
16943
3d0aec991e5d
Patch #265. Fix to Google Talk formatting
Sean Egan <seanegan@gmail.com>
parents:
15823
diff
changeset
|
983 } else if (preceding_space && italic_count > 1 && !g_unichar_isspace(*(p+1))) { |
15523
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
984 str = g_string_append(str, "<i>"); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
985 italic_count--; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
986 in_italic = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
987 } else { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
988 str = g_string_append_unichar(str, c); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
989 } |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
990 preceding_space = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
991 } else if (c == '<' && !in_tag) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
992 str = g_string_append_unichar(str, c); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
993 in_tag = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
994 } else if (c == '>' && in_tag) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
995 str = g_string_append_unichar(str, c); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
996 in_tag = FALSE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
997 } else if (!in_tag) { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
998 str = g_string_append_unichar(str, c); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
999 if (g_unichar_isspace(c)) |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
1000 preceding_space = TRUE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
1001 else |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
1002 preceding_space = FALSE; |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
1003 } else { |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
1004 str = g_string_append_unichar(str, c); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
1005 } |
18161 | 1006 } |
15523
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
1007 return g_string_free(str, FALSE); |
ccbdf500f13a
Google Talk uses structured text formatting where *this* is bold
Sean Egan <seanegan@gmail.com>
parents:
15467
diff
changeset
|
1008 } |
20571
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1009 |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1010 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
|
1011 { |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1012 if (!js->googletalk) |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1013 return; |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1014 if (jbr->status && !strncmp(jbr->status, "♫ ", strlen("♫ "))) { |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1015 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
|
1016 PURPLE_TUNE_TITLE, jbr->status + strlen("♫ "), NULL); |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1017 jbr->status = NULL; |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1018 } else { |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1019 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
|
1020 } |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1021 } |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1022 |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1023 char *jabber_google_presence_outgoing(PurpleStatus *tune) |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20211
diff
changeset
|
1024 { |
21634
1853d9d0cc65
don't set the current tune title if it's NULL
Ka-Hing Cheung <khc@hxbc.us>
parents:
21220
diff
changeset
|
1025 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
|
1026 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
|
1027 } |