Mercurial > pidgin.yaz
annotate libpurple/protocols/jabber/presence.c @ 28217:5a38fab8c199
This was a memory leak, right?
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 10 Aug 2009 23:24:39 +0000 |
parents | f05c87f3121e |
children | c585572e80dd |
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 - Jabber Protocol Plugin |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
3 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
4 * Copyright (C) 2003, Nathan Walp <faceprint@faceprint.com> |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
5 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
6 * This program is free software; you can redistribute it and/or modify |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
7 * it under the terms of the GNU General Public License as published by |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
8 * the Free Software Foundation; either version 2 of the License, or |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
9 * (at your option) any later version. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
10 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
11 * This program is distributed in the hope that it will be useful, |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
14 * GNU General Public License for more details. |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
15 * |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
16 * You should have received a copy of the GNU General Public License |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
17 * along with this program; if not, write to the Free Software |
19680
44b4e8bd759b
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19195
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 |
15891
87ea711b9781
Re-arrange #includes so 'make check' stands a chance of passing during
Stu Tomlinson <stu@nosnilmot.com>
parents:
15823
diff
changeset
|
23 #include "account.h" |
87ea711b9781
Re-arrange #includes so 'make check' stands a chance of passing during
Stu Tomlinson <stu@nosnilmot.com>
parents:
15823
diff
changeset
|
24 #include "conversation.h" |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
25 #include "debug.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
26 #include "notify.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
27 #include "request.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
28 #include "server.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
29 #include "status.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
30 #include "util.h" |
15891
87ea711b9781
Re-arrange #includes so 'make check' stands a chance of passing during
Stu Tomlinson <stu@nosnilmot.com>
parents:
15823
diff
changeset
|
31 #include "xmlnode.h" |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
32 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
33 #include "buddy.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
34 #include "chat.h" |
20571
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20570
diff
changeset
|
35 #include "google.h" |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
36 #include "presence.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
37 #include "iq.h" |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
38 #include "jutil.h" |
17609
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
39 #include "adhoccommands.h" |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
40 |
17593
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
41 #include "usertune.h" |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
42 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
43 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
44 static void chats_send_presence_foreach(gpointer key, gpointer val, |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
45 gpointer user_data) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
46 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
47 JabberChat *chat = val; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
48 xmlnode *presence = user_data; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
49 char *chat_full_jid; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
50 |
23262
5793bcea224c
Fix the chat-room rejoining bug where the list appears empty.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
23105
diff
changeset
|
51 if(!chat->conv || chat->left) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
52 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
53 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
54 chat_full_jid = g_strdup_printf("%s@%s/%s", chat->room, chat->server, |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
55 chat->handle); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
56 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
57 xmlnode_set_attrib(presence, "to", chat_full_jid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
58 jabber_send(chat->js, presence); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
59 g_free(chat_full_jid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
60 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
61 |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
62 void jabber_presence_fake_to_self(JabberStream *js, PurpleStatus *status) |
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
63 { |
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
64 PurpleAccount *account; |
28030
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
65 PurplePresence *presence; |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
66 const char *username; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
67 |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
68 g_return_if_fail(js->user != NULL); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
69 |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
70 account = purple_connection_get_account(js->gc); |
27683
f95bcb5eb047
Support connecting to IDNA XMPP domains.
Paul Aurich <paul@darkrain42.org>
parents:
27670
diff
changeset
|
71 username = purple_connection_get_display_name(js->gc); |
28030
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
72 presence = purple_account_get_presence(account); |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
73 if (status == NULL) |
28030
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
74 status = purple_presence_get_active_status(presence); |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
75 |
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
76 if (purple_find_buddy(account, username)) { |
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
77 JabberBuddy *jb = jabber_buddy_find(js, username, TRUE); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
78 JabberBuddyResource *jbr; |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
79 JabberBuddyState state; |
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
80 char *msg; |
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
81 int priority; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
82 |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
83 g_return_if_fail(jb != NULL); |
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
84 |
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
85 purple_status_to_jabber(status, &state, &msg, &priority); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
86 |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
87 if (state == JABBER_BUDDY_STATE_UNAVAILABLE || |
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
88 state == JABBER_BUDDY_STATE_UNKNOWN) { |
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
89 jabber_buddy_remove_resource(jb, js->user->resource); |
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
90 } else { |
28030
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
91 jbr = jabber_buddy_track_resource(jb, js->user->resource, priority, |
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
92 state, msg); |
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
93 jbr->idle = purple_presence_is_idle(presence) ? |
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
94 purple_presence_get_idle_time(presence) : 0; |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
95 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
96 |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
97 if ((jbr = jabber_buddy_find_resource(jb, NULL))) { |
28030
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
98 purple_prpl_got_user_status(account, username, |
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
99 jabber_buddy_state_get_status_id(jbr->state), |
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
100 "priority", jbr->priority, |
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
101 jbr->status ? "message" : NULL, jbr->status, |
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
102 NULL); |
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
103 purple_prpl_got_user_idle(account, username, jbr->idle, jbr->idle); |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
104 } else { |
28030
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
105 purple_prpl_got_user_status(account, username, "offline", |
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
106 msg ? "message" : NULL, msg, |
735040819c16
jabber: Properly track own idle time in fake_to_self.
Paul Aurich <paul@darkrain42.org>
parents:
27683
diff
changeset
|
107 NULL); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
108 } |
27573
9a5a9a4e7626
Simplify the fake_to_self function.
Paul Aurich <paul@darkrain42.org>
parents:
27571
diff
changeset
|
109 g_free(msg); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
110 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
111 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
112 |
25743
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
113 void jabber_set_status(PurpleAccount *account, PurpleStatus *status) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
114 { |
25743
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
115 PurpleConnection *gc; |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
116 JabberStream *js; |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
117 |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
118 if (!purple_account_is_connected(account)) |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
119 return; |
27014
a8537bbcfb79
Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents:
27002
diff
changeset
|
120 |
25743
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
121 if (purple_status_is_exclusive(status) && !purple_status_is_active(status)) { |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
122 /* An exclusive status can't be deactivated. You should just |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
123 * activate some other exclusive status. */ |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
124 return; |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
125 } |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
126 |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
127 gc = purple_account_get_connection(account); |
25987
c4fd9222dda1
propagate from branch 'im.pidgin.pidgin' (head 303af74a38e7b313d4fb0be4d4054a16cb13d819)
Paul Aurich <paul@darkrain42.org>
diff
changeset
|
128 js = purple_connection_get_protocol_data(gc); |
25743
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
129 jabber_presence_send(js, FALSE); |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
130 } |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
131 |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
132 void jabber_presence_send(JabberStream *js, gboolean force) |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
133 { |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
134 PurpleAccount *account; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
135 xmlnode *presence, *x, *photo; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
136 char *stripped = NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
137 JabberBuddyState state; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
138 int priority; |
20570
5913725cbcd6
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
20058
diff
changeset
|
139 const char *artist = NULL, *title = NULL, *source = NULL, *uri = NULL, *track = NULL; |
5913725cbcd6
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
20058
diff
changeset
|
140 int length = -1; |
17617
935005186312
Added the option to enable/disable buzz via a status setting. It's default off for the pidgin folks.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17609
diff
changeset
|
141 gboolean allowBuzz; |
21629
6636546aeacf
We need to work with the exclusive status.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
21602
diff
changeset
|
142 PurplePresence *p; |
25743
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
143 PurpleStatus *status, *tune; |
18123
ca965dfd3875
kill some code duplication when sending current presence
Nathan Walp <nwalp@pidgin.im>
parents:
17841
diff
changeset
|
144 |
25743
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
145 account = purple_connection_get_account(js->gc); |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
146 p = purple_account_get_presence(account); |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
147 status = purple_presence_get_active_status(p); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
148 |
18154
08e639dbac99
really and truly enforce the no-presence-before-roster thing
Nathan Walp <nwalp@pidgin.im>
parents:
18123
diff
changeset
|
149 /* we don't want to send presence before we've gotten our roster */ |
27571
c8390dc125c1
Use js->state to track whether the roster has been retrieved.
Paul Aurich <paul@darkrain42.org>
parents:
27079
diff
changeset
|
150 if (js->state != JABBER_STREAM_CONNECTED) { |
18154
08e639dbac99
really and truly enforce the no-presence-before-roster thing
Nathan Walp <nwalp@pidgin.im>
parents:
18123
diff
changeset
|
151 purple_debug_info("jabber", "attempt to send presence before roster retrieved\n"); |
08e639dbac99
really and truly enforce the no-presence-before-roster thing
Nathan Walp <nwalp@pidgin.im>
parents:
18123
diff
changeset
|
152 return; |
08e639dbac99
really and truly enforce the no-presence-before-roster thing
Nathan Walp <nwalp@pidgin.im>
parents:
18123
diff
changeset
|
153 } |
08e639dbac99
really and truly enforce the no-presence-before-roster thing
Nathan Walp <nwalp@pidgin.im>
parents:
18123
diff
changeset
|
154 |
15823 | 155 purple_status_to_jabber(status, &state, &stripped, &priority); |
25443
5f9a24d1c25e
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24672
diff
changeset
|
156 |
17617
935005186312
Added the option to enable/disable buzz via a status setting. It's default off for the pidgin folks.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17609
diff
changeset
|
157 /* check for buzz support */ |
935005186312
Added the option to enable/disable buzz via a status setting. It's default off for the pidgin folks.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17609
diff
changeset
|
158 allowBuzz = purple_status_get_attr_boolean(status,"buzz"); |
935005186312
Added the option to enable/disable buzz via a status setting. It's default off for the pidgin folks.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17609
diff
changeset
|
159 /* changing the buzz state has to trigger a re-broadcasting of the presence for caps */ |
23431
146d16459cda
make googletalk tune hack work, previously it's not doing anything unless
Ka-Hing Cheung <khc@hxbc.us>
parents:
23262
diff
changeset
|
160 |
25743
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
161 tune = purple_presence_get_status(p, "tune"); |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
162 if (js->googletalk && !stripped && purple_status_is_active(tune)) { |
23431
146d16459cda
make googletalk tune hack work, previously it's not doing anything unless
Ka-Hing Cheung <khc@hxbc.us>
parents:
23262
diff
changeset
|
163 stripped = jabber_google_presence_outgoing(tune); |
146d16459cda
make googletalk tune hack work, previously it's not doing anything unless
Ka-Hing Cheung <khc@hxbc.us>
parents:
23262
diff
changeset
|
164 } |
25443
5f9a24d1c25e
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24672
diff
changeset
|
165 |
17593
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
166 #define CHANGED(a,b) ((!a && b) || (a && a[0] == '\0' && b && b[0] != '\0') || \ |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
167 (a && !b) || (a && a[0] != '\0' && b && b[0] == '\0') || (a && b && strcmp(a,b))) |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
168 /* check if there are any differences to the <presence> and send them in that case */ |
25743
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
169 if (force || allowBuzz != js->allowBuzz || js->old_state != state || |
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
170 CHANGED(js->old_msg, stripped) || js->old_priority != priority || |
26817
3912f55a1633
propagate from branch 'im.pidgin.pidgin' (head fbb4fe5da444943eecc76bdcd6c8ba967790b6c8)
Paul Aurich <paul@darkrain42.org>
diff
changeset
|
171 CHANGED(js->old_avatarhash, js->avatar_hash) || js->old_idle != js->idle) { |
25743
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
172 /* Need to update allowBuzz before creating the presence (with caps) */ |
17617
935005186312
Added the option to enable/disable buzz via a status setting. It's default off for the pidgin folks.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17609
diff
changeset
|
173 js->allowBuzz = allowBuzz; |
20571
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20570
diff
changeset
|
174 |
17593
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
175 presence = jabber_presence_create_js(js, state, stripped, priority); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
176 |
25831
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
177 /* Per XEP-0153 4.1, we must always send the <x> */ |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
178 x = xmlnode_new_child(presence, "x"); |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
179 xmlnode_set_namespace(x, "vcard-temp:x:update"); |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
180 /* |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
181 * FIXME: Per XEP-0153 4.3.2 bullet 2, we must not publish our |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
182 * image hash if another resource has logged in and updated the |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
183 * vcard avatar. Requires changes in jabber_presence_parse. |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
184 */ |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
185 if (js->vcard_fetched) { |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
186 /* Always publish a <photo>; it's empty if we have no image. */ |
17593
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
187 photo = xmlnode_new_child(x, "photo"); |
25831
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
188 if (js->avatar_hash) |
0fa91206cf5a
Always publish a <photo/> element, even if we have an empty buddy icon.
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
189 xmlnode_insert_data(photo, js->avatar_hash, -1); |
17593
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
190 } |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
191 |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
192 jabber_send(js, presence); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
193 |
17593
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
194 g_hash_table_foreach(js->chats, chats_send_presence_foreach, presence); |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
195 xmlnode_free(presence); |
25443
5f9a24d1c25e
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24672
diff
changeset
|
196 |
17593
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
197 /* update old values */ |
25443
5f9a24d1c25e
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24672
diff
changeset
|
198 |
17593
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
199 if(js->old_msg) |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
200 g_free(js->old_msg); |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
201 if(js->old_avatarhash) |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
202 g_free(js->old_avatarhash); |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
203 js->old_msg = g_strdup(stripped); |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
204 js->old_avatarhash = g_strdup(js->avatar_hash); |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
205 js->old_state = state; |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
206 js->old_priority = priority; |
25805 | 207 js->old_idle = js->idle; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
208 } |
23432
74960bf43dae
let's not leak if nothing is changed
Ka-Hing Cheung <khc@hxbc.us>
parents:
23431
diff
changeset
|
209 g_free(stripped); |
74960bf43dae
let's not leak if nothing is changed
Ka-Hing Cheung <khc@hxbc.us>
parents:
23431
diff
changeset
|
210 |
17593
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
211 /* next, check if there are any changes to the tune values */ |
25743
6d6e10476c52
Clean up jabber_presence_send
Paul Aurich <paul@darkrain42.org>
parents:
25742
diff
changeset
|
212 if (purple_status_is_active(tune)) { |
20570
5913725cbcd6
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
20058
diff
changeset
|
213 artist = purple_status_get_attr_string(tune, PURPLE_TUNE_ARTIST); |
5913725cbcd6
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
20058
diff
changeset
|
214 title = purple_status_get_attr_string(tune, PURPLE_TUNE_TITLE); |
5913725cbcd6
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
20058
diff
changeset
|
215 source = purple_status_get_attr_string(tune, PURPLE_TUNE_ALBUM); |
5913725cbcd6
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
20058
diff
changeset
|
216 uri = purple_status_get_attr_string(tune, PURPLE_TUNE_URL); |
5913725cbcd6
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
20058
diff
changeset
|
217 track = purple_status_get_attr_string(tune, PURPLE_TUNE_TRACK); |
5913725cbcd6
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
20058
diff
changeset
|
218 length = (!purple_status_get_attr_value(tune, PURPLE_TUNE_TIME)) ? -1 : |
5913725cbcd6
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
20058
diff
changeset
|
219 purple_status_get_attr_int(tune, PURPLE_TUNE_TIME); |
5913725cbcd6
Use an independant status type for 'current media' stuff, instead of using
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
20058
diff
changeset
|
220 } |
25443
5f9a24d1c25e
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24672
diff
changeset
|
221 |
17593
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
222 if(CHANGED(artist, js->old_artist) || CHANGED(title, js->old_title) || CHANGED(source, js->old_source) || |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
223 CHANGED(uri, js->old_uri) || CHANGED(track, js->old_track) || (length != js->old_length)) { |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
224 PurpleJabberTuneInfo tuneinfo = { |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
225 (char*)artist, |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
226 (char*)title, |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
227 (char*)source, |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
228 (char*)track, |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
229 length, |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
230 (char*)uri |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
231 }; |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
232 jabber_tune_set(js->gc, &tuneinfo); |
25443
5f9a24d1c25e
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24672
diff
changeset
|
233 |
17593
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
234 /* update old values */ |
20058
5103485b4b26
Plug some memory leaks.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
19698
diff
changeset
|
235 g_free(js->old_artist); |
5103485b4b26
Plug some memory leaks.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
19698
diff
changeset
|
236 g_free(js->old_title); |
5103485b4b26
Plug some memory leaks.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
19698
diff
changeset
|
237 g_free(js->old_source); |
5103485b4b26
Plug some memory leaks.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
19698
diff
changeset
|
238 g_free(js->old_uri); |
5103485b4b26
Plug some memory leaks.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
19698
diff
changeset
|
239 g_free(js->old_track); |
17593
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
240 js->old_artist = g_strdup(artist); |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
241 js->old_title = g_strdup(title); |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
242 js->old_source = g_strdup(source); |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
243 js->old_uri = g_strdup(uri); |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
244 js->old_length = length; |
759cd72bd2ff
Replaced a clean and simple API with a very weird hack due to vivid request on #pidgin by multiple devs. This avoids the change in PurplePluginProtocolInfo, but requires complicated change tracking in every prpl. The others prpl should add this change tracking, too (since otherwise the status gets changed even though nothing they care about changed), but that's not up to me.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17576
diff
changeset
|
245 js->old_track = g_strdup(track); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
246 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
247 |
19698
680a3aea5eb6
Various warning fixes for the xmpp prpl.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
19696
diff
changeset
|
248 #undef CHANGED |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
249 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
250 jabber_presence_fake_to_self(js, status); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
251 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
252 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
253 xmlnode *jabber_presence_create(JabberBuddyState state, const char *msg, int priority) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
254 { |
17563
95affacf6f82
Added the ability to define extensions to caps
Andreas Monitzer <pidgin@monitzer.com>
parents:
17439
diff
changeset
|
255 return jabber_presence_create_js(NULL, state, msg, priority); |
95affacf6f82
Added the ability to define extensions to caps
Andreas Monitzer <pidgin@monitzer.com>
parents:
17439
diff
changeset
|
256 } |
95affacf6f82
Added the ability to define extensions to caps
Andreas Monitzer <pidgin@monitzer.com>
parents:
17439
diff
changeset
|
257 |
95affacf6f82
Added the ability to define extensions to caps
Andreas Monitzer <pidgin@monitzer.com>
parents:
17439
diff
changeset
|
258 xmlnode *jabber_presence_create_js(JabberStream *js, JabberBuddyState state, const char *msg, int priority) |
95affacf6f82
Added the ability to define extensions to caps
Andreas Monitzer <pidgin@monitzer.com>
parents:
17439
diff
changeset
|
259 { |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
260 xmlnode *show, *status, *presence, *pri, *c; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
261 const char *show_string = NULL; |
27170
5330ffe6ca86
Fix compile warning for non-VV.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27079
diff
changeset
|
262 #ifdef USE_VV |
27079
72bcdcb0629f
Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
27014
diff
changeset
|
263 gboolean audio_enabled, video_enabled; |
27170
5330ffe6ca86
Fix compile warning for non-VV.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27079
diff
changeset
|
264 #endif |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
265 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
266 presence = xmlnode_new("presence"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
267 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
268 if(state == JABBER_BUDDY_STATE_UNAVAILABLE) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
269 xmlnode_set_attrib(presence, "type", "unavailable"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
270 else if(state != JABBER_BUDDY_STATE_ONLINE && |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
271 state != JABBER_BUDDY_STATE_UNKNOWN && |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
272 state != JABBER_BUDDY_STATE_ERROR) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
273 show_string = jabber_buddy_state_get_show(state); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
274 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
275 if(show_string) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
276 show = xmlnode_new_child(presence, "show"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
277 xmlnode_insert_data(show, show_string, -1); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
278 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
279 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
280 if(msg) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
281 status = xmlnode_new_child(presence, "status"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
282 xmlnode_insert_data(status, msg, -1); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
283 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
284 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
285 if(priority) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
286 char *pstr = g_strdup_printf("%d", priority); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
287 pri = xmlnode_new_child(presence, "priority"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
288 xmlnode_insert_data(pri, pstr, -1); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
289 g_free(pstr); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
290 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
291 |
25805 | 292 /* if we are idle and not offline, include idle */ |
293 if (js->idle && state != JABBER_BUDDY_STATE_UNAVAILABLE) { | |
294 xmlnode *query = xmlnode_new_child(presence, "query"); | |
295 gchar seconds[10]; | |
296 g_snprintf(seconds, 10, "%d", (int) (time(NULL) - js->idle)); | |
27014
a8537bbcfb79
Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents:
27002
diff
changeset
|
297 |
25805 | 298 xmlnode_set_namespace(query, "jabber:iq:last"); |
299 xmlnode_set_attrib(query, "seconds", seconds); | |
300 } | |
26817
3912f55a1633
propagate from branch 'im.pidgin.pidgin' (head fbb4fe5da444943eecc76bdcd6c8ba967790b6c8)
Paul Aurich <paul@darkrain42.org>
diff
changeset
|
301 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
302 /* JEP-0115 */ |
25584
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25580
diff
changeset
|
303 /* calculate hash */ |
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25580
diff
changeset
|
304 jabber_caps_calculate_own_hash(js); |
e61603ab10c6
* correctly calculating own features and factor in is_enabled() of features
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25580
diff
changeset
|
305 /* create xml */ |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
306 c = xmlnode_new_child(presence, "c"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
307 xmlnode_set_namespace(c, "http://jabber.org/protocol/caps"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
308 xmlnode_set_attrib(c, "node", CAPS0115_NODE); |
25575
26eabe8e739b
Removing short-names for features and calculating own caps hash.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
23262
diff
changeset
|
309 xmlnode_set_attrib(c, "hash", "sha-1"); |
25742
4040da08a733
Entity Capabilities must be per-JabberStream
Paul Aurich <paul@darkrain42.org>
parents:
25716
diff
changeset
|
310 xmlnode_set_attrib(c, "ver", jabber_caps_get_own_hash(js)); |
25443
5f9a24d1c25e
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24672
diff
changeset
|
311 |
26539
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26528
diff
changeset
|
312 #ifdef USE_VV |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26528
diff
changeset
|
313 /* |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26528
diff
changeset
|
314 * MASSIVE HUGE DISGUSTING HACK |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26528
diff
changeset
|
315 * This is a huge hack. As far as I can tell, Google Talk's gmail client |
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26528
diff
changeset
|
316 * doesn't bother to check the actual features we advertise; they |
26545
b01e8e76c59d
Make my comment parse correctly.
Paul Aurich <paul@darkrain42.org>
parents:
26539
diff
changeset
|
317 * just assume that if we specify a 'voice-v1' ext (ignoring that |
b01e8e76c59d
Make my comment parse correctly.
Paul Aurich <paul@darkrain42.org>
parents:
26539
diff
changeset
|
318 * these are to be assigned no semantic value), we support receiving voice |
b01e8e76c59d
Make my comment parse correctly.
Paul Aurich <paul@darkrain42.org>
parents:
26539
diff
changeset
|
319 * calls. |
27079
72bcdcb0629f
Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
27014
diff
changeset
|
320 * |
72bcdcb0629f
Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
27014
diff
changeset
|
321 * Ditto for 'video-v1'. |
26539
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26528
diff
changeset
|
322 */ |
27079
72bcdcb0629f
Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
27014
diff
changeset
|
323 audio_enabled = jabber_audio_enabled(js, NULL /* unused */); |
72bcdcb0629f
Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
27014
diff
changeset
|
324 video_enabled = jabber_video_enabled(js, NULL /* unused */); |
72bcdcb0629f
Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
27014
diff
changeset
|
325 |
72bcdcb0629f
Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
27014
diff
changeset
|
326 if (audio_enabled && video_enabled) |
28079
49cb3fc2c01a
Add the camera-v1 cap or else Gmail refuses to accept we're video enabled.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
28030
diff
changeset
|
327 xmlnode_set_attrib(c, "ext", "voice-v1 camera-v1 video-v1"); |
27079
72bcdcb0629f
Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
27014
diff
changeset
|
328 else if (audio_enabled) |
26539
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26528
diff
changeset
|
329 xmlnode_set_attrib(c, "ext", "voice-v1"); |
27079
72bcdcb0629f
Add Gmail video support.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
27014
diff
changeset
|
330 else if (video_enabled) |
28079
49cb3fc2c01a
Add the camera-v1 cap or else Gmail refuses to accept we're video enabled.
Mike Ruprecht <maiku@soc.pidgin.im>
parents:
28030
diff
changeset
|
331 xmlnode_set_attrib(c, "ext", "camera-v1 video-v1"); |
26539
20743d9bd62d
Fix allowing gmail user to initiate voice call by advertising a specific ext
Paul Aurich <paul@darkrain42.org>
parents:
26528
diff
changeset
|
332 #endif |
25443
5f9a24d1c25e
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24672
diff
changeset
|
333 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
334 return presence; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
335 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
336 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
337 struct _jabber_add_permit { |
15823 | 338 PurpleConnection *gc; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
339 JabberStream *js; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
340 char *who; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
341 }; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
342 |
19195
1ca6c4b234ab
Warning fixes in the aftermath of resiak's authorize_cb and deny_cb type fixing.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18739
diff
changeset
|
343 static void authorize_add_cb(gpointer data) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
344 { |
19195
1ca6c4b234ab
Warning fixes in the aftermath of resiak's authorize_cb and deny_cb type fixing.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18739
diff
changeset
|
345 struct _jabber_add_permit *jap = data; |
21602
53fee49ce1c5
Prevent crashing when authorizing or denying after the account is disconnected.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21560
diff
changeset
|
346 if(PURPLE_CONNECTION_IS_VALID(jap->gc)) |
53fee49ce1c5
Prevent crashing when authorizing or denying after the account is disconnected.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21560
diff
changeset
|
347 jabber_presence_subscription_set(jap->gc->proto_data, |
53fee49ce1c5
Prevent crashing when authorizing or denying after the account is disconnected.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21560
diff
changeset
|
348 jap->who, "subscribed"); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
349 g_free(jap->who); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
350 g_free(jap); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
351 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
352 |
19195
1ca6c4b234ab
Warning fixes in the aftermath of resiak's authorize_cb and deny_cb type fixing.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18739
diff
changeset
|
353 static void deny_add_cb(gpointer data) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
354 { |
19195
1ca6c4b234ab
Warning fixes in the aftermath of resiak's authorize_cb and deny_cb type fixing.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
18739
diff
changeset
|
355 struct _jabber_add_permit *jap = data; |
21602
53fee49ce1c5
Prevent crashing when authorizing or denying after the account is disconnected.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21560
diff
changeset
|
356 if(PURPLE_CONNECTION_IS_VALID(jap->gc)) |
53fee49ce1c5
Prevent crashing when authorizing or denying after the account is disconnected.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21560
diff
changeset
|
357 jabber_presence_subscription_set(jap->gc->proto_data, |
53fee49ce1c5
Prevent crashing when authorizing or denying after the account is disconnected.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21560
diff
changeset
|
358 jap->who, "unsubscribed"); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
359 g_free(jap->who); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
360 g_free(jap); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
361 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
362 |
26547
ae41d8e827e3
Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents:
25443
diff
changeset
|
363 static void |
ae41d8e827e3
Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents:
25443
diff
changeset
|
364 jabber_vcard_parse_avatar(JabberStream *js, const char *from, |
ae41d8e827e3
Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents:
25443
diff
changeset
|
365 JabberIqType type, const char *id, |
ae41d8e827e3
Convert all the XMPP IQ callbacks to a typedef similar to the IQ Handlers.
Paul Aurich <paul@darkrain42.org>
parents:
25443
diff
changeset
|
366 xmlnode *packet, gpointer blah) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
367 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
368 JabberBuddy *jb = NULL; |
26862
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
369 xmlnode *vcard, *photo, *binval, *fn, *nick; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
370 char *text; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
371 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
372 if(!from) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
373 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
374 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
375 jb = jabber_buddy_find(js, from, TRUE); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
376 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
377 js->pending_avatar_requests = g_slist_remove(js->pending_avatar_requests, jb); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
378 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
379 if((vcard = xmlnode_get_child(packet, "vCard")) || |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
380 (vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp"))) { |
26862
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
381 /* The logic here regarding the nickname and full name is copied from |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
382 * buddy.c:jabber_vcard_parse. */ |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
383 gchar *nickname = NULL; |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
384 if ((fn = xmlnode_get_child(vcard, "FN"))) |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
385 nickname = xmlnode_get_data(fn); |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
386 |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
387 if ((nick = xmlnode_get_child(vcard, "NICKNAME"))) { |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
388 char *tmp = xmlnode_get_data(nick); |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
389 char *bare_jid = jabber_get_bare_jid(from); |
27002
c9ac5cc1e46c
Fix a crash when <NICKNAME/> is present in a vcard, but has no data.
Paul Aurich <paul@darkrain42.org>
parents:
26952
diff
changeset
|
390 if (tmp && strstr(bare_jid, tmp) == NULL) { |
26862
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
391 g_free(nickname); |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
392 nickname = tmp; |
27002
c9ac5cc1e46c
Fix a crash when <NICKNAME/> is present in a vcard, but has no data.
Paul Aurich <paul@darkrain42.org>
parents:
26952
diff
changeset
|
393 } else if (tmp) |
26862
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
394 g_free(tmp); |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
395 |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
396 g_free(bare_jid); |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
397 } |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
398 |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
399 if (nickname) { |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
400 serv_got_alias(js->gc, from, nickname); |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
401 g_free(nickname); |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
402 } |
5c4a4a0f5929
When we download a buddy's vCard to update an avatar, also try to update the nickname.
Paul Aurich <paul@darkrain42.org>
parents:
26856
diff
changeset
|
403 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
404 if((photo = xmlnode_get_child(vcard, "PHOTO")) && |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
405 (( (binval = xmlnode_get_child(photo, "BINVAL")) && |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
406 (text = xmlnode_get_data(binval))) || |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
407 (text = xmlnode_get_data(photo)))) { |
26789
8953034dae88
Use jabber_calculate_data_sha1sum in one more place.
Paul Aurich <paul@darkrain42.org>
parents:
26787
diff
changeset
|
408 guchar *data; |
8953034dae88
Use jabber_calculate_data_sha1sum in one more place.
Paul Aurich <paul@darkrain42.org>
parents:
26787
diff
changeset
|
409 gchar *hash; |
8953034dae88
Use jabber_calculate_data_sha1sum in one more place.
Paul Aurich <paul@darkrain42.org>
parents:
26787
diff
changeset
|
410 gsize size; |
16386
e0c9a46b459f
Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@wiktel.com>
parents:
15957
diff
changeset
|
411 |
15823 | 412 data = purple_base64_decode(text, &size); |
24641
61e0924de04a
Fix up the XMPP User Avatar SHA1 hashing so that we don't mess up the checksum
Paul Aurich <paul@darkrain42.org>
parents:
24504
diff
changeset
|
413 hash = jabber_calculate_data_sha1sum(data, size); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
414 |
16386
e0c9a46b459f
Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@wiktel.com>
parents:
15957
diff
changeset
|
415 purple_buddy_icons_set_for_user(js->gc->account, from, data, size, hash); |
24641
61e0924de04a
Fix up the XMPP User Avatar SHA1 hashing so that we don't mess up the checksum
Paul Aurich <paul@darkrain42.org>
parents:
24504
diff
changeset
|
416 g_free(hash); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
417 g_free(text); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
418 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
419 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
420 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
421 |
17609
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
422 typedef struct _JabberPresenceCapabilities { |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
423 JabberStream *js; |
22757
2404b13940e9
Fix a crash in Jabber that I think happens someone someone signs off
Mark Doliner <mark@kingant.net>
parents:
22475
diff
changeset
|
424 JabberBuddy *jb; |
17609
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
425 char *from; |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
426 } JabberPresenceCapabilities; |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
427 |
25784
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
428 static void |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
429 jabber_presence_set_capabilities(JabberCapsClientInfo *info, GList *exts, |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
430 JabberPresenceCapabilities *userdata) |
25745
416ff3d65c16
Rewrite jabber_presence_set_capabilities a little
Paul Aurich <paul@darkrain42.org>
parents:
25743
diff
changeset
|
431 { |
22757
2404b13940e9
Fix a crash in Jabber that I think happens someone someone signs off
Mark Doliner <mark@kingant.net>
parents:
22475
diff
changeset
|
432 JabberBuddyResource *jbr; |
26924
33f98d662db8
Don't crash when resource is NULL. Thanks, Marcus!
Paul Aurich <paul@darkrain42.org>
parents:
26863
diff
changeset
|
433 char *resource = g_utf8_strchr(userdata->from, -1, '/'); |
21688
6f4ffdc65230
Fix a crash when an error occurs discovering a the capabilities of a client. Fixes #4081.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21629
diff
changeset
|
434 |
26924
33f98d662db8
Don't crash when resource is NULL. Thanks, Marcus!
Paul Aurich <paul@darkrain42.org>
parents:
26863
diff
changeset
|
435 if (resource) |
33f98d662db8
Don't crash when resource is NULL. Thanks, Marcus!
Paul Aurich <paul@darkrain42.org>
parents:
26863
diff
changeset
|
436 resource += 1; |
22757
2404b13940e9
Fix a crash in Jabber that I think happens someone someone signs off
Mark Doliner <mark@kingant.net>
parents:
22475
diff
changeset
|
437 |
25745
416ff3d65c16
Rewrite jabber_presence_set_capabilities a little
Paul Aurich <paul@darkrain42.org>
parents:
25743
diff
changeset
|
438 jbr = jabber_buddy_find_resource(userdata->jb, resource); |
416ff3d65c16
Rewrite jabber_presence_set_capabilities a little
Paul Aurich <paul@darkrain42.org>
parents:
25743
diff
changeset
|
439 if (!jbr) { |
22757
2404b13940e9
Fix a crash in Jabber that I think happens someone someone signs off
Mark Doliner <mark@kingant.net>
parents:
22475
diff
changeset
|
440 g_free(userdata->from); |
2404b13940e9
Fix a crash in Jabber that I think happens someone someone signs off
Mark Doliner <mark@kingant.net>
parents:
22475
diff
changeset
|
441 g_free(userdata); |
25784
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
442 if (exts) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
443 g_list_foreach(exts, (GFunc)g_free, NULL); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
444 g_list_free(exts); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
445 } |
22757
2404b13940e9
Fix a crash in Jabber that I think happens someone someone signs off
Mark Doliner <mark@kingant.net>
parents:
22475
diff
changeset
|
446 return; |
2404b13940e9
Fix a crash in Jabber that I think happens someone someone signs off
Mark Doliner <mark@kingant.net>
parents:
22475
diff
changeset
|
447 } |
2404b13940e9
Fix a crash in Jabber that I think happens someone someone signs off
Mark Doliner <mark@kingant.net>
parents:
22475
diff
changeset
|
448 |
25786
5ad14a53e266
Partial disapproval of b8fdbd255c614e7305f835b843a3414675a86a19
Paul Aurich <paul@darkrain42.org>
parents:
25784
diff
changeset
|
449 /* Any old jbr->caps.info is owned by the caps code */ |
25784
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
450 if (jbr->caps.exts) { |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
451 g_list_foreach(jbr->caps.exts, (GFunc)g_free, NULL); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
452 g_list_free(jbr->caps.exts); |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
453 } |
21688
6f4ffdc65230
Fix a crash when an error occurs discovering a the capabilities of a client. Fixes #4081.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21629
diff
changeset
|
454 |
25784
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
455 jbr->caps.info = info; |
05693f6885a4
Support old (XEP v1.3) Entity Capabilities alongside the new ones.
Paul Aurich <paul@darkrain42.org>
parents:
25782
diff
changeset
|
456 jbr->caps.exts = exts; |
21688
6f4ffdc65230
Fix a crash when an error occurs discovering a the capabilities of a client. Fixes #4081.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21629
diff
changeset
|
457 |
27588
ed284238509b
Use Entity Capabilities to pick up Chat States support. Refs #4650.
Paul Aurich <paul@darkrain42.org>
parents:
27585
diff
changeset
|
458 if (info == NULL) |
ed284238509b
Use Entity Capabilities to pick up Chat States support. Refs #4650.
Paul Aurich <paul@darkrain42.org>
parents:
27585
diff
changeset
|
459 goto out; |
ed284238509b
Use Entity Capabilities to pick up Chat States support. Refs #4650.
Paul Aurich <paul@darkrain42.org>
parents:
27585
diff
changeset
|
460 |
26931
e7819fa37224
Only try to fetch adhoc commands from buddies once. Pushed updates (which we support now) are far superior.
Paul Aurich <paul@darkrain42.org>
parents:
26928
diff
changeset
|
461 if (!jbr->commands_fetched && jabber_resource_has_capability(jbr, "http://jabber.org/protocol/commands")) { |
25770
b1b1b75a922e
Sprinkle jabber_resource_has_capability in places
Paul Aurich <paul@darkrain42.org>
parents:
25764
diff
changeset
|
462 JabberIq *iq = jabber_iq_new_query(userdata->js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items"); |
b1b1b75a922e
Sprinkle jabber_resource_has_capability in places
Paul Aurich <paul@darkrain42.org>
parents:
25764
diff
changeset
|
463 xmlnode *query = xmlnode_get_child_with_namespace(iq->node, "query", "http://jabber.org/protocol/disco#items"); |
b1b1b75a922e
Sprinkle jabber_resource_has_capability in places
Paul Aurich <paul@darkrain42.org>
parents:
25764
diff
changeset
|
464 xmlnode_set_attrib(iq->node, "to", userdata->from); |
b1b1b75a922e
Sprinkle jabber_resource_has_capability in places
Paul Aurich <paul@darkrain42.org>
parents:
25764
diff
changeset
|
465 xmlnode_set_attrib(query, "node", "http://jabber.org/protocol/commands"); |
b1b1b75a922e
Sprinkle jabber_resource_has_capability in places
Paul Aurich <paul@darkrain42.org>
parents:
25764
diff
changeset
|
466 jabber_iq_set_callback(iq, jabber_adhoc_disco_result_cb, NULL); |
b1b1b75a922e
Sprinkle jabber_resource_has_capability in places
Paul Aurich <paul@darkrain42.org>
parents:
25764
diff
changeset
|
467 jabber_iq_send(iq); |
21688
6f4ffdc65230
Fix a crash when an error occurs discovering a the capabilities of a client. Fixes #4081.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21629
diff
changeset
|
468 |
26931
e7819fa37224
Only try to fetch adhoc commands from buddies once. Pushed updates (which we support now) are far superior.
Paul Aurich <paul@darkrain42.org>
parents:
26928
diff
changeset
|
469 jbr->commands_fetched = TRUE; |
17609
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
470 } |
21688
6f4ffdc65230
Fix a crash when an error occurs discovering a the capabilities of a client. Fixes #4081.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
21629
diff
changeset
|
471 |
27588
ed284238509b
Use Entity Capabilities to pick up Chat States support. Refs #4650.
Paul Aurich <paul@darkrain42.org>
parents:
27585
diff
changeset
|
472 if (jabber_resource_has_capability(jbr, "http://jabber.org/protocol/chatstates")) |
ed284238509b
Use Entity Capabilities to pick up Chat States support. Refs #4650.
Paul Aurich <paul@darkrain42.org>
parents:
27585
diff
changeset
|
473 jbr->chat_states = JABBER_CHAT_STATES_SUPPORTED; |
ed284238509b
Use Entity Capabilities to pick up Chat States support. Refs #4650.
Paul Aurich <paul@darkrain42.org>
parents:
27585
diff
changeset
|
474 else |
ed284238509b
Use Entity Capabilities to pick up Chat States support. Refs #4650.
Paul Aurich <paul@darkrain42.org>
parents:
27585
diff
changeset
|
475 jbr->chat_states = JABBER_CHAT_STATES_UNSUPPORTED; |
ed284238509b
Use Entity Capabilities to pick up Chat States support. Refs #4650.
Paul Aurich <paul@darkrain42.org>
parents:
27585
diff
changeset
|
476 |
ed284238509b
Use Entity Capabilities to pick up Chat States support. Refs #4650.
Paul Aurich <paul@darkrain42.org>
parents:
27585
diff
changeset
|
477 out: |
20318
bbfe52e817cf
applied changes from d50ecf4dc52f25cbd219d6c19846436dec5a8853
Luke Schierer <lschiere@pidgin.im>
parents:
20058
diff
changeset
|
478 g_free(userdata->from); |
bbfe52e817cf
applied changes from d50ecf4dc52f25cbd219d6c19846436dec5a8853
Luke Schierer <lschiere@pidgin.im>
parents:
20058
diff
changeset
|
479 g_free(userdata); |
17609
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
480 } |
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
481 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
482 void jabber_presence_parse(JabberStream *js, xmlnode *packet) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
483 { |
26952
92565c8e1e3a
Add jabber signals for IQ, Message, and Presence stanzas. Lightly tested (it doesn't crash [Prove me wrong!]) and as you'll note, I refer to documentation that doesn't yet exist.
Paul Aurich <paul@darkrain42.org>
parents:
26931
diff
changeset
|
484 const char *from; |
92565c8e1e3a
Add jabber signals for IQ, Message, and Presence stanzas. Lightly tested (it doesn't crash [Prove me wrong!]) and as you'll note, I refer to documentation that doesn't yet exist.
Paul Aurich <paul@darkrain42.org>
parents:
26931
diff
changeset
|
485 const char *type; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
486 char *status = NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
487 int priority = 0; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
488 JabberID *jid; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
489 JabberChat *chat; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
490 JabberBuddy *jb; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
491 JabberBuddyResource *jbr = NULL, *found_jbr = NULL; |
15823 | 492 PurpleConvChatBuddyFlags flags = PURPLE_CBFLAGS_NONE; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
493 gboolean delayed = FALSE; |
25805 | 494 const gchar *stamp = NULL; /* from <delayed/> element */ |
15823 | 495 PurpleBuddy *b = NULL; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
496 char *buddy_name; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
497 JabberBuddyState state = JABBER_BUDDY_STATE_UNKNOWN; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
498 xmlnode *y; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
499 char *avatar_hash = NULL; |
17609
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
500 xmlnode *caps = NULL; |
25805 | 501 int idle = 0; |
26856
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
502 gchar *nickname = NULL; |
26952
92565c8e1e3a
Add jabber signals for IQ, Message, and Presence stanzas. Lightly tested (it doesn't crash [Prove me wrong!]) and as you'll note, I refer to documentation that doesn't yet exist.
Paul Aurich <paul@darkrain42.org>
parents:
26931
diff
changeset
|
503 gboolean signal_return; |
92565c8e1e3a
Add jabber signals for IQ, Message, and Presence stanzas. Lightly tested (it doesn't crash [Prove me wrong!]) and as you'll note, I refer to documentation that doesn't yet exist.
Paul Aurich <paul@darkrain42.org>
parents:
26931
diff
changeset
|
504 |
92565c8e1e3a
Add jabber signals for IQ, Message, and Presence stanzas. Lightly tested (it doesn't crash [Prove me wrong!]) and as you'll note, I refer to documentation that doesn't yet exist.
Paul Aurich <paul@darkrain42.org>
parents:
26931
diff
changeset
|
505 from = xmlnode_get_attrib(packet, "from"); |
92565c8e1e3a
Add jabber signals for IQ, Message, and Presence stanzas. Lightly tested (it doesn't crash [Prove me wrong!]) and as you'll note, I refer to documentation that doesn't yet exist.
Paul Aurich <paul@darkrain42.org>
parents:
26931
diff
changeset
|
506 type = xmlnode_get_attrib(packet, "type"); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
507 |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
508 jb = jabber_buddy_find(js, from, TRUE); |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
509 g_return_if_fail(jb != NULL); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
510 |
26952
92565c8e1e3a
Add jabber signals for IQ, Message, and Presence stanzas. Lightly tested (it doesn't crash [Prove me wrong!]) and as you'll note, I refer to documentation that doesn't yet exist.
Paul Aurich <paul@darkrain42.org>
parents:
26931
diff
changeset
|
511 signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin, |
92565c8e1e3a
Add jabber signals for IQ, Message, and Presence stanzas. Lightly tested (it doesn't crash [Prove me wrong!]) and as you'll note, I refer to documentation that doesn't yet exist.
Paul Aurich <paul@darkrain42.org>
parents:
26931
diff
changeset
|
512 "jabber-receiving-presence", js->gc, type, from, packet)); |
92565c8e1e3a
Add jabber signals for IQ, Message, and Presence stanzas. Lightly tested (it doesn't crash [Prove me wrong!]) and as you'll note, I refer to documentation that doesn't yet exist.
Paul Aurich <paul@darkrain42.org>
parents:
26931
diff
changeset
|
513 if (signal_return) |
92565c8e1e3a
Add jabber signals for IQ, Message, and Presence stanzas. Lightly tested (it doesn't crash [Prove me wrong!]) and as you'll note, I refer to documentation that doesn't yet exist.
Paul Aurich <paul@darkrain42.org>
parents:
26931
diff
changeset
|
514 return; |
92565c8e1e3a
Add jabber signals for IQ, Message, and Presence stanzas. Lightly tested (it doesn't crash [Prove me wrong!]) and as you'll note, I refer to documentation that doesn't yet exist.
Paul Aurich <paul@darkrain42.org>
parents:
26931
diff
changeset
|
515 |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
516 jid = jabber_id_new(from); |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
517 if (jid == NULL) { |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
518 purple_debug_error("jabber", "Ignoring presence with malformed 'from' " |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
519 "JID: %s\n", from); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
520 return; |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
521 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
522 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
523 if(jb->error_msg) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
524 g_free(jb->error_msg); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
525 jb->error_msg = NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
526 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
527 |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
528 if (type == NULL) { |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
529 xmlnode *show; |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
530 char *show_data = NULL; |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
531 |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
532 state = JABBER_BUDDY_STATE_ONLINE; |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
533 |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
534 show = xmlnode_get_child(packet, "show"); |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
535 if (show) { |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
536 show_data = xmlnode_get_data(show); |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
537 if (show_data) { |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
538 state = jabber_buddy_show_get_state(show_data); |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
539 g_free(show_data); |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
540 } else |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
541 purple_debug_warning("jabber", "<show/> present on presence, " |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
542 "but no contents!\n"); |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
543 } |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
544 } else if (g_str_equal(type, "error")) { |
20814
bde477ec6a71
Stop jabber setting wants_to_die itself. This involved plumbing disconnection
Will Thompson <will.thompson@collabora.co.uk>
parents:
20318
diff
changeset
|
545 char *msg = jabber_parse_error(js, packet, NULL); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
546 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
547 state = JABBER_BUDDY_STATE_ERROR; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
548 jb->error_msg = msg ? msg : g_strdup(_("Unknown Error in presence")); |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
549 } else if (g_str_equal(type, "subscribe")) { |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
550 struct _jabber_add_permit *jap = g_new0(struct _jabber_add_permit, 1); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
551 gboolean onlist = FALSE; |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
552 PurpleAccount *account; |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
553 PurpleBuddy *buddy; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
554 JabberBuddy *jb = NULL; |
26856
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
555 xmlnode *nick; |
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
556 |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
557 account = purple_connection_get_account(js->gc); |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
558 buddy = purple_find_buddy(account, from); |
26856
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
559 nick = xmlnode_get_child_with_namespace(packet, "nick", "http://jabber.org/protocol/nick"); |
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
560 if (nick) |
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
561 nickname = xmlnode_get_data(nick); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
562 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
563 if (buddy) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
564 jb = jabber_buddy_find(js, from, TRUE); |
24427
39841a84c944
A fix from Paul Aurich for a long-standing XMPP issue with duplicate buddies. Fixes #479.
Daniel Atallah <daniel.atallah@gmail.com>
parents:
23432
diff
changeset
|
565 if ((jb->subscription & (JABBER_SUB_TO | JABBER_SUB_PENDING))) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
566 onlist = TRUE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
567 } |
15957
84bf0f949b0b
fix prompting to add a buddy after authorization if they're already on our list
Nathan Walp <nwalp@pidgin.im>
parents:
15891
diff
changeset
|
568 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
569 jap->gc = js->gc; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
570 jap->who = g_strdup(from); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
571 jap->js = js; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
572 |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
573 purple_account_request_authorization(account, from, NULL, nickname, |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
574 NULL, onlist, authorize_add_cb, deny_add_cb, jap); |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
575 |
26856
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
576 g_free(nickname); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
577 jabber_id_free(jid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
578 return; |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
579 } else if (g_str_equal(type, "subscribed")) { |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
580 /* we've been allowed to see their presence, but we don't care */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
581 jabber_id_free(jid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
582 return; |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
583 } else if (g_str_equal(type, "unsubscribe")) { |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
584 /* XXX I'm not sure this is the right way to handle this, it |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
585 * might be better to add "unsubscribe" to the presence status |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
586 * if lower down, but I'm not sure. */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
587 /* they are unsubscribing from our presence, we don't care */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
588 /* Well, maybe just a little, we might want/need to start |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
589 * acknowledging this (and the others) at some point. */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
590 jabber_id_free(jid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
591 return; |
27448
b41b69e8b341
I missed a few presence types.
Paul Aurich <paul@darkrain42.org>
parents:
27447
diff
changeset
|
592 } else if (g_str_equal(type, "probe")) { |
b41b69e8b341
I missed a few presence types.
Paul Aurich <paul@darkrain42.org>
parents:
27447
diff
changeset
|
593 purple_debug_warning("jabber", "Ignoring presence probe\n"); |
b41b69e8b341
I missed a few presence types.
Paul Aurich <paul@darkrain42.org>
parents:
27447
diff
changeset
|
594 jabber_id_free(jid); |
b41b69e8b341
I missed a few presence types.
Paul Aurich <paul@darkrain42.org>
parents:
27447
diff
changeset
|
595 return; |
b41b69e8b341
I missed a few presence types.
Paul Aurich <paul@darkrain42.org>
parents:
27447
diff
changeset
|
596 } else if (g_str_equal(type, "unavailable")) { |
b41b69e8b341
I missed a few presence types.
Paul Aurich <paul@darkrain42.org>
parents:
27447
diff
changeset
|
597 state = JABBER_BUDDY_STATE_UNAVAILABLE; |
b41b69e8b341
I missed a few presence types.
Paul Aurich <paul@darkrain42.org>
parents:
27447
diff
changeset
|
598 } else if (g_str_equal(type, "unsubscribed")) { |
b41b69e8b341
I missed a few presence types.
Paul Aurich <paul@darkrain42.org>
parents:
27447
diff
changeset
|
599 state = JABBER_BUDDY_STATE_UNKNOWN; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
600 } else { |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
601 purple_debug_warning("jabber", "Ignoring presence with invalid type " |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
602 "'%s'\n", type); |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
603 jabber_id_free(jid); |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
604 return; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
605 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
606 |
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 for(y = packet->child; y; y = y->next) { |
17609
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
609 const char *xmlns; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
610 if(y->type != XMLNODE_TYPE_TAG) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
611 continue; |
17609
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
612 xmlns = xmlnode_get_namespace(y); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
613 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
614 if(!strcmp(y->name, "status")) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
615 g_free(status); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
616 status = xmlnode_get_data(y); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
617 } else if(!strcmp(y->name, "priority")) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
618 char *p = xmlnode_get_data(y); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
619 if(p) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
620 priority = atoi(p); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
621 g_free(p); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
622 } |
24672
bba38f03085d
Remove a double call to xmlnode_get_namespace and multiple tests for xmlns
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24641
diff
changeset
|
623 } else if(xmlns == NULL) { |
bba38f03085d
Remove a double call to xmlnode_get_namespace and multiple tests for xmlns
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24641
diff
changeset
|
624 /* The rest of the cases used to check xmlns individually. */ |
bba38f03085d
Remove a double call to xmlnode_get_namespace and multiple tests for xmlns
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24641
diff
changeset
|
625 continue; |
17609
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
626 } else if(!strcmp(y->name, "delay") && !strcmp(xmlns, "urn:xmpp:delay")) { |
27186
048bcf41deef
disapproval of revision 'a383ad6a4ae7e98bbcb32b4193531ccf960eb2bb'
Paul Aurich <paul@darkrain42.org>
parents:
27185
diff
changeset
|
627 /* XXX: compare the time. jabber:x:delay can happen on presence packets that aren't really and truly delayed */ |
17605
3399dd1c258d
Forgot to implement XEP-0203 for presence packets, too.
Andreas Monitzer <pidgin@monitzer.com>
parents:
17594
diff
changeset
|
628 delayed = TRUE; |
25805 | 629 stamp = xmlnode_get_attrib(y, "stamp"); |
24672
bba38f03085d
Remove a double call to xmlnode_get_namespace and multiple tests for xmlns
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24641
diff
changeset
|
630 } else if(!strcmp(y->name, "c") && !strcmp(xmlns, "http://jabber.org/protocol/caps")) { |
17609
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
631 caps = y; /* store for later, when creating buddy resource */ |
26855
e816444c1a01
Handle User Nick notifications via <presence/> stanzas (receive-only). Refs #864.
Paul Aurich <paul@darkrain42.org>
parents:
26835
diff
changeset
|
632 } else if (g_str_equal(y->name, "nick") && g_str_equal(xmlns, "http://jabber.org/protocol/nick")) { |
26856
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
633 nickname = xmlnode_get_data(y); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
634 } else if(!strcmp(y->name, "x")) { |
27186
048bcf41deef
disapproval of revision 'a383ad6a4ae7e98bbcb32b4193531ccf960eb2bb'
Paul Aurich <paul@darkrain42.org>
parents:
27185
diff
changeset
|
635 if(!strcmp(xmlns, "jabber:x:delay")) { |
048bcf41deef
disapproval of revision 'a383ad6a4ae7e98bbcb32b4193531ccf960eb2bb'
Paul Aurich <paul@darkrain42.org>
parents:
27185
diff
changeset
|
636 /* XXX: compare the time. jabber:x:delay can happen on presence packets that aren't really and truly delayed */ |
048bcf41deef
disapproval of revision 'a383ad6a4ae7e98bbcb32b4193531ccf960eb2bb'
Paul Aurich <paul@darkrain42.org>
parents:
27185
diff
changeset
|
637 delayed = TRUE; |
048bcf41deef
disapproval of revision 'a383ad6a4ae7e98bbcb32b4193531ccf960eb2bb'
Paul Aurich <paul@darkrain42.org>
parents:
27185
diff
changeset
|
638 stamp = xmlnode_get_attrib(y, "stamp"); |
048bcf41deef
disapproval of revision 'a383ad6a4ae7e98bbcb32b4193531ccf960eb2bb'
Paul Aurich <paul@darkrain42.org>
parents:
27185
diff
changeset
|
639 } else if(!strcmp(xmlns, "http://jabber.org/protocol/muc#user")) { |
24672
bba38f03085d
Remove a double call to xmlnode_get_namespace and multiple tests for xmlns
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24641
diff
changeset
|
640 } else if(!strcmp(xmlns, "vcard-temp:x:update")) { |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
641 xmlnode *photo = xmlnode_get_child(y, "photo"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
642 if(photo) { |
17840
6e0961356343
Don't check for null before calling free. I can't help but get rid
Mark Doliner <mark@kingant.net>
parents:
17814
diff
changeset
|
643 g_free(avatar_hash); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
644 avatar_hash = xmlnode_get_data(photo); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
645 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
646 } |
27014
a8537bbcfb79
Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents:
27002
diff
changeset
|
647 } else if (!strcmp(y->name, "query") && |
25805 | 648 !strcmp(xmlnode_get_namespace(y), "jabber:iq:last")) { |
649 /* resource has specified idle */ | |
650 const gchar *seconds = xmlnode_get_attrib(y, "seconds"); | |
651 if (seconds) { | |
652 /* we may need to take "delayed" into account here */ | |
653 idle = atoi(seconds); | |
654 } | |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
655 } |
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 |
25805 | 658 if (idle && delayed && stamp) { |
659 /* if we have a delayed presence, we need to add the delay to the idle | |
660 value */ | |
661 time_t offset = time(NULL) - purple_str_to_time(stamp, TRUE, NULL, NULL, | |
662 NULL); | |
663 purple_debug_info("jabber", "got delay %s yielding %ld s offset\n", | |
664 stamp, offset); | |
27014
a8537bbcfb79
Remove trailing whitespace that has snuck in.
Paul Aurich <paul@darkrain42.org>
parents:
27002
diff
changeset
|
665 idle += offset; |
25805 | 666 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
667 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
668 if(jid->node && (chat = jabber_chat_find(js, jid->node, jid->domain))) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
669 static int i = 1; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
670 |
17004 | 671 if(state == JABBER_BUDDY_STATE_ERROR) { |
20814
bde477ec6a71
Stop jabber setting wants_to_die itself. This involved plumbing disconnection
Will Thompson <will.thompson@collabora.co.uk>
parents:
20318
diff
changeset
|
672 char *title, *msg = jabber_parse_error(js, packet, NULL); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
673 |
23262
5793bcea224c
Fix the chat-room rejoining bug where the list appears empty.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
23105
diff
changeset
|
674 if (!chat->conv) { |
5793bcea224c
Fix the chat-room rejoining bug where the list appears empty.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
23105
diff
changeset
|
675 title = g_strdup_printf(_("Error joining chat %s"), from); |
5793bcea224c
Fix the chat-room rejoining bug where the list appears empty.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
23105
diff
changeset
|
676 purple_serv_got_join_chat_failed(js->gc, chat->components); |
5793bcea224c
Fix the chat-room rejoining bug where the list appears empty.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
23105
diff
changeset
|
677 } else { |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
678 title = g_strdup_printf(_("Error in chat %s"), from); |
18739
f29794be0163
applied changes from bbcc1925d9e449bb9599d378da2764bf47da2a7a
Mark Doliner <mark@kingant.net>
parents:
18734
diff
changeset
|
679 if (g_hash_table_size(chat->members) == 0) |
f29794be0163
applied changes from bbcc1925d9e449bb9599d378da2764bf47da2a7a
Mark Doliner <mark@kingant.net>
parents:
18734
diff
changeset
|
680 serv_got_chat_left(js->gc, chat->id); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
681 } |
15823 | 682 purple_notify_error(js->gc, title, title, msg); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
683 g_free(title); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
684 g_free(msg); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
685 |
18739
f29794be0163
applied changes from bbcc1925d9e449bb9599d378da2764bf47da2a7a
Mark Doliner <mark@kingant.net>
parents:
18734
diff
changeset
|
686 if (g_hash_table_size(chat->members) == 0) |
f29794be0163
applied changes from bbcc1925d9e449bb9599d378da2764bf47da2a7a
Mark Doliner <mark@kingant.net>
parents:
18734
diff
changeset
|
687 /* Only destroy the chat if the error happened while joining */ |
f29794be0163
applied changes from bbcc1925d9e449bb9599d378da2764bf47da2a7a
Mark Doliner <mark@kingant.net>
parents:
18734
diff
changeset
|
688 jabber_chat_destroy(chat); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
689 jabber_id_free(jid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
690 g_free(status); |
17840
6e0961356343
Don't check for null before calling free. I can't help but get rid
Mark Doliner <mark@kingant.net>
parents:
17814
diff
changeset
|
691 g_free(avatar_hash); |
26856
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
692 g_free(nickname); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
693 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
694 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
695 |
27446
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
696 if (type == NULL) { |
27447
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
697 xmlnode *x; |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
698 const char *real_jid = NULL; |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
699 const char *affiliation = NULL; |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
700 const char *role = NULL; |
28205
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
701 gboolean is_our_resource = FALSE; /* Is the presence about us? */ |
27447
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
702 |
27446
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
703 /* |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
704 * XEP-0045 mandates the presence to include a resource (which is |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
705 * treated as the chat nick). Some non-compliant servers allow |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
706 * joining without a nick. |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
707 */ |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
708 if (!jid->resource) { |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
709 jabber_id_free(jid); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
710 g_free(avatar_hash); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
711 g_free(nickname); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
712 g_free(status); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
713 return; |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
714 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
715 |
27447
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
716 x = xmlnode_get_child_with_namespace(packet, "x", |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
717 "http://jabber.org/protocol/muc#user"); |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
718 if (x) { |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
719 xmlnode *status_node; |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
720 xmlnode *item_node; |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
721 |
28205
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
722 for (status_node = xmlnode_get_child(x, "status"); status_node; |
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
723 status_node = xmlnode_get_next_twin(status_node)) { |
27447
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
724 const char *code = xmlnode_get_attrib(status_node, "code"); |
28205
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
725 if (!code) |
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
726 continue; |
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
727 |
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
728 if (g_str_equal(code, "110")) { |
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
729 is_our_resource = TRUE; |
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
730 } else if (g_str_equal(code, "201")) { |
27447
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
731 if ((chat = jabber_chat_find(js, jid->node, jid->domain))) { |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
732 chat->config_dialog_type = PURPLE_REQUEST_ACTION; |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
733 chat->config_dialog_handle = |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
734 purple_request_action(js->gc, |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
735 _("Create New Room"), |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
736 _("Create New Room"), |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
737 _("You are creating a new room. Would" |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
738 " you like to configure it, or" |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
739 " accept the default settings?"), |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
740 /* Default Action */ 1, |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
741 purple_connection_get_account(js->gc), NULL, chat->conv, |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
742 chat, 2, |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
743 _("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure), |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
744 _("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room)); |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
745 } |
28205
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
746 } else if (g_str_equal(code, "210")) { |
27447
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
747 /* server rewrote room-nick */ |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
748 if((chat = jabber_chat_find(js, jid->node, jid->domain))) { |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
749 g_free(chat->handle); |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
750 chat->handle = g_strdup(jid->resource); |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
751 } |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
752 } |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
753 } |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
754 |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
755 item_node = xmlnode_get_child(x, "item"); |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
756 if (item_node) { |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
757 real_jid = xmlnode_get_attrib(item_node, "jid"); |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
758 affiliation = xmlnode_get_attrib(item_node, "affiliation"); |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
759 role = xmlnode_get_attrib(item_node, "role"); |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
760 |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
761 if (purple_strequal(affiliation, "owner")) |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
762 flags |= PURPLE_CBFLAGS_FOUNDER; |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
763 if (role) { |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
764 if (g_str_equal(role, "moderator")) |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
765 flags |= PURPLE_CBFLAGS_OP; |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
766 else if (g_str_equal(role, "participant")) |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
767 flags |= PURPLE_CBFLAGS_VOICE; |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
768 } |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
769 } |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
770 } |
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
771 |
27446
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
772 if(!chat->conv) { |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
773 char *room_jid = g_strdup_printf("%s@%s", jid->node, jid->domain); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
774 chat->id = i++; |
27447
712289e2aa6d
Rearrange all the MUC code to be together.
Paul Aurich <paul@darkrain42.org>
parents:
27446
diff
changeset
|
775 chat->muc = (x != NULL); |
27446
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
776 chat->conv = serv_got_joined_chat(js->gc, chat->id, room_jid); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
777 purple_conv_chat_set_nick(PURPLE_CONV_CHAT(chat->conv), chat->handle); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
778 |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
779 jabber_chat_disco_traffic(chat); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
780 g_free(room_jid); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
781 } |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
782 |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
783 jabber_buddy_track_resource(jb, jid->resource, priority, state, |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
784 status); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
785 |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
786 jabber_chat_track_handle(chat, jid->resource, real_jid, affiliation, role); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
787 |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
788 if(!jabber_chat_find_buddy(chat->conv, jid->resource)) |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
789 purple_conv_chat_add_user(PURPLE_CONV_CHAT(chat->conv), jid->resource, |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
790 real_jid, flags, !delayed); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
791 else |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
792 purple_conv_chat_user_set_flags(PURPLE_CONV_CHAT(chat->conv), jid->resource, |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
793 flags); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
794 } else if (g_str_equal(type, "unavailable")) { |
27515
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
795 xmlnode *x; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
796 gboolean nick_change = FALSE; |
27444
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
797 gboolean kick = FALSE; |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
798 gboolean is_our_resource = FALSE; /* Is the presence about us? */ |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
799 |
25882
54dcfe059dd4
*** Plucked rev 3993504a (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
800 /* If the chat nick is invalid, we haven't yet joined, or we've |
54dcfe059dd4
*** Plucked rev 3993504a (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
801 * already left (it was probably us leaving after we closed the |
54dcfe059dd4
*** Plucked rev 3993504a (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
802 * chat), we don't care. |
54dcfe059dd4
*** Plucked rev 3993504a (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
803 */ |
54dcfe059dd4
*** Plucked rev 3993504a (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
804 if (!jid->resource || !chat->conv || chat->left) { |
23262
5793bcea224c
Fix the chat-room rejoining bug where the list appears empty.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
23105
diff
changeset
|
805 if (chat->left && |
5793bcea224c
Fix the chat-room rejoining bug where the list appears empty.
Sadrul Habib Chowdhury <imadil@gmail.com>
parents:
23105
diff
changeset
|
806 jid->resource && chat->handle && !strcmp(jid->resource, chat->handle)) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
807 jabber_chat_destroy(chat); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
808 jabber_id_free(jid); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
809 g_free(status); |
17840
6e0961356343
Don't check for null before calling free. I can't help but get rid
Mark Doliner <mark@kingant.net>
parents:
17814
diff
changeset
|
810 g_free(avatar_hash); |
26856
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
811 g_free(nickname); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
812 return; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
813 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
814 |
27444
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
815 is_our_resource = (0 == g_utf8_collate(jid->resource, chat->handle)); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
816 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
817 jabber_buddy_remove_resource(jb, jid->resource); |
27515
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
818 |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
819 x = xmlnode_get_child_with_namespace(packet, "x", |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
820 "http://jabber.org/protocol/muc#user"); |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
821 if (chat->muc && x) { |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
822 const char *nick; |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
823 const char *item_jid = NULL; |
27670
b448b259e3cf
The item JID will match the 'to' JID, not the from.
Paul Aurich <paul@darkrain42.org>
parents:
27667
diff
changeset
|
824 const char *to; |
27515
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
825 xmlnode *stat; |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
826 xmlnode *item; |
27444
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
827 |
27515
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
828 item = xmlnode_get_child(x, "item"); |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
829 if (item) |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
830 item_jid = xmlnode_get_attrib(item, "jid"); |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
831 |
28205
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
832 for (stat = xmlnode_get_child(x, "status"); stat; |
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
833 stat = xmlnode_get_next_twin(stat)) { |
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
834 const char *code = xmlnode_get_attrib(stat, "code"); |
27515
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
835 |
28205
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
836 if (!code) |
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
837 continue; |
27515
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
838 |
28205
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
839 if (g_str_equal(code, "110")) { |
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
840 is_our_resource = TRUE; |
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
841 } else if(!strcmp(code, "301")) { |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
842 /* XXX: we got banned */ |
27515
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
843 } else if(!strcmp(code, "303") && item && |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
844 (nick = xmlnode_get_attrib(item, "nick"))) { |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
845 nick_change = TRUE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
846 if(!strcmp(jid->resource, chat->handle)) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
847 g_free(chat->handle); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
848 chat->handle = g_strdup(nick); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
849 } |
28205
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
850 |
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
851 /* TODO: This should probably be moved out of the loop */ |
15823 | 852 purple_conv_chat_rename_user(PURPLE_CONV_CHAT(chat->conv), jid->resource, nick); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
853 jabber_chat_remove_handle(chat, jid->resource); |
28205
f05c87f3121e
jabber: Read all MUC status codes in a presence. Fixes #6651.
Paul Aurich <paul@darkrain42.org>
parents:
28079
diff
changeset
|
854 continue; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
855 } else if(!strcmp(code, "307")) { |
27444
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
856 /* Someone was kicked from the room */ |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
857 xmlnode *reason = NULL, *actor = NULL; |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
858 const char *actor_name = NULL; |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
859 char *reason_text = NULL; |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
860 char *tmp; |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
861 |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
862 kick = TRUE; |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
863 |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
864 if (item) { |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
865 reason = xmlnode_get_child(item, "reason"); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
866 actor = xmlnode_get_child(item, "actor"); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
867 |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
868 if (reason != NULL) |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
869 reason_text = xmlnode_get_data(reason); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
870 if (actor != NULL) |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
871 actor_name = xmlnode_get_attrib(actor, "jid"); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
872 } |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
873 |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
874 if (reason_text == NULL) |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
875 reason_text = g_strdup(_("No reason")); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
876 |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
877 if (is_our_resource) { |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
878 if (actor_name != NULL) |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
879 tmp = g_strdup_printf(_("You have been kicked by %s: (%s)"), |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
880 actor_name, reason_text); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
881 else |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
882 tmp = g_strdup_printf(_("You have been kicked: (%s)"), |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
883 reason_text); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
884 } else { |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
885 if (actor_name != NULL) |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
886 tmp = g_strdup_printf(_("Kicked by %s (%s)"), |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
887 actor_name, reason_text); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
888 else |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
889 tmp = g_strdup_printf(_("Kicked (%s)"), |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
890 reason_text); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
891 } |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
892 |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
893 g_free(reason_text); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
894 g_free(status); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
895 status = tmp; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
896 } else if(!strcmp(code, "321")) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
897 /* XXX: removed due to an affiliation change */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
898 } else if(!strcmp(code, "322")) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
899 /* XXX: removed because room is now members-only */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
900 } else if(!strcmp(code, "332")) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
901 /* XXX: removed due to system shutdown */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
902 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
903 } |
27515
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
904 |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
905 /* |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
906 * Possibly another connected resource of our JID (see XEP-0045 |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
907 * v1.24 section 7.1.10) being disconnected. Should be |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
908 * distinguished by the item_jid. |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
909 * Also possibly works around bits of an Openfire bug. See |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
910 * #8319. |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
911 */ |
27670
b448b259e3cf
The item JID will match the 'to' JID, not the from.
Paul Aurich <paul@darkrain42.org>
parents:
27667
diff
changeset
|
912 to = xmlnode_get_attrib(packet, "to"); |
b448b259e3cf
The item JID will match the 'to' JID, not the from.
Paul Aurich <paul@darkrain42.org>
parents:
27667
diff
changeset
|
913 if (is_our_resource && item_jid && !purple_strequal(to, item_jid)) { |
27515
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
914 /* TODO: When the above is a loop, this needs to still act |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
915 * sanely for all cases (this code is a little fragile). */ |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
916 if (!kick && !nick_change) |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
917 /* Presumably, kicks and nick changes also affect us. */ |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
918 is_our_resource = FALSE; |
e1090ed76286
Notice when the MUC item JID on unavailable presence references another resource. Refs #8319.
Paul Aurich <paul@darkrain42.org>
parents:
27448
diff
changeset
|
919 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
920 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
921 if(!nick_change) { |
27444
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
922 if (is_our_resource) { |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
923 if (kick) |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
924 purple_conv_chat_write(PURPLE_CONV_CHAT(chat->conv), jid->resource, |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
925 status, PURPLE_MESSAGE_SYSTEM, time(NULL)); |
c4196cd47602
Add support for XEP-0045 code 307 (a.k.a. kicks).
Paul Aurich <paul@darkrain42.org>
parents:
27441
diff
changeset
|
926 |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
927 serv_got_chat_left(js->gc, chat->id); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
928 jabber_chat_destroy(chat); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
929 } else { |
15823 | 930 purple_conv_chat_remove_user(PURPLE_CONV_CHAT(chat->conv), jid->resource, |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
931 status); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
932 jabber_chat_remove_handle(chat, jid->resource); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
933 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
934 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
935 } else { |
27446
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
936 /* A type that isn't available or unavailable */ |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
937 purple_debug_error("jabber", "MUC presence with bad type: %s\n", |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
938 type); |
25882
54dcfe059dd4
*** Plucked rev 3993504a (darkrain42@pidgin.im):
Paul Aurich <paul@darkrain42.org>
parents:
24672
diff
changeset
|
939 |
27446
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
940 jabber_id_free(jid); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
941 g_free(avatar_hash); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
942 g_free(status); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
943 g_free(nickname); |
735e58197140
Rearranging this section and adding a catch for stuff that can't happen
Paul Aurich <paul@darkrain42.org>
parents:
27445
diff
changeset
|
944 g_return_if_reached(); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
945 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
946 } else { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
947 buddy_name = g_strdup_printf("%s%s%s", jid->node ? jid->node : "", |
18691
54a5fbeadd7c
Now showing ad-hoc commands of other clients connected to the same account in the account menu (per XEP-0146). Since it is becoming messy in that menu, I also prefixed all ad-hoc commands with the node this command belongs to in [], which is the resource name for clients and the domain name for the server. Examples: "[home] Set status" for clients and "[jabber.org] Send message to all connected users" for servers.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
948 jid->node ? "@" : "", jid->domain); |
15823 | 949 if((b = purple_find_buddy(js->gc->account, buddy_name)) == NULL) { |
18691
54a5fbeadd7c
Now showing ad-hoc commands of other clients connected to the same account in the account menu (per XEP-0146). Since it is becoming messy in that menu, I also prefixed all ad-hoc commands with the node this command belongs to in [], which is the resource name for clients and the domain name for the server. Examples: "[home] Set status" for clients and "[jabber.org] Send message to all connected users" for servers.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
950 if(!jid->node || strcmp(jid->node,js->user->node) || strcmp(jid->domain,js->user->domain)) { |
22475
3225c99785b8
Fix a bunch of compiler warnings caused by my addition of G_GNUC_PRINTF()
Mark Doliner <mark@kingant.net>
parents:
21688
diff
changeset
|
951 purple_debug_warning("jabber", "Got presence for unknown buddy %s on account %s (%p)\n", |
18691
54a5fbeadd7c
Now showing ad-hoc commands of other clients connected to the same account in the account menu (per XEP-0146). Since it is becoming messy in that menu, I also prefixed all ad-hoc commands with the node this command belongs to in [], which is the resource name for clients and the domain name for the server. Examples: "[home] Set status" for clients and "[jabber.org] Send message to all connected users" for servers.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
952 buddy_name, purple_account_get_username(js->gc->account), js->gc->account); |
54a5fbeadd7c
Now showing ad-hoc commands of other clients connected to the same account in the account menu (per XEP-0146). Since it is becoming messy in that menu, I also prefixed all ad-hoc commands with the node this command belongs to in [], which is the resource name for clients and the domain name for the server. Examples: "[home] Set status" for clients and "[jabber.org] Send message to all connected users" for servers.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
953 jabber_id_free(jid); |
54a5fbeadd7c
Now showing ad-hoc commands of other clients connected to the same account in the account menu (per XEP-0146). Since it is becoming messy in that menu, I also prefixed all ad-hoc commands with the node this command belongs to in [], which is the resource name for clients and the domain name for the server. Examples: "[home] Set status" for clients and "[jabber.org] Send message to all connected users" for servers.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
954 g_free(avatar_hash); |
54a5fbeadd7c
Now showing ad-hoc commands of other clients connected to the same account in the account menu (per XEP-0146). Since it is becoming messy in that menu, I also prefixed all ad-hoc commands with the node this command belongs to in [], which is the resource name for clients and the domain name for the server. Examples: "[home] Set status" for clients and "[jabber.org] Send message to all connected users" for servers.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
955 g_free(buddy_name); |
26856
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
956 g_free(nickname); |
18691
54a5fbeadd7c
Now showing ad-hoc commands of other clients connected to the same account in the account menu (per XEP-0146). Since it is becoming messy in that menu, I also prefixed all ad-hoc commands with the node this command belongs to in [], which is the resource name for clients and the domain name for the server. Examples: "[home] Set status" for clients and "[jabber.org] Send message to all connected users" for servers.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
957 g_free(status); |
54a5fbeadd7c
Now showing ad-hoc commands of other clients connected to the same account in the account menu (per XEP-0146). Since it is becoming messy in that menu, I also prefixed all ad-hoc commands with the node this command belongs to in [], which is the resource name for clients and the domain name for the server. Examples: "[home] Set status" for clients and "[jabber.org] Send message to all connected users" for servers.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
958 return; |
54a5fbeadd7c
Now showing ad-hoc commands of other clients connected to the same account in the account menu (per XEP-0146). Since it is becoming messy in that menu, I also prefixed all ad-hoc commands with the node this command belongs to in [], which is the resource name for clients and the domain name for the server. Examples: "[home] Set status" for clients and "[jabber.org] Send message to all connected users" for servers.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
959 } else { |
54a5fbeadd7c
Now showing ad-hoc commands of other clients connected to the same account in the account menu (per XEP-0146). Since it is becoming messy in that menu, I also prefixed all ad-hoc commands with the node this command belongs to in [], which is the resource name for clients and the domain name for the server. Examples: "[home] Set status" for clients and "[jabber.org] Send message to all connected users" for servers.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
960 /* this is a different resource of our own account. Resume even when this account isn't on our blist */ |
54a5fbeadd7c
Now showing ad-hoc commands of other clients connected to the same account in the account menu (per XEP-0146). Since it is becoming messy in that menu, I also prefixed all ad-hoc commands with the node this command belongs to in [], which is the resource name for clients and the domain name for the server. Examples: "[home] Set status" for clients and "[jabber.org] Send message to all connected users" for servers.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
961 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
962 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
963 |
18691
54a5fbeadd7c
Now showing ad-hoc commands of other clients connected to the same account in the account menu (per XEP-0146). Since it is becoming messy in that menu, I also prefixed all ad-hoc commands with the node this command belongs to in [], which is the resource name for clients and the domain name for the server. Examples: "[home] Set status" for clients and "[jabber.org] Send message to all connected users" for servers.
Andreas Monitzer <pidgin@monitzer.com>
parents:
18684
diff
changeset
|
964 if(b && avatar_hash) { |
16386
e0c9a46b459f
Move the prpl icon checksum code into the core, so we can delete the
Richard Laager <rlaager@wiktel.com>
parents:
15957
diff
changeset
|
965 const char *avatar_hash2 = purple_buddy_icons_get_checksum_for_user(b); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
966 if(!avatar_hash2 || strcmp(avatar_hash, avatar_hash2)) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
967 JabberIq *iq; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
968 xmlnode *vcard; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
969 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
970 /* XXX this is a crappy way of trying to prevent |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
971 * someone from spamming us with presence packets |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
972 * and causing us to DoS ourselves...what we really |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
973 * need is a queue system that can throttle itself, |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
974 * but i'm too tired to write that right now */ |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
975 if(!g_slist_find(js->pending_avatar_requests, jb)) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
976 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
977 js->pending_avatar_requests = g_slist_prepend(js->pending_avatar_requests, jb); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
978 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
979 iq = jabber_iq_new(js, JABBER_IQ_GET); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
980 xmlnode_set_attrib(iq->node, "to", buddy_name); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
981 vcard = xmlnode_new_child(iq->node, "vCard"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
982 xmlnode_set_namespace(vcard, "vcard-temp"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
983 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
984 jabber_iq_set_callback(iq, jabber_vcard_parse_avatar, NULL); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
985 jabber_iq_send(iq); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
986 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
987 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
988 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
989 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
990 if(state == JABBER_BUDDY_STATE_ERROR || |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
991 (type && (g_str_equal(type, "unavailable") || |
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
992 g_str_equal(type, "unsubscribed")))) { |
15823 | 993 PurpleConversation *conv; |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
994 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
995 jabber_buddy_remove_resource(jb, jid->resource); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
996 if((conv = jabber_find_unnormalized_conv(from, js->gc->account))) |
15823 | 997 purple_conversation_set_name(conv, buddy_name); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
998 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
999 } else { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1000 jbr = jabber_buddy_track_resource(jb, jid->resource, priority, |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1001 state, status); |
25805 | 1002 if (idle) { |
1003 jbr->idle = time(NULL) - idle; | |
1004 } else { | |
1005 jbr->idle = 0; | |
17609
f88b3a093cba
Implemented ad-hoc commands for the buddy action menu (untested), implemented the receiving end of XEP-0115: Entity Capabilities. Note that this seems not to be reliable right now, since some clients seem to have a very broken [read: completely non-functional] implementation (most notably Gajim and the py-transports).
Andreas Monitzer <pidgin@monitzer.com>
parents:
17605
diff
changeset
|
1006 } |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1007 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1008 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1009 if((found_jbr = jabber_buddy_find_resource(jb, NULL))) { |
20571
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20570
diff
changeset
|
1010 jabber_google_presence_incoming(js, buddy_name, found_jbr); |
c97e3ab9ef11
Music support for Google Talk
Sean Egan <seanegan@gmail.com>
parents:
20570
diff
changeset
|
1011 purple_prpl_got_user_status(js->gc->account, buddy_name, jabber_buddy_state_get_status_id(found_jbr->state), "priority", found_jbr->priority, "message", found_jbr->status, NULL); |
25805 | 1012 purple_prpl_got_user_idle(js->gc->account, buddy_name, found_jbr->idle, found_jbr->idle); |
26856
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
1013 if (nickname) |
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
1014 serv_got_alias(js->gc, buddy_name, nickname); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1015 } else { |
15823 | 1016 purple_prpl_got_user_status(js->gc->account, buddy_name, "offline", status ? "message" : NULL, status, NULL); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1017 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1018 g_free(buddy_name); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1019 } |
26835
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1020 |
27445
eff7db4db632
Various minor changes to jabber_presence_parse. No functionality changes.
Paul Aurich <paul@darkrain42.org>
parents:
27444
diff
changeset
|
1021 if (caps && !type) { |
26835
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1022 /* handle Entity Capabilities (XEP-0115) */ |
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1023 const char *node = xmlnode_get_attrib(caps, "node"); |
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1024 const char *ver = xmlnode_get_attrib(caps, "ver"); |
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1025 const char *hash = xmlnode_get_attrib(caps, "hash"); |
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1026 const char *ext = xmlnode_get_attrib(caps, "ext"); |
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1027 |
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1028 /* v1.3 uses: node, ver, and optionally ext. |
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1029 * v1.5 uses: node, ver, and hash. */ |
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1030 if (node && *node && ver && *ver) { |
26928
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1031 gchar **exts = ext && *ext ? g_strsplit(ext, " ", -1) : NULL; |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1032 jbr = jabber_buddy_find_resource(jb, jid->resource); |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1033 |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1034 /* Look it up if we don't already have all this information */ |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1035 if (!jbr || !jbr->caps.info || |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1036 !g_str_equal(node, jbr->caps.info->tuple.node) || |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1037 !g_str_equal(ver, jbr->caps.info->tuple.ver) || |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1038 !purple_strequal(hash, jbr->caps.info->tuple.hash) || |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1039 !jabber_caps_exts_known(jbr->caps.info, (gchar **)exts)) { |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1040 JabberPresenceCapabilities *userdata = g_new0(JabberPresenceCapabilities, 1); |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1041 userdata->js = js; |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1042 userdata->jb = jb; |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1043 userdata->from = g_strdup(from); |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1044 jabber_caps_get_info(js, from, node, ver, hash, exts, |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1045 (jabber_caps_get_info_cb)jabber_presence_set_capabilities, |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1046 userdata); |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1047 } else { |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1048 if (exts) |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1049 g_strfreev(exts); |
d0a049ede31e
Only call jabber_caps_get_info if we don't have all the information we want.
Paul Aurich <paul@darkrain42.org>
parents:
26924
diff
changeset
|
1050 } |
26835
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1051 } |
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1052 } |
09dc63a697e1
Fetch and track capabilities for MUC members. Add a further constraint for
Paul Aurich <paul@darkrain42.org>
parents:
26834
diff
changeset
|
1053 |
26856
867e231bffbc
A little bit better (free memory and support receiving the nick in subscriptions) and Changelog.
Paul Aurich <paul@darkrain42.org>
parents:
26855
diff
changeset
|
1054 g_free(nickname); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1055 g_free(status); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1056 jabber_id_free(jid); |
17840
6e0961356343
Don't check for null before calling free. I can't help but get rid
Mark Doliner <mark@kingant.net>
parents:
17814
diff
changeset
|
1057 g_free(avatar_hash); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1058 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1059 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1060 void jabber_presence_subscription_set(JabberStream *js, const char *who, const char *type) |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1061 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1062 xmlnode *presence = xmlnode_new("presence"); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1063 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1064 xmlnode_set_attrib(presence, "to", who); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1065 xmlnode_set_attrib(presence, "type", type); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1066 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1067 jabber_send(js, presence); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1068 xmlnode_free(presence); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1069 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1070 |
15823 | 1071 void purple_status_to_jabber(const PurpleStatus *status, JabberBuddyState *state, char **msg, int *priority) |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1072 { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1073 const char *status_id = NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1074 const char *formatted_msg = NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1075 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1076 if(state) *state = JABBER_BUDDY_STATE_UNKNOWN; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1077 if(msg) *msg = NULL; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1078 if(priority) *priority = 0; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1079 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1080 if(!status) { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1081 if(state) *state = JABBER_BUDDY_STATE_UNAVAILABLE; |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1082 } else { |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1083 if(state) { |
15823 | 1084 status_id = purple_status_get_id(status); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1085 *state = jabber_buddy_status_id_get_state(status_id); |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1086 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1087 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1088 if(msg) { |
15823 | 1089 formatted_msg = purple_status_get_attr_string(status, "message"); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1090 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1091 /* if the message is blank, then there really isn't a message */ |
27563
7a2891487a00
Don't pre-escape jbr->status. Almost every place required it in unescaped
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
27515
diff
changeset
|
1092 if(formatted_msg && *formatted_msg) |
17814 | 1093 *msg = purple_markup_strip_html(formatted_msg); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1094 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1095 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1096 if(priority) |
15823 | 1097 *priority = purple_status_get_attr_int(status, "priority"); |
15374
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1098 } |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
1099 } |