Mon, 12 Jun 2017 17:48:37 -0300
Merge release-2.x.y into default
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
1 | /** |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
2 | * @file session.c |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
3 | * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
4 | * purple |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
5 | * |
|
28322
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
26955
diff
changeset
|
6 | * Purple is the legal property of its developers, whose names are too numerous |
|
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
26955
diff
changeset
|
7 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
26955
diff
changeset
|
8 | * source distribution. |
|
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
26955
diff
changeset
|
9 | * |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
10 | * This program is free software; you can redistribute it and/or modify |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
11 | * it under the terms of the GNU General Public License as published by |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
12 | * the Free Software Foundation; either version 2 of the License, or |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
13 | * (at your option) any later version. |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
14 | * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
15 | * This program is distributed in the hope that it will be useful, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
18 | * GNU General Public License for more details. |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
19 | * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
20 | * You should have received a copy of the GNU General Public License |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
21 | * along with this program; if not, write to the Free Software |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
22 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
23 | */ |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
24 | |
|
26221
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
25 | #include "internal.h" |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
26 | #include "glibcompat.h" |
|
26221
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
27 | |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
28 | #include "content.h" |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
29 | #include "debug.h" |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
30 | #include "session.h" |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
31 | #include "jingle.h" |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
32 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
33 | #include <string.h> |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
34 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
35 | struct _JingleSessionPrivate |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
36 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
37 | gchar *sid; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
38 | JabberStream *js; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
39 | gchar *remote_jid; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
40 | gchar *local_jid; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
41 | gboolean is_initiator; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
42 | gboolean state; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
43 | GList *contents; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
44 | GList *pending_contents; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
45 | }; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
46 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
47 | #define JINGLE_SESSION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), JINGLE_TYPE_SESSION, JingleSessionPrivate)) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
48 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
49 | static void jingle_session_class_init (JingleSessionClass *klass); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
50 | static void jingle_session_init (JingleSession *session); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
51 | static void jingle_session_finalize (GObject *object); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
52 | static void jingle_session_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
53 | static void jingle_session_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
54 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
55 | enum { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
56 | PROP_0, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
57 | PROP_SID, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
58 | PROP_JS, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
59 | PROP_REMOTE_JID, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
60 | PROP_LOCAL_JID, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
61 | PROP_IS_INITIATOR, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
62 | PROP_STATE, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
63 | PROP_CONTENTS, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
64 | PROP_PENDING_CONTENTS, |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
65 | PROP_LAST |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
66 | }; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
67 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
68 | static GObjectClass *parent_class = NULL; |
|
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
69 | static GParamSpec *properties[PROP_LAST]; |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
70 | |
|
36889
4dfe09057bed
Register jingle types dynamically
Ankit Vani <a@nevitus.org>
parents:
34935
diff
changeset
|
71 | PURPLE_DEFINE_TYPE(JingleSession, jingle_session, G_TYPE_OBJECT); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
72 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
73 | static void |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
74 | jingle_session_class_init (JingleSessionClass *klass) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
75 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
76 | GObjectClass *gobject_class = (GObjectClass*)klass; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
77 | parent_class = g_type_class_peek_parent(klass); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
29665
diff
changeset
|
78 | |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
79 | gobject_class->finalize = jingle_session_finalize; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
80 | gobject_class->set_property = jingle_session_set_property; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
81 | gobject_class->get_property = jingle_session_get_property; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
82 | |
|
35083
3b6577fd64ee
jabber: use g_object_class_install_properties instead of repeated g_object_class_install_property
Ankit Vani <a@nevitus.org>
parents:
35076
diff
changeset
|
83 | g_type_class_add_private(klass, sizeof(JingleSessionPrivate)); |
|
3b6577fd64ee
jabber: use g_object_class_install_properties instead of repeated g_object_class_install_property
Ankit Vani <a@nevitus.org>
parents:
35076
diff
changeset
|
84 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
85 | properties[PROP_SID] = g_param_spec_string("sid", |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
86 | "Session ID", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
87 | "The unique session ID of the Jingle Session.", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
88 | NULL, |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
89 | G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
90 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
91 | properties[PROP_JS] = g_param_spec_pointer("js", |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
92 | "JabberStream", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
93 | "The Jabber stream associated with this session.", |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
94 | G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
95 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
96 | properties[PROP_REMOTE_JID] = g_param_spec_string("remote-jid", |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
97 | "Remote JID", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
98 | "The JID of the remote participant.", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
99 | NULL, |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
100 | G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
101 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
102 | properties[PROP_LOCAL_JID] = g_param_spec_string("local-jid", |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
103 | "Local JID", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
104 | "The JID of the local participant.", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
105 | NULL, |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
106 | G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
107 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
108 | properties[PROP_IS_INITIATOR] = g_param_spec_boolean("is-initiator", |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
109 | "Is Initiator", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
110 | "Whether or not the local JID is the initiator of the session.", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
111 | FALSE, |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
112 | G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
113 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
114 | properties[PROP_STATE] = g_param_spec_boolean("state", |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
115 | "State", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
116 | "The state of the session (PENDING=FALSE, ACTIVE=TRUE).", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
117 | FALSE, |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
118 | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
119 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
120 | properties[PROP_CONTENTS] = g_param_spec_pointer("contents", |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
121 | "Contents", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
122 | "The active contents contained within this session", |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
123 | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
124 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
125 | properties[PROP_PENDING_CONTENTS] = g_param_spec_pointer("pending-contents", |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
126 | "Pending contents", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
127 | "The pending contents contained within this session", |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
128 | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
129 | |
|
35083
3b6577fd64ee
jabber: use g_object_class_install_properties instead of repeated g_object_class_install_property
Ankit Vani <a@nevitus.org>
parents:
35076
diff
changeset
|
130 | g_object_class_install_properties(gobject_class, PROP_LAST, properties); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
131 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
132 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
133 | static void |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
134 | jingle_session_init (JingleSession *session) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
135 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
136 | session->priv = JINGLE_SESSION_GET_PRIVATE(session); |
|
26411
6b7c565cfa9a
Fix a bunch of memsets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26404
diff
changeset
|
137 | memset(session->priv, 0, sizeof(*session->priv)); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
138 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
139 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
140 | static void |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
141 | jingle_session_finalize (GObject *session) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
142 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
143 | JingleSessionPrivate *priv = JINGLE_SESSION_GET_PRIVATE(session); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
144 | purple_debug_info("jingle","jingle_session_finalize\n"); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
145 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
146 | g_hash_table_remove(priv->js->sessions, priv->sid); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
147 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
148 | g_free(priv->sid); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
149 | g_free(priv->remote_jid); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
150 | g_free(priv->local_jid); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
151 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
152 | for (; priv->contents; priv->contents = |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
153 | g_list_delete_link(priv->contents, priv->contents)) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
154 | g_object_unref(priv->contents->data); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
155 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
156 | for (; priv->pending_contents; priv->pending_contents = |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
157 | g_list_delete_link(priv->pending_contents, priv->pending_contents)) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
158 | g_object_unref(priv->pending_contents->data); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
159 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
160 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
161 | parent_class->finalize(session); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
162 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
163 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
164 | static void |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
165 | jingle_session_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
166 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
167 | JingleSession *session; |
|
32053
e11a51dcd2d8
jabber: Add a few extra g_return_if_fails to the Jingle code
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
168 | |
|
e11a51dcd2d8
jabber: Add a few extra g_return_if_fails to the Jingle code
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
169 | g_return_if_fail(object != NULL); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
170 | g_return_if_fail(JINGLE_IS_SESSION(object)); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
171 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
172 | session = JINGLE_SESSION(object); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
173 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
174 | switch (prop_id) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
175 | case PROP_SID: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
176 | g_free(session->priv->sid); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
177 | session->priv->sid = g_value_dup_string(value); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
178 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
179 | case PROP_JS: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
180 | session->priv->js = g_value_get_pointer(value); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
181 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
182 | case PROP_REMOTE_JID: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
183 | g_free(session->priv->remote_jid); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
184 | session->priv->remote_jid = g_value_dup_string(value); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
185 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
186 | case PROP_LOCAL_JID: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
187 | g_free(session->priv->local_jid); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
188 | session->priv->local_jid = g_value_dup_string(value); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
189 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
190 | case PROP_IS_INITIATOR: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
191 | session->priv->is_initiator = g_value_get_boolean(value); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
192 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
193 | case PROP_STATE: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
194 | session->priv->state = g_value_get_boolean(value); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
195 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
196 | case PROP_CONTENTS: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
197 | session->priv->contents = g_value_get_pointer(value); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
198 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
199 | case PROP_PENDING_CONTENTS: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
200 | session->priv->pending_contents = g_value_get_pointer(value); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
201 | break; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
29665
diff
changeset
|
202 | default: |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
203 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
204 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
205 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
206 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
207 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
208 | static void |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
209 | jingle_session_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
210 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
211 | JingleSession *session; |
|
32053
e11a51dcd2d8
jabber: Add a few extra g_return_if_fails to the Jingle code
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
212 | |
|
e11a51dcd2d8
jabber: Add a few extra g_return_if_fails to the Jingle code
Paul Aurich <darkrain42@pidgin.im>
parents:
31294
diff
changeset
|
213 | g_return_if_fail(object != NULL); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
214 | g_return_if_fail(JINGLE_IS_SESSION(object)); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
29665
diff
changeset
|
215 | |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
216 | session = JINGLE_SESSION(object); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
217 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
218 | switch (prop_id) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
219 | case PROP_SID: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
220 | g_value_set_string(value, session->priv->sid); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
221 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
222 | case PROP_JS: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
223 | g_value_set_pointer(value, session->priv->js); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
224 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
225 | case PROP_REMOTE_JID: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
226 | g_value_set_string(value, session->priv->remote_jid); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
227 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
228 | case PROP_LOCAL_JID: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
229 | g_value_set_string(value, session->priv->local_jid); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
230 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
231 | case PROP_IS_INITIATOR: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
232 | g_value_set_boolean(value, session->priv->is_initiator); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
233 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
234 | case PROP_STATE: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
235 | g_value_set_boolean(value, session->priv->state); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
236 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
237 | case PROP_CONTENTS: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
238 | g_value_set_pointer(value, session->priv->contents); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
239 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
240 | case PROP_PENDING_CONTENTS: |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
241 | g_value_set_pointer(value, session->priv->pending_contents); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
242 | break; |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
29665
diff
changeset
|
243 | default: |
|
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
29665
diff
changeset
|
244 | G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
245 | break; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
246 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
247 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
248 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
249 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
250 | JingleSession * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
251 | jingle_session_create(JabberStream *js, const gchar *sid, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
252 | const gchar *local_jid, const gchar *remote_jid, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
253 | gboolean is_initiator) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
254 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
255 | JingleSession *session = g_object_new(jingle_session_get_type(), |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
256 | "js", js, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
257 | "sid", sid, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
258 | "local-jid", local_jid, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
259 | "remote-jid", remote_jid, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
260 | "is_initiator", is_initiator, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
261 | NULL); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
262 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
263 | /* insert it into the hash table */ |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
264 | if (!js->sessions) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
265 | purple_debug_info("jingle", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
266 | "Creating hash table for sessions\n"); |
|
32065
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
267 | js->sessions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
268 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
269 | purple_debug_info("jingle", |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
270 | "inserting session with key: %s into table\n", sid); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
271 | g_hash_table_insert(js->sessions, g_strdup(sid), session); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
272 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
273 | return session; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
274 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
275 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
276 | JabberStream * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
277 | jingle_session_get_js(JingleSession *session) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
278 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
279 | JabberStream *js; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
280 | g_object_get(session, "js", &js, NULL); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
281 | return js; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
282 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
283 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
284 | gchar * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
285 | jingle_session_get_sid(JingleSession *session) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
286 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
287 | gchar *sid; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
288 | g_object_get(session, "sid", &sid, NULL); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
289 | return sid; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
290 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
291 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
292 | gchar * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
293 | jingle_session_get_local_jid(JingleSession *session) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
294 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
295 | gchar *local_jid; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
296 | g_object_get(session, "local-jid", &local_jid, NULL); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
297 | return local_jid; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
298 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
299 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
300 | gchar * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
301 | jingle_session_get_remote_jid(JingleSession *session) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
302 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
303 | gchar *remote_jid; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
304 | g_object_get(session, "remote-jid", &remote_jid, NULL); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
305 | return remote_jid; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
306 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
307 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
308 | gboolean |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
309 | jingle_session_is_initiator(JingleSession *session) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
310 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
311 | gboolean is_initiator; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
312 | g_object_get(session, "is-initiator", &is_initiator, NULL); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
313 | return is_initiator; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
314 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
315 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
316 | gboolean |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
317 | jingle_session_get_state(JingleSession *session) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
318 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
319 | gboolean state; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
320 | g_object_get(session, "state", &state, NULL); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
321 | return state; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
322 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
323 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
324 | GList * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
325 | jingle_session_get_contents(JingleSession *session) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
326 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
327 | GList *contents; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
328 | g_object_get(session, "contents", &contents, NULL); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
329 | return contents; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
330 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
331 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
332 | GList * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
333 | jingle_session_get_pending_contents(JingleSession *session) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
334 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
335 | GList *pending_contents; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
336 | g_object_get(session, "pending-contents", &pending_contents, NULL); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
337 | return pending_contents; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
338 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
339 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
340 | JingleSession * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
341 | jingle_session_find_by_sid(JabberStream *js, const gchar *sid) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
342 | { |
|
28977
7621cfb9152e
jabber/jingle: Slightly less repitition.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
343 | JingleSession *session = NULL; |
|
7621cfb9152e
jabber/jingle: Slightly less repitition.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
344 | |
|
7621cfb9152e
jabber/jingle: Slightly less repitition.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
345 | if (js->sessions) |
|
7621cfb9152e
jabber/jingle: Slightly less repitition.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
346 | session = g_hash_table_lookup(js->sessions, sid); |
|
7621cfb9152e
jabber/jingle: Slightly less repitition.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
347 | |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
348 | purple_debug_info("jingle", "find_by_id %s\n", sid); |
|
28977
7621cfb9152e
jabber/jingle: Slightly less repitition.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
349 | purple_debug_info("jingle", "lookup: %p\n", session); |
|
7621cfb9152e
jabber/jingle: Slightly less repitition.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
350 | |
|
7621cfb9152e
jabber/jingle: Slightly less repitition.
Paul Aurich <darkrain42@pidgin.im>
parents:
28322
diff
changeset
|
351 | return session; |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
352 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
353 | |
|
26221
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
354 | static gboolean find_by_jid_ghr(gpointer key, |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
355 | gpointer value, gpointer user_data) |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
356 | { |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
357 | JingleSession *session = (JingleSession *)value; |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
358 | const gchar *jid = user_data; |
|
29060
6b97b5fa7076
strchr() is valid on a UTF8 string when searching for an ASCII character
Paul Aurich <darkrain42@pidgin.im>
parents:
28977
diff
changeset
|
359 | gboolean use_bare = strchr(jid, '/') == NULL; |
|
26221
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
360 | gchar *remote_jid = jingle_session_get_remote_jid(session); |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
361 | gchar *cmp_jid = use_bare ? jabber_get_bare_jid(remote_jid) |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
362 | : g_strdup(remote_jid); |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
363 | g_free(remote_jid); |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
32065
diff
changeset
|
364 | if (purple_strequal(jid, cmp_jid)) { |
|
26221
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
365 | g_free(cmp_jid); |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
366 | return TRUE; |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
367 | } |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
368 | g_free(cmp_jid); |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
369 | |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
370 | return FALSE; |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
371 | } |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
372 | |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
373 | JingleSession * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
374 | jingle_session_find_by_jid(JabberStream *js, const gchar *jid) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
375 | { |
|
26221
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
376 | return js->sessions != NULL ? |
|
bc5d5d3fe4de
Make it compile in Windows with the equivalent of --disable-vv.
Michael Ruprecht <maiku@pidgin.im>
parents:
26143
diff
changeset
|
377 | g_hash_table_find(js->sessions, |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
29665
diff
changeset
|
378 | find_by_jid_ghr, (gpointer)jid) : NULL; |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
379 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
380 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
381 | static PurpleXmlNode * |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
382 | jingle_add_jingle_packet(JingleSession *session, |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
383 | JabberIq *iq, JingleActionType action) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
384 | { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
385 | PurpleXmlNode *jingle = iq ? |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
386 | purple_xmlnode_new_child(iq->node, "jingle") : |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
387 | purple_xmlnode_new("jingle"); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
388 | gchar *local_jid = jingle_session_get_local_jid(session); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
389 | gchar *remote_jid = jingle_session_get_remote_jid(session); |
|
32065
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
390 | gchar *sid = jingle_session_get_sid(session); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
391 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
392 | purple_xmlnode_set_namespace(jingle, JINGLE); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
393 | purple_xmlnode_set_attrib(jingle, "action", jingle_get_action_name(action)); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
394 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
395 | if (jingle_session_is_initiator(session)) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
396 | purple_xmlnode_set_attrib(jingle, "initiator", local_jid); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
397 | purple_xmlnode_set_attrib(jingle, "responder", remote_jid); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
398 | } else { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
399 | purple_xmlnode_set_attrib(jingle, "initiator", remote_jid); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
400 | purple_xmlnode_set_attrib(jingle, "responder", local_jid); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
401 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
402 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
403 | purple_xmlnode_set_attrib(jingle, "sid", sid); |
|
32065
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
404 | |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
405 | g_free(local_jid); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
406 | g_free(remote_jid); |
|
32065
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
407 | g_free(sid); |
|
31294
73607ab89c6f
Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents:
29665
diff
changeset
|
408 | |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
409 | return jingle; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
410 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
411 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
412 | JabberIq * |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
413 | jingle_session_create_ack(JingleSession *session, const PurpleXmlNode *jingle) |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
414 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
415 | JabberIq *result = jabber_iq_new( |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
416 | jingle_session_get_js(session), |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
417 | JABBER_IQ_RESULT); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
418 | PurpleXmlNode *packet = purple_xmlnode_get_parent(jingle); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
419 | jabber_iq_set_id(result, purple_xmlnode_get_attrib(packet, "id")); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
420 | purple_xmlnode_set_attrib(result->node, "from", purple_xmlnode_get_attrib(packet, "to")); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
421 | purple_xmlnode_set_attrib(result->node, "to", purple_xmlnode_get_attrib(packet, "from")); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
422 | return result; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
423 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
424 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
425 | static JabberIq * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
426 | jingle_create_iq(JingleSession *session) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
427 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
428 | JabberStream *js = jingle_session_get_js(session); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
429 | JabberIq *result = jabber_iq_new(js, JABBER_IQ_SET); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
430 | gchar *from = jingle_session_get_local_jid(session); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
431 | gchar *to = jingle_session_get_remote_jid(session); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
432 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
433 | purple_xmlnode_set_attrib(result->node, "from", from); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
434 | purple_xmlnode_set_attrib(result->node, "to", to); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
435 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
436 | g_free(from); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
437 | g_free(to); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
438 | return result; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
439 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
440 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
441 | PurpleXmlNode * |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
442 | jingle_session_to_xml(JingleSession *session, PurpleXmlNode *jingle, JingleActionType action) |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
443 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
444 | if (action != JINGLE_SESSION_INFO && action != JINGLE_SESSION_TERMINATE) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
445 | GList *iter; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
446 | if (action == JINGLE_CONTENT_ACCEPT |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
447 | || action == JINGLE_CONTENT_ADD |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
448 | || action == JINGLE_CONTENT_REMOVE) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
449 | iter = jingle_session_get_pending_contents(session); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
450 | else |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
451 | iter = jingle_session_get_contents(session); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
452 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
453 | for (; iter; iter = g_list_next(iter)) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
454 | jingle_content_to_xml(iter->data, jingle, action); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
455 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
456 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
457 | return jingle; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
458 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
459 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
460 | JabberIq * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
461 | jingle_session_to_packet(JingleSession *session, JingleActionType action) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
462 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
463 | JabberIq *iq = jingle_create_iq(session); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
464 | PurpleXmlNode *jingle = jingle_add_jingle_packet(session, iq, action); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
465 | jingle_session_to_xml(session, jingle, action); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
466 | return iq; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
467 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
468 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
469 | void jingle_session_handle_action(JingleSession *session, PurpleXmlNode *jingle, JingleActionType action) |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
470 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
471 | GList *iter; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
472 | if (action == JINGLE_CONTENT_ADD || action == JINGLE_CONTENT_REMOVE) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
473 | iter = jingle_session_get_pending_contents(session); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
474 | else |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
475 | iter = jingle_session_get_contents(session); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
476 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
477 | for (; iter; iter = g_list_next(iter)) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
478 | jingle_content_handle_action(iter->data, jingle, action); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
479 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
480 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
481 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
482 | JingleContent * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
483 | jingle_session_find_content(JingleSession *session, const gchar *name, const gchar *creator) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
484 | { |
|
32065
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
485 | GList *iter; |
|
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
486 | |
|
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
487 | if (name == NULL) |
|
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
488 | return NULL; |
|
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
489 | |
|
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
490 | iter = session->priv->contents; |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
491 | for (; iter; iter = g_list_next(iter)) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
492 | JingleContent *content = iter->data; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
493 | gchar *cname = jingle_content_get_name(content); |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
32065
diff
changeset
|
494 | gboolean result = purple_strequal(name, cname); |
|
26421
a1769e55b9ab
Have creator == NULL be a wildcard.
Michael Ruprecht <maiku@pidgin.im>
parents:
26411
diff
changeset
|
495 | g_free(cname); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
496 | |
|
26421
a1769e55b9ab
Have creator == NULL be a wildcard.
Michael Ruprecht <maiku@pidgin.im>
parents:
26411
diff
changeset
|
497 | if (creator != NULL) { |
|
a1769e55b9ab
Have creator == NULL be a wildcard.
Michael Ruprecht <maiku@pidgin.im>
parents:
26411
diff
changeset
|
498 | gchar *ccreator = jingle_content_get_creator(content); |
|
38258
9a6551eba09c
Replace !strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38256
diff
changeset
|
499 | result = (result && purple_strequal(creator, ccreator)); |
|
26421
a1769e55b9ab
Have creator == NULL be a wildcard.
Michael Ruprecht <maiku@pidgin.im>
parents:
26411
diff
changeset
|
500 | g_free(ccreator); |
|
a1769e55b9ab
Have creator == NULL be a wildcard.
Michael Ruprecht <maiku@pidgin.im>
parents:
26411
diff
changeset
|
501 | } |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
502 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
503 | if (result == TRUE) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
504 | return content; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
505 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
506 | return NULL; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
507 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
508 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
509 | JingleContent * |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
510 | jingle_session_find_pending_content(JingleSession *session, const gchar *name, const gchar *creator) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
511 | { |
|
32065
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
512 | GList *iter; |
|
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
513 | |
|
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
514 | if (name == NULL) |
|
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
515 | return NULL; |
|
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
516 | |
|
15eb0e242206
Fix crashes and memory leaks when receiving malformed voice
Mark Doliner <markdoliner@pidgin.im>
parents:
32053
diff
changeset
|
517 | iter = session->priv->pending_contents; |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
518 | for (; iter; iter = g_list_next(iter)) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
519 | JingleContent *content = iter->data; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
520 | gchar *cname = jingle_content_get_name(content); |
|
38256
035f00c4fd87
Replace misused g_str_equal() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
32065
diff
changeset
|
521 | gboolean result = purple_strequal(name, cname); |
|
26421
a1769e55b9ab
Have creator == NULL be a wildcard.
Michael Ruprecht <maiku@pidgin.im>
parents:
26411
diff
changeset
|
522 | g_free(cname); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
523 | |
|
26421
a1769e55b9ab
Have creator == NULL be a wildcard.
Michael Ruprecht <maiku@pidgin.im>
parents:
26411
diff
changeset
|
524 | if (creator != NULL) { |
|
a1769e55b9ab
Have creator == NULL be a wildcard.
Michael Ruprecht <maiku@pidgin.im>
parents:
26411
diff
changeset
|
525 | gchar *ccreator = jingle_content_get_creator(content); |
|
38258
9a6551eba09c
Replace !strcmp() with purple_strequal()
qarkai <qarkai@gmail.com>
parents:
38256
diff
changeset
|
526 | result = (result && purple_strequal(creator, ccreator)); |
|
26421
a1769e55b9ab
Have creator == NULL be a wildcard.
Michael Ruprecht <maiku@pidgin.im>
parents:
26411
diff
changeset
|
527 | g_free(ccreator); |
|
a1769e55b9ab
Have creator == NULL be a wildcard.
Michael Ruprecht <maiku@pidgin.im>
parents:
26411
diff
changeset
|
528 | } |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
529 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
530 | if (result == TRUE) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
531 | return content; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
532 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
533 | return NULL; |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
534 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
535 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
536 | void |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
537 | jingle_session_add_content(JingleSession *session, JingleContent* content) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
538 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
539 | session->priv->contents = |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
540 | g_list_append(session->priv->contents, content); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
541 | jingle_content_set_session(content, session); |
|
35061
307195f879f3
gtalk: Use G_PARAM_STATIC_STRINGS and ensure g_object_notify is always called
Ankit Vani <a@nevitus.org>
parents:
34935
diff
changeset
|
542 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
543 | g_object_notify_by_pspec(G_OBJECT(session), properties[PROP_CONTENTS]); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
544 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
545 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
546 | void |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
547 | jingle_session_remove_content(JingleSession *session, const gchar *name, const gchar *creator) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
548 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
549 | JingleContent *content = |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
550 | jingle_session_find_content(session, name, creator); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
551 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
552 | if (content) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
553 | session->priv->contents = |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
554 | g_list_remove(session->priv->contents, content); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
555 | g_object_unref(content); |
|
35061
307195f879f3
gtalk: Use G_PARAM_STATIC_STRINGS and ensure g_object_notify is always called
Ankit Vani <a@nevitus.org>
parents:
34935
diff
changeset
|
556 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
557 | g_object_notify_by_pspec(G_OBJECT(session), properties[PROP_CONTENTS]); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
558 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
559 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
560 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
561 | void |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
562 | jingle_session_add_pending_content(JingleSession *session, JingleContent* content) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
563 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
564 | session->priv->pending_contents = |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
565 | g_list_append(session->priv->pending_contents, content); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
566 | jingle_content_set_session(content, session); |
|
35061
307195f879f3
gtalk: Use G_PARAM_STATIC_STRINGS and ensure g_object_notify is always called
Ankit Vani <a@nevitus.org>
parents:
34935
diff
changeset
|
567 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
568 | g_object_notify_by_pspec(G_OBJECT(session), properties[PROP_PENDING_CONTENTS]); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
569 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
570 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
571 | void |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
572 | jingle_session_remove_pending_content(JingleSession *session, const gchar *name, const gchar *creator) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
573 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
574 | JingleContent *content = jingle_session_find_pending_content(session, name, creator); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
575 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
576 | if (content) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
577 | session->priv->pending_contents = |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
578 | g_list_remove(session->priv->pending_contents, content); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
579 | g_object_unref(content); |
|
35061
307195f879f3
gtalk: Use G_PARAM_STATIC_STRINGS and ensure g_object_notify is always called
Ankit Vani <a@nevitus.org>
parents:
34935
diff
changeset
|
580 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
581 | g_object_notify_by_pspec(G_OBJECT(session), properties[PROP_PENDING_CONTENTS]); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
582 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
583 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
584 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
585 | void |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
586 | jingle_session_accept_content(JingleSession *session, const gchar *name, const gchar *creator) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
587 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
588 | JingleContent *content = jingle_session_find_pending_content(session, name, creator); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
589 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
590 | if (content) { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
591 | g_object_ref(content); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
592 | jingle_session_remove_pending_content(session, name, creator); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
593 | jingle_session_add_content(session, content); |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
594 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
595 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
596 | |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
597 | void |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
598 | jingle_session_accept_session(JingleSession *session) |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
599 | { |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
600 | session->priv->state = TRUE; |
|
35061
307195f879f3
gtalk: Use G_PARAM_STATIC_STRINGS and ensure g_object_notify is always called
Ankit Vani <a@nevitus.org>
parents:
34935
diff
changeset
|
601 | |
|
35076
cadfc3f9a7cc
jabber: use g_object_notify_by_pspec instead of g_object_notify
Ankit Vani <a@nevitus.org>
parents:
35061
diff
changeset
|
602 | g_object_notify_by_pspec(G_OBJECT(session), properties[PROP_STATE]); |
|
26143
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
603 | } |
|
673b6665624d
Restructure Jingle code to more easily support multiple application types.
Michael Ruprecht <maiku@pidgin.im>
parents:
diff
changeset
|
604 | |
|
26404
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
605 | JabberIq * |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
606 | jingle_session_terminate_packet(JingleSession *session, const gchar *reason) |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
607 | { |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
608 | JabberIq *iq = jingle_session_to_packet(session, |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
609 | JINGLE_SESSION_TERMINATE); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
610 | PurpleXmlNode *jingle = purple_xmlnode_get_child(iq->node, "jingle"); |
|
26404
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
611 | |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
612 | if (reason != NULL) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
613 | PurpleXmlNode *reason_node; |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
614 | reason_node = purple_xmlnode_new_child(jingle, "reason"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
615 | purple_xmlnode_new_child(reason_node, reason); |
|
26404
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
616 | } |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
617 | return iq; |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
618 | } |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
619 | |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
620 | JabberIq * |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
621 | jingle_session_redirect_packet(JingleSession *session, const gchar *sid) |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
622 | { |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
623 | JabberIq *iq = jingle_session_terminate_packet(session, |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
624 | "alternative-session"); |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
625 | PurpleXmlNode *alt_session; |
|
26404
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
626 | |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
627 | if (sid == NULL) |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
628 | return iq; |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
629 | |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
630 | alt_session = purple_xmlnode_get_child(iq->node, |
|
26404
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
631 | "jingle/reason/alternative-session"); |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
632 | |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
633 | if (alt_session != NULL) { |
|
34935
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
634 | PurpleXmlNode *sid_node = purple_xmlnode_new_child(alt_session, "sid"); |
|
686fa55b0deb
Replaced xmlnode with PurpleXmlNode, and xmlnode_* API with purple_xmlnode_* API
Ankit Vani <a@nevitus.org>
parents:
32065
diff
changeset
|
635 | purple_xmlnode_insert_data(sid_node, sid, -1); |
|
26404
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
636 | } |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
637 | return iq; |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
638 | } |
|
3947a428b87d
Add functions for more easily creating session-terminate packets.
Michael Ruprecht <maiku@pidgin.im>
parents:
26221
diff
changeset
|
639 |