libpurple/protocols/msn/msg.c

Sun, 23 Jun 2013 15:23:44 +0530

author
Ankit Vani <a@nevitus.org>
date
Sun, 23 Jun 2013 15:23:44 +0530
branch
soc.2013.gobjectification
changeset 34622
753f46dd000f
parent 32987
cdf1e8c4203c
child 34627
08733a7475df
permissions
-rw-r--r--

Global replace - renamed functions and types according to GObject-based PurpleConversation API

4542
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
1 /**
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
2 * @file msg.c Message functions
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
3 *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
4 * purple
4542
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
5 *
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
6 * Purple is the legal property of its developers, whose names are too numerous
9198
e8eb6d5eb9eb [gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents: 9193
diff changeset
7 * to list here. Please refer to the COPYRIGHT file distributed with this
e8eb6d5eb9eb [gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents: 9193
diff changeset
8 * source distribution.
6701
7e2db9273748 [gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents: 6181
diff changeset
9 *
4542
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
10 * This program is free software; you can redistribute it and/or modify
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
11 * it under the terms of the GNU General Public License as published by
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
12 * the Free Software Foundation; either version 2 of the License, or
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
13 * (at your option) any later version.
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
14 *
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
15 * This program is distributed in the hope that it will be useful,
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
18 * GNU General Public License for more details.
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
19 *
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
20 * You should have received a copy of the GNU General Public License
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
21 * along with this program; if not, write to the Free Software
19859
71d37b57eff2 The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents: 15884
diff changeset
22 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
4542
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
23 */
30945
b875cf477e19 Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30940
diff changeset
24
30961
885064b16c54 Include internal.h on each c file to avoid windows breakage as recommended by Daniel.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30945
diff changeset
25 #include "internal.h"
30945
b875cf477e19 Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30940
diff changeset
26 #include "debug.h"
b875cf477e19 Remove unnecesary includes from msn.h.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30940
diff changeset
27
4542
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
28 #include "msn.h"
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
29 #include "msg.h"
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
30 #include "msnutils.h"
30987
5d18cc98412b Use slp parse code that was just moved to SlpMessage since it belongs there
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30977
diff changeset
31 #include "slpmsg.h"
31023
fbf4d4d3aaad Destroy Part when the Message is destroyed.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31022
diff changeset
32 #include "slpmsg_part.h"
4542
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
33
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
34 MsnMessage *
10225
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
35 msn_message_new(MsnMsgType type)
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
36 {
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
37 MsnMessage *msg;
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
38
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
39 msg = g_new0(MsnMessage, 1);
10225
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
40 msg->type = type;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
41
27691
d77b2890043e Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27690
diff changeset
42 if (purple_debug_is_verbose())
d77b2890043e Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27690
diff changeset
43 purple_debug_info("msn", "message new (%p)(%d)\n", msg, type);
10345
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
44
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
45 msg->header_table = g_hash_table_new_full(g_str_hash, g_str_equal,
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
46 g_free, g_free);
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
47
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
48 msn_message_ref(msg);
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
49
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
50 return msg;
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
51 }
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
52
31162
2c596217766b msn_message_destroy() calls msn_message_unref() if refcount>0. This is
Mark Doliner <markdoliner@pidgin.im>
parents: 31136
diff changeset
53 /**
2c596217766b msn_message_destroy() calls msn_message_unref() if refcount>0. This is
Mark Doliner <markdoliner@pidgin.im>
parents: 31136
diff changeset
54 * Destroys a message.
2c596217766b msn_message_destroy() calls msn_message_unref() if refcount>0. This is
Mark Doliner <markdoliner@pidgin.im>
parents: 31136
diff changeset
55 *
2c596217766b msn_message_destroy() calls msn_message_unref() if refcount>0. This is
Mark Doliner <markdoliner@pidgin.im>
parents: 31136
diff changeset
56 * @param msg The message to destroy.
2c596217766b msn_message_destroy() calls msn_message_unref() if refcount>0. This is
Mark Doliner <markdoliner@pidgin.im>
parents: 31136
diff changeset
57 */
2c596217766b msn_message_destroy() calls msn_message_unref() if refcount>0. This is
Mark Doliner <markdoliner@pidgin.im>
parents: 31136
diff changeset
58 static void
10345
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
59 msn_message_destroy(MsnMessage *msg)
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
60 {
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
61 g_return_if_fail(msg != NULL);
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
62
27691
d77b2890043e Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27690
diff changeset
63 if (purple_debug_is_verbose())
d77b2890043e Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27690
diff changeset
64 purple_debug_info("msn", "message destroy (%p)\n", msg);
10345
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
65
21067
97a745428ab0 Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents: 21065
diff changeset
66 g_free(msg->remote_user);
97a745428ab0 Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents: 21065
diff changeset
67 g_free(msg->body);
97a745428ab0 Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents: 21065
diff changeset
68 g_free(msg->content_type);
97a745428ab0 Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents: 21065
diff changeset
69 g_free(msg->charset);
10345
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
70
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
71 g_hash_table_destroy(msg->header_table);
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
72 g_list_free(msg->header_list);
31240
db0cb3d72bc9 Use the unref functions everywhere, instead of destroy. I also removed
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31238
diff changeset
73 if (msg->part)
db0cb3d72bc9 Use the unref functions everywhere, instead of destroy. I also removed
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31238
diff changeset
74 msn_slpmsgpart_unref(msg->part);
10345
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
75
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
76 g_free(msg);
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
77 }
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
78
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
79 MsnMessage *
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
80 msn_message_ref(MsnMessage *msg)
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
81 {
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
82 g_return_val_if_fail(msg != NULL, NULL);
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
83
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
84 msg->ref_count++;
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
85
27691
d77b2890043e Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27690
diff changeset
86 if (purple_debug_is_verbose())
31235
d347d296b0e6 As Mark did before, we probably don't need a return value from these
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31163
diff changeset
87 purple_debug_info("msn", "message ref (%p)[%u]\n", msg, msg->ref_count);
10345
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
88
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
89 return msg;
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
90 }
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
91
31163
871af3e6f338 Nothing uses this return value, so stop returning it. I think it's weird
Mark Doliner <markdoliner@pidgin.im>
parents: 31162
diff changeset
92 void
10345
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
93 msn_message_unref(MsnMessage *msg)
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
94 {
31163
871af3e6f338 Nothing uses this return value, so stop returning it. I think it's weird
Mark Doliner <markdoliner@pidgin.im>
parents: 31162
diff changeset
95 g_return_if_fail(msg != NULL);
871af3e6f338 Nothing uses this return value, so stop returning it. I think it's weird
Mark Doliner <markdoliner@pidgin.im>
parents: 31162
diff changeset
96 g_return_if_fail(msg->ref_count > 0);
10345
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
97
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
98 msg->ref_count--;
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
99
27691
d77b2890043e Change all MSN_DEBUG_* messages to use the new purple_debug_is_verbose call
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27690
diff changeset
100 if (purple_debug_is_verbose())
31235
d347d296b0e6 As Mark did before, we probably don't need a return value from these
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31163
diff changeset
101 purple_debug_info("msn", "message unref (%p)[%u]\n", msg, msg->ref_count);
10345
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
102
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
103 if (msg->ref_count == 0)
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
104 msn_message_destroy(msg);
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
105 }
7d7f8cfa2b4f [gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10284
diff changeset
106
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
107 MsnMessage *
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
108 msn_message_new_plain(const char *message)
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
109 {
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
110 MsnMessage *msg;
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
111 char *message_cr;
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
112
10225
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
113 msg = msn_message_new(MSN_MSG_TEXT);
24420
e83317602b22 attempts to resend message on switchboard error once, tested by maually
Ka-Hing Cheung <khc@pidgin.im>
parents: 23262
diff changeset
114 msg->retries = 1;
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
115 msn_message_set_header(msg, "User-Agent", PACKAGE_NAME "/" VERSION);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
116 msn_message_set_content_type(msg, "text/plain");
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
117 msn_message_set_charset(msg, "UTF-8");
10225
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
118 msn_message_set_flag(msg, 'A');
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
119 msn_message_set_header(msg, "X-MMS-IM-Format",
25417
81b343445003 Fixes #7373, the new live messenger client now sends Segoe UI as the default
Ka-Hing Cheung <khc@pidgin.im>
parents: 25161
diff changeset
120 "FN=Segoe%20UI; EF=; CO=0; CS=1;PF=0");
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
121
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
122 message_cr = purple_str_add_cr(message);
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
123 msn_message_set_bin_data(msg, message_cr, strlen(message_cr));
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
124 g_free(message_cr);
5506
b53a1acacefe [gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents: 5478
diff changeset
125
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
126 return msg;
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
127 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
128
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
129 MsnMessage *
6800
8f99c220b503 [gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents: 6786
diff changeset
130 msn_message_new_msnslp(void)
8f99c220b503 [gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents: 6786
diff changeset
131 {
8f99c220b503 [gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents: 6786
diff changeset
132 MsnMessage *msg;
8f99c220b503 [gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents: 6786
diff changeset
133
10225
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
134 msg = msn_message_new(MSN_MSG_SLP);
6800
8f99c220b503 [gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents: 6786
diff changeset
135
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
136 msn_message_set_header(msg, "User-Agent", NULL);
6800
8f99c220b503 [gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents: 6786
diff changeset
137
6868
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
138 msn_message_set_flag(msg, 'D');
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
139 msn_message_set_content_type(msg, "application/x-msnmsgrp2p");
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
140
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
141 return msg;
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
142 }
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
143
11321
a93121c0ea16 [gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11235
diff changeset
144 MsnMessage *
a93121c0ea16 [gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11235
diff changeset
145 msn_message_new_nudge(void)
a93121c0ea16 [gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11235
diff changeset
146 {
a93121c0ea16 [gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11235
diff changeset
147 MsnMessage *msg;
a93121c0ea16 [gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11235
diff changeset
148
a93121c0ea16 [gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11235
diff changeset
149 msg = msn_message_new(MSN_MSG_NUDGE);
23262
642669494d17 Fix a TODO uncovered by Mark the other day. Instead of using a hacky
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 23235
diff changeset
150 msn_message_set_content_type(msg, "text/x-msnmsgr-datacast");
11321
a93121c0ea16 [gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11235
diff changeset
151 msn_message_set_flag(msg, 'N');
23262
642669494d17 Fix a TODO uncovered by Mark the other day. Instead of using a hacky
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 23235
diff changeset
152 msn_message_set_bin_data(msg, "ID: 1\r\n", 7);
11321
a93121c0ea16 [gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11235
diff changeset
153
a93121c0ea16 [gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11235
diff changeset
154 return msg;
a93121c0ea16 [gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11235
diff changeset
155 }
a93121c0ea16 [gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 11235
diff changeset
156
8646
74d0e7406e3b [gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8475
diff changeset
157 void
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
158 msn_message_parse_payload(MsnMessage *msg,
13886
e1d21534ecff [gaim-migrate @ 16973]
Ma Yuan <mayuan2006@gmail.com>
parents: 13880
diff changeset
159 const char *payload, size_t payload_len,
e1d21534ecff [gaim-migrate @ 16973]
Ma Yuan <mayuan2006@gmail.com>
parents: 13880
diff changeset
160 const char *line_dem,const char *body_dem)
4542
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
161 {
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
162 char *tmp_base, *tmp;
7845
edeb70aa2413 [gaim-migrate @ 8499]
Christian Hammond <chipx86@chipx86.com>
parents: 7604
diff changeset
163 const char *content_type;
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
164 char *end;
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
165 char **elems, **cur, **tokens;
5454
5263b77f0ad9 [gaim-migrate @ 5842]
Christian Hammond <chipx86@chipx86.com>
parents: 5315
diff changeset
166
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
167 g_return_if_fail(payload != NULL);
24608
9f21d921daaf It should be more efficient to just use g_mallc() and then manually
Mark Doliner <markdoliner@pidgin.im>
parents: 24420
diff changeset
168 tmp_base = tmp = g_malloc(payload_len + 1);
10481
a5d6b8e1717d [gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10345
diff changeset
169 memcpy(tmp_base, payload, payload_len);
24608
9f21d921daaf It should be more efficient to just use g_mallc() and then manually
Mark Doliner <markdoliner@pidgin.im>
parents: 24420
diff changeset
170 tmp_base[payload_len] = '\0';
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
171
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
172 /* Find the end of the headers */
13886
e1d21534ecff [gaim-migrate @ 16973]
Ma Yuan <mayuan2006@gmail.com>
parents: 13880
diff changeset
173 end = strstr(tmp, body_dem);
10284
257978b5df5b [gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10275
diff changeset
174 /* TODO? some clients use \r delimiters instead of \r\n, the official client
257978b5df5b [gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10275
diff changeset
175 * doesn't send such messages, but does handle receiving them. We'll just
257978b5df5b [gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10275
diff changeset
176 * avoid crashing for now */
10981
11def8085a30 [gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents: 10481
diff changeset
177 if (end == NULL) {
11def8085a30 [gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents: 10481
diff changeset
178 g_free(tmp_base);
11def8085a30 [gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents: 10481
diff changeset
179 g_return_if_reached();
11def8085a30 [gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents: 10481
diff changeset
180 }
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
181 *end = '\0';
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
182
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
183 /* Split the headers and parse each one */
13886
e1d21534ecff [gaim-migrate @ 16973]
Ma Yuan <mayuan2006@gmail.com>
parents: 13880
diff changeset
184 elems = g_strsplit(tmp, line_dem, 0);
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
185 for (cur = elems; *cur != NULL; cur++)
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
186 {
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
187 const char *key, *value;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
188
25161
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
189 /* If this line starts with whitespace, it's been folded from the
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
190 previous line and won't have ':'. */
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
191 if ((**cur == ' ') || (**cur == '\t')) {
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
192 tokens = g_strsplit(g_strchug(*cur), "=\"", 2);
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
193 key = tokens[0];
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
194 value = tokens[1];
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
195
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
196 /* The only one I care about is 'boundary' (which is folded from
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
197 the key 'Content-Type'), so only process that. */
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
198 if (!strcmp(key, "boundary")) {
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
199 char *end = strchr(value, '\"');
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
200 *end = '\0';
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
201 msn_message_set_header(msg, key, value);
25161
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
202 }
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
203
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
204 g_strfreev(tokens);
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
205 continue;
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
206 }
4dacf7e20b77 When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24608
diff changeset
207
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
208 tokens = g_strsplit(*cur, ": ", 2);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
209
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
210 key = tokens[0];
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
211 value = tokens[1];
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
212
13854
ab947cf0c2bb [gaim-migrate @ 16473]
Ma Yuan <mayuan2006@gmail.com>
parents: 12250
diff changeset
213 /*if not MIME content ,then return*/
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
214 if (!strcmp(key, "MIME-Version"))
10284
257978b5df5b [gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10275
diff changeset
215 {
257978b5df5b [gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10275
diff changeset
216 g_strfreev(tokens);
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
217 continue;
10284
257978b5df5b [gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10275
diff changeset
218 }
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
219
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
220 if (!strcmp(key, "Content-Type"))
8646
74d0e7406e3b [gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8475
diff changeset
221 {
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
222 char *charset, *c;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
223
8646
74d0e7406e3b [gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8475
diff changeset
224 if ((c = strchr(value, ';')) != NULL)
74d0e7406e3b [gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8475
diff changeset
225 {
74d0e7406e3b [gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8475
diff changeset
226 if ((charset = strchr(c, '=')) != NULL)
74d0e7406e3b [gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8475
diff changeset
227 {
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
228 charset++;
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
229 msn_message_set_charset(msg, charset);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
230 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
231
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
232 *c = '\0';
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
233 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
234
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
235 msn_message_set_content_type(msg, value);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
236 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
237 else
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
238 {
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
239 msn_message_set_header(msg, key, value);
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
240 }
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
241
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
242 g_strfreev(tokens);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
243 }
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
244 g_strfreev(elems);
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
245
10981
11def8085a30 [gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents: 10481
diff changeset
246 /* Proceed to the end of the "\r\n\r\n" */
13886
e1d21534ecff [gaim-migrate @ 16973]
Ma Yuan <mayuan2006@gmail.com>
parents: 13880
diff changeset
247 tmp = end + strlen(body_dem);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
248
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
249 /* Now we *should* be at the body. */
7845
edeb70aa2413 [gaim-migrate @ 8499]
Christian Hammond <chipx86@chipx86.com>
parents: 7604
diff changeset
250 content_type = msn_message_get_content_type(msg);
edeb70aa2413 [gaim-migrate @ 8499]
Christian Hammond <chipx86@chipx86.com>
parents: 7604
diff changeset
251
30989
e826f32521d6 Remove replaced code.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30987
diff changeset
252 if (payload_len - (tmp - tmp_base) > 0) {
e826f32521d6 Remove replaced code.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30987
diff changeset
253 msg->body_len = payload_len - (tmp - tmp_base);
e826f32521d6 Remove replaced code.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30987
diff changeset
254 g_free(msg->body);
e826f32521d6 Remove replaced code.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30987
diff changeset
255 msg->body = g_malloc(msg->body_len + 1);
e826f32521d6 Remove replaced code.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30987
diff changeset
256 memcpy(msg->body, tmp, msg->body_len);
e826f32521d6 Remove replaced code.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30987
diff changeset
257 msg->body[msg->body_len] = '\0';
e826f32521d6 Remove replaced code.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30987
diff changeset
258 }
9198
e8eb6d5eb9eb [gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents: 9193
diff changeset
259
32130
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
260 if (msg->body && content_type && purple_str_has_prefix(content_type, "text/")) {
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
261 char *body = NULL;
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
262
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
263 if (msg->charset == NULL || g_str_equal(msg->charset, "UTF-8")) {
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
264 /* Charset is UTF-8 */
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
265 if (!g_utf8_validate(msg->body, msg->body_len, NULL)) {
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
266 purple_debug_warning("msn", "Message contains invalid "
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
267 "UTF-8. Attempting to salvage.\n");
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
268 body = purple_utf8_salvage(msg->body);
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
269 payload_len = strlen(body);
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
270 }
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
271 } else {
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
272 /* Charset is something other than UTF-8 */
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
273 GError *err = NULL;
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
274 body = g_convert(msg->body, msg->body_len, "UTF-8",
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
275 msg->charset, NULL, &payload_len, &err);
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
276 if (!body || err) {
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
277 purple_debug_warning("msn", "Unable to convert message from "
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
278 "%s to UTF-8: %s\n", msg->charset,
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
279 err ? err->message : "Unknown error");
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
280 if (err)
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
281 g_error_free(err);
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
282
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
283 /* Fallback to ISO-8859-1 */
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
284 g_free(body);
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
285 body = g_convert(msg->body, msg->body_len, "UTF-8",
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
286 "ISO-8859-1", NULL, &payload_len, NULL);
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
287 if (!body) {
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
288 g_free(msg->body);
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
289 msg->body = NULL;
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
290 msg->body_len = 0;
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
291 }
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
292 }
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
293 }
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
294
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
295 if (body) {
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
296 g_free(msg->body);
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
297 msg->body = body;
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
298 msg->body_len = payload_len;
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
299 msn_message_set_charset(msg, "UTF-8");
4d6bcb4f4ea4 Fix a possible MSN remote crash
Mark Doliner <markdoliner@pidgin.im>
parents: 31790
diff changeset
300 }
6701
7e2db9273748 [gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents: 6181
diff changeset
301 }
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
302
6011
a7fd3284655c [gaim-migrate @ 6459]
Christian Hammond <chipx86@chipx86.com>
parents: 5506
diff changeset
303 g_free(tmp_base);
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
304 }
6011
a7fd3284655c [gaim-migrate @ 6459]
Christian Hammond <chipx86@chipx86.com>
parents: 5506
diff changeset
305
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
306 MsnMessage *
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
307 msn_message_new_from_cmd(MsnSession *session, MsnCommand *cmd)
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
308 {
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
309 MsnMessage *msg;
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
310
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
311 g_return_val_if_fail(cmd != NULL, NULL);
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
312
10225
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
313 msg = msn_message_new(MSN_MSG_UNKNOWN);
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
314
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
315 msg->remote_user = g_strdup(cmd->params[0]);
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
316 /* msg->size = atoi(cmd->params[2]); */
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
317 msg->cmd = cmd;
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
318
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
319 return msg;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
320 }
4542
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
321
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
322 char *
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
323 msn_message_gen_payload(MsnMessage *msg, size_t *ret_size)
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
324 {
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
325 GList *l;
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
326 char *n, *base, *end;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
327 int len;
19936
4e02485ca561 Silence the warning that body_len might be used uninitialized in msn_message_gen_payload().
Evan Schoenberg <evands@pidgin.im>
parents: 19859
diff changeset
328 size_t body_len = 0;
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
329 const void *body;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
330
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
331 g_return_val_if_fail(msg != NULL, NULL);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
332
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
333 len = MSN_BUF_LEN;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
334
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
335 base = n = end = g_malloc(len + 1);
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
336 end += len;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
337
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
338 /* Standard header. */
8646
74d0e7406e3b [gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8475
diff changeset
339 if (msg->charset == NULL)
74d0e7406e3b [gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8475
diff changeset
340 {
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
341 g_snprintf(n, len,
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
342 "MIME-Version: 1.0\r\n"
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
343 "Content-Type: %s\r\n",
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
344 msg->content_type);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
345 }
8646
74d0e7406e3b [gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8475
diff changeset
346 else
74d0e7406e3b [gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8475
diff changeset
347 {
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
348 g_snprintf(n, len,
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
349 "MIME-Version: 1.0\r\n"
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
350 "Content-Type: %s; charset=%s\r\n",
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
351 msg->content_type, msg->charset);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
352 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
353
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
354 n += strlen(n);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
355
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
356 for (l = msg->header_list; l != NULL; l = l->next)
8646
74d0e7406e3b [gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8475
diff changeset
357 {
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
358 const char *key;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
359 const char *value;
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
360
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
361 key = l->data;
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
362 value = msn_message_get_header_value(msg, key);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
363
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
364 g_snprintf(n, end - n, "%s: %s\r\n", key, value);
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
365 n += strlen(n);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
366 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
367
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
368 n += g_strlcpy(n, "\r\n", end - n);
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
369
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
370 body = msn_message_get_bin_data(msg, &body_len);
6827
df4411142ece [gaim-migrate @ 7372]
Christian Hammond <chipx86@chipx86.com>
parents: 6826
diff changeset
371
31787
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
372 if (body != NULL)
6701
7e2db9273748 [gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents: 6181
diff changeset
373 {
31787
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
374 memcpy(n, body, body_len);
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
375 n += body_len;
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
376 *n = '\0';
5310
ac2ee6a1f846 [gaim-migrate @ 5682]
Christian Hammond <chipx86@chipx86.com>
parents: 5309
diff changeset
377 }
ac2ee6a1f846 [gaim-migrate @ 5682]
Christian Hammond <chipx86@chipx86.com>
parents: 5309
diff changeset
378
6826
986589449e69 [gaim-migrate @ 7371]
Christian Hammond <chipx86@chipx86.com>
parents: 6800
diff changeset
379 if (ret_size != NULL)
9092
34b9e78827f6 [gaim-migrate @ 9869]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8647
diff changeset
380 {
10274
f329b1d7fd43 [gaim-migrate @ 11424]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10225
diff changeset
381 *ret_size = n - base;
f329b1d7fd43 [gaim-migrate @ 11424]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10225
diff changeset
382
9092
34b9e78827f6 [gaim-migrate @ 9869]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8647
diff changeset
383 if (*ret_size > 1664)
34b9e78827f6 [gaim-migrate @ 9869]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8647
diff changeset
384 *ret_size = 1664;
34b9e78827f6 [gaim-migrate @ 9869]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8647
diff changeset
385 }
34b9e78827f6 [gaim-migrate @ 9869]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 8647
diff changeset
386
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
387 return base;
4542
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
388 }
05a476dec582 [gaim-migrate @ 4821]
Christian Hammond <chipx86@chipx86.com>
parents:
diff changeset
389
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
390 void
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
391 msn_message_set_flag(MsnMessage *msg, char flag)
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
392 {
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
393 g_return_if_fail(msg != NULL);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
394 g_return_if_fail(flag != 0);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
395
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
396 msg->flag = flag;
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
397 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
398
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
399 char
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
400 msn_message_get_flag(const MsnMessage *msg)
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
401 {
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
402 g_return_val_if_fail(msg != NULL, 0);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
403
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
404 return msg->flag;
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
405 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
406
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
407 void
6868
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
408 msn_message_set_bin_data(MsnMessage *msg, const void *data, size_t len)
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
409 {
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
410 g_return_if_fail(msg != NULL);
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
411
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
412 /* There is no need to waste memory on data we cannot send anyway */
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
413 if (len > 1664)
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
414 len = 1664;
6868
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
415
32979
e891b5995bf7 Remove redundant check (g_free does this for us)
Mark Doliner <markdoliner@pidgin.im>
parents: 32678
diff changeset
416 g_free(msg->body);
6868
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
417
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
418 if (data != NULL && len > 0)
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
419 {
24608
9f21d921daaf It should be more efficient to just use g_mallc() and then manually
Mark Doliner <markdoliner@pidgin.im>
parents: 24420
diff changeset
420 msg->body = g_malloc(len + 1);
11235
7e1cd737137b [gaim-migrate @ 13380]
Federico G. Schwindt <fgsch@lodoss.net>
parents: 11001
diff changeset
421 memcpy(msg->body, data, len);
24608
9f21d921daaf It should be more efficient to just use g_mallc() and then manually
Mark Doliner <markdoliner@pidgin.im>
parents: 24420
diff changeset
422 msg->body[len] = '\0';
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
423 msg->body_len = len;
6868
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
424 }
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
425 else
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
426 {
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
427 msg->body = NULL;
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
428 msg->body_len = 0;
6868
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
429 }
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
430 }
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
431
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
432 const void *
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
433 msn_message_get_bin_data(const MsnMessage *msg, size_t *len)
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
434 {
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
435 g_return_val_if_fail(msg != NULL, NULL);
b9cc0730e11c [gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents: 6842
diff changeset
436
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
437 if (len)
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
438 *len = msg->body_len;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
439
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
440 return msg->body;
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
441 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
442
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
443 void
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
444 msn_message_set_content_type(MsnMessage *msg, const char *type)
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
445 {
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
446 g_return_if_fail(msg != NULL);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
447
21067
97a745428ab0 Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents: 21065
diff changeset
448 g_free(msg->content_type);
97a745428ab0 Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents: 21065
diff changeset
449 msg->content_type = g_strdup(type);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
450 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
451
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
452 const char *
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
453 msn_message_get_content_type(const MsnMessage *msg)
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
454 {
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
455 g_return_val_if_fail(msg != NULL, NULL);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
456
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
457 return msg->content_type;
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
458 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
459
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
460 void
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
461 msn_message_set_charset(MsnMessage *msg, const char *charset)
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
462 {
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
463 g_return_if_fail(msg != NULL);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
464
21067
97a745428ab0 Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents: 21065
diff changeset
465 g_free(msg->charset);
97a745428ab0 Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents: 21065
diff changeset
466 msg->charset = g_strdup(charset);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
467 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
468
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
469 const char *
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
470 msn_message_get_charset(const MsnMessage *msg)
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
471 {
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
472 g_return_val_if_fail(msg != NULL, NULL);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
473
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
474 return msg->charset;
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
475 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
476
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
477 void
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
478 msn_message_set_header(MsnMessage *msg, const char *name, const char *value)
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
479 {
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
480 const char *temp;
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
481 char *new_name;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
482
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
483 g_return_if_fail(msg != NULL);
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
484 g_return_if_fail(name != NULL);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
485
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
486 temp = msn_message_get_header_value(msg, name);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
487
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
488 if (value == NULL)
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
489 {
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
490 if (temp != NULL)
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
491 {
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
492 GList *l;
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
493
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
494 for (l = msg->header_list; l != NULL; l = l->next)
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
495 {
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
496 if (!g_ascii_strcasecmp(l->data, name))
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
497 {
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
498 msg->header_list = g_list_remove(msg->header_list, l->data);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
499
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
500 break;
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
501 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
502 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
503
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
504 g_hash_table_remove(msg->header_table, name);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
505 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
506
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
507 return;
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
508 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
509
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
510 new_name = g_strdup(name);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
511
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
512 g_hash_table_insert(msg->header_table, new_name, g_strdup(value));
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
513
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
514 if (temp == NULL)
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
515 msg->header_list = g_list_append(msg->header_list, new_name);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
516 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
517
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
518 const char *
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
519 msn_message_get_header_value(const MsnMessage *msg, const char *name)
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
520 {
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
521 g_return_val_if_fail(msg != NULL, NULL);
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
522 g_return_val_if_fail(name != NULL, NULL);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
523
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
524 return g_hash_table_lookup(msg->header_table, name);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
525 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
526
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
527 GHashTable *
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
528 msn_message_get_hashtable_from_body(const MsnMessage *msg)
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
529 {
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
530 GHashTable *table;
10284
257978b5df5b [gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10275
diff changeset
531 size_t body_len;
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
532 const char *body;
10284
257978b5df5b [gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10275
diff changeset
533 char **elems, **cur, **tokens, *body_str;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
534
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
535 g_return_val_if_fail(msg != NULL, NULL);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
536
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
537 table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
538
10284
257978b5df5b [gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10275
diff changeset
539 body = msn_message_get_bin_data(msg, &body_len);
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
540
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
541 g_return_val_if_fail(body != NULL, NULL);
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
542
10284
257978b5df5b [gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10275
diff changeset
543 body_str = g_strndup(body, body_len);
257978b5df5b [gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10275
diff changeset
544 elems = g_strsplit(body_str, "\r\n", 0);
257978b5df5b [gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 10275
diff changeset
545 g_free(body_str);
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
546
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
547 for (cur = elems; *cur != NULL; cur++)
9158
f8dab42adeaf [gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9092
diff changeset
548 {
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
549 if (**cur == '\0')
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
550 break;
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
551
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
552 tokens = g_strsplit(*cur, ": ", 2);
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
553
21010
2bd8577a08e5 Fix some leaks.
Daniel Atallah <datallah@pidgin.im>
parents: 20600
diff changeset
554 if (tokens[0] != NULL && tokens[1] != NULL) {
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
555 g_hash_table_insert(table, tokens[0], tokens[1]);
21010
2bd8577a08e5 Fix some leaks.
Daniel Atallah <datallah@pidgin.im>
parents: 20600
diff changeset
556 g_free(tokens);
2bd8577a08e5 Fix some leaks.
Daniel Atallah <datallah@pidgin.im>
parents: 20600
diff changeset
557 } else
2bd8577a08e5 Fix some leaks.
Daniel Atallah <datallah@pidgin.im>
parents: 20600
diff changeset
558 g_strfreev(tokens);
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
559 }
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
560
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
561 g_strfreev(elems);
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
562
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
563 return table;
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
564 }
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
565
10225
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
566 char *
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
567 msn_message_to_string(MsnMessage *msg)
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
568 {
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
569 size_t body_len;
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
570 const char *body;
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
571
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
572 g_return_val_if_fail(msg != NULL, NULL);
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
573 g_return_val_if_fail(msg->type == MSN_MSG_TEXT, NULL);
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
574
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
575 body = msn_message_get_bin_data(msg, &body_len);
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
576
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
577 return g_strndup(body, body_len);
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
578 }
0dfea1bc8695 [gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 10112
diff changeset
579
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
580 void
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
581 msn_message_show_readable(MsnMessage *msg, const char *info,
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
582 gboolean text_body)
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
583 {
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
584 GString *str;
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
585 size_t body_len;
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
586 const char *body;
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
587 GList *l;
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
588
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
589 g_return_if_fail(msg != NULL);
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
590
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
591 str = g_string_new(NULL);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
592
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
593 /* Standard header. */
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
594 if (msg->charset == NULL)
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
595 {
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
596 g_string_append_printf(str,
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
597 "MIME-Version: 1.0\r\n"
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
598 "Content-Type: %s\r\n",
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
599 msg->content_type);
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
600 }
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
601 else
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
602 {
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
603 g_string_append_printf(str,
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
604 "MIME-Version: 1.0\r\n"
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
605 "Content-Type: %s; charset=%s\r\n",
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
606 msg->content_type, msg->charset);
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
607 }
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
608
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
609 for (l = msg->header_list; l; l = l->next)
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
610 {
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
611 char *key;
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
612 const char *value;
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
613
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
614 key = l->data;
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
615 value = msn_message_get_header_value(msg, key);
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
616
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
617 g_string_append_printf(str, "%s: %s\r\n", key, value);
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
618 }
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
619
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
620 g_string_append(str, "\r\n");
9198
e8eb6d5eb9eb [gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents: 9193
diff changeset
621
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
622 body = msn_message_get_bin_data(msg, &body_len);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
623
31787
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
624 if (body != NULL)
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
625 {
31787
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
626 if (msg->type == MSN_MSG_TEXT)
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
627 {
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
628 g_string_append_len(str, body, body_len);
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
629 g_string_append(str, "\r\n");
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
630 }
31787
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
631 else
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
632 {
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
633 size_t i;
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
634 for (i = 0; i < body_len; i++, body++)
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
635 {
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
636 g_string_append_printf(str, "%02x ", (unsigned char)*body);
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
637 if (i % 16 == 0 && i != 0)
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
638 g_string_append_c(str, '\n');
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
639 }
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
640 g_string_append_c(str, '\n');
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
641 }
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
642 }
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
643
15884
4de1981757fc sed -ie 's/gaim/purple/g'
Sean Egan <seanegan@pidgin.im>
parents: 15435
diff changeset
644 purple_debug_info("msn", "Message %s:\n{%s}\n", info, str->str);
9198
e8eb6d5eb9eb [gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents: 9193
diff changeset
645
9193
6e76f1367896 [gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents: 9158
diff changeset
646 g_string_free(str, TRUE);
5309
3178acad1449 [gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents: 5221
diff changeset
647 }
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
648
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
649 /**************************************************************************
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
650 * Message Handlers
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
651 **************************************************************************/
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
652 void
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
653 msn_plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
654 {
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
655 PurpleConnection *gc;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
656 const char *body;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
657 char *body_enc;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
658 char *body_final;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
659 size_t body_len;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
660 const char *passport;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
661 const char *value;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
662
32624
f957ad287bcc Convert code to use the purple_account accessor functions.
Andrew Victor <andrew.victor@mxit.com>
parents: 32312
diff changeset
663 gc = purple_account_get_connection(cmdproc->session->account);
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
664
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
665 body = msn_message_get_bin_data(msg, &body_len);
29462
49853c4082d3 I don't believe there's any reason to duplicate this string.
Mark Doliner <markdoliner@pidgin.im>
parents: 29457
diff changeset
666 body_enc = g_markup_escape_text(body, body_len);
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
667
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
668 passport = msg->remote_user;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
669
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
670 if (!strcmp(passport, "messenger@microsoft.com") &&
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
671 strstr(body, "immediate security update"))
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
672 {
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
673 return;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
674 }
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
675
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
676 #if 0
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
677 if ((value = msn_message_get_header_value(msg, "User-Agent")) != NULL)
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
678 {
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
679 purple_debug_misc("msn", "User-Agent = '%s'\n", value);
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
680 }
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
681 #endif
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
682
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
683 if ((value = msn_message_get_header_value(msg, "X-MMS-IM-Format")) != NULL)
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
684 {
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
685 char *pre, *post;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
686
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
687 msn_parse_format(value, &pre, &post);
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
688
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
689 body_final = g_strdup_printf("%s%s%s", pre ? pre : "",
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
690 body_enc ? body_enc : "", post ? post : "");
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
691
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
692 g_free(pre);
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
693 g_free(post);
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
694 g_free(body_enc);
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
695 }
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
696 else
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
697 {
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
698 body_final = body_enc;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
699 }
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
700
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
701 if (cmdproc->servconn->type == MSN_SERVCONN_SB) {
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
702 MsnSwitchBoard *swboard = cmdproc->data;
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
703
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
704 swboard->flag |= MSN_SB_FLAG_IM;
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
705
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
706 if (swboard->current_users > 1 ||
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
707 ((swboard->conv != NULL) &&
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
708 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
709 {
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
710 /* If current_users is always ok as it should then there is no need to
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
711 * check if this is a chat. */
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
712 if (swboard->current_users <= 1)
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
713 purple_debug_misc("msn", "plain_msg: current_users(%d)\n",
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
714 swboard->current_users);
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
715
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
716 serv_got_chat_in(gc, swboard->chat_id, passport, 0, body_final,
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
717 time(NULL));
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
718 if (swboard->conv == NULL)
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
719 {
34622
753f46dd000f Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents: 32987
diff changeset
720 swboard->conv = purple_conversations_find_chat(gc, swboard->chat_id);
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
721 swboard->flag |= MSN_SB_FLAG_IM;
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
722 }
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
723 }
32678
01f6312a4a7b On the way to hiding the PurpleConnection struct.
Andrew Victor <andrew.victor@mxit.com>
parents: 32624
diff changeset
724 else if (!g_str_equal(passport, purple_account_get_username(purple_connection_get_account(gc))))
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
725 {
30939
f3f4e9b1b6cc Don't treat messages got from ourself from a switchboard like a new message. This fixes the multiple conversation open with ourself.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 30929
diff changeset
726 /* Don't im ourselves ... */
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
727 serv_got_im(gc, passport, body_final, 0, time(NULL));
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
728 if (swboard->conv == NULL)
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
729 {
34622
753f46dd000f Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents: 32987
diff changeset
730 swboard->conv = purple_conversations_find_with_account(PURPLE_CONV_TYPE_IM,
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
731 passport, purple_connection_get_account(gc));
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
732 swboard->flag |= MSN_SB_FLAG_IM;
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
733 }
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
734 }
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
735
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
736 } else {
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
737 serv_got_im(gc, passport, body_final, 0, time(NULL));
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
738 }
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
739
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
740 g_free(body_final);
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
741 }
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
742
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
743 void
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
744 msn_control_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
745 {
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
746 PurpleConnection *gc;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
747 char *passport;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
748
32624
f957ad287bcc Convert code to use the purple_account accessor functions.
Andrew Victor <andrew.victor@mxit.com>
parents: 32312
diff changeset
749 gc = purple_account_get_connection(cmdproc->session->account);
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
750 passport = msg->remote_user;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
751
29457
15f977c9ac76 Rename "attribute" to "header" in a bunch of places. The SLP protocol
Mark Doliner <markdoliner@pidgin.im>
parents: 28146
diff changeset
752 if (msn_message_get_header_value(msg, "TypingUser") == NULL)
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
753 return;
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
754
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
755 if (cmdproc->servconn->type == MSN_SERVCONN_SB) {
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
756 MsnSwitchBoard *swboard = cmdproc->data;
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
757
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
758 if (swboard->current_users == 1)
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
759 {
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
760 serv_got_typing(gc, passport, MSN_TYPING_RECV_TIMEOUT,
34622
753f46dd000f Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents: 32987
diff changeset
761 PURPLE_IM_CONVERSATION_TYPING);
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
762 }
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
763
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
764 } else {
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
765 serv_got_typing(gc, passport, MSN_TYPING_RECV_TIMEOUT,
34622
753f46dd000f Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents: 32987
diff changeset
766 PURPLE_IM_CONVERSATION_TYPING);
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
767 }
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
768 }
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
769
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
770 static void
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
771 datacast_inform_user(MsnSwitchBoard *swboard, const char *who,
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
772 const char *msg, const char *filename)
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
773 {
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
774 char *username, *str;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
775 PurpleAccount *account;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
776 PurpleBuddy *b;
30200
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
777 PurpleConnection *pc;
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
778 gboolean chat;
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
779
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
780 account = swboard->session->account;
30200
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
781 pc = purple_account_get_connection(account);
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
782
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
783 if ((b = purple_find_buddy(account, who)) != NULL)
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
784 username = g_markup_escape_text(purple_buddy_get_alias(b), -1);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
785 else
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
786 username = g_markup_escape_text(who, -1);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
787 str = g_strdup_printf(msg, username, filename);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
788 g_free(username);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
789
30200
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
790 swboard->flag |= MSN_SB_FLAG_IM;
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
791 if (swboard->current_users > 1)
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
792 chat = TRUE;
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
793 else
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
794 chat = FALSE;
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
795
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
796 if (swboard->conv == NULL) {
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31240
diff changeset
797 if (chat)
34622
753f46dd000f Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents: 32987
diff changeset
798 swboard->conv = purple_conversations_find_chat(purple_account_get_connection(account), swboard->chat_id);
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
799 else {
34622
753f46dd000f Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents: 32987
diff changeset
800 swboard->conv = purple_conversations_find_with_account(PURPLE_CONV_TYPE_IM,
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
801 who, account);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
802 if (swboard->conv == NULL)
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
803 swboard->conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
804 }
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
805 }
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
806
30200
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
807 if (chat)
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
808 serv_got_chat_in(pc,
34622
753f46dd000f Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents: 32987
diff changeset
809 purple_chat_conversation_get_id(PURPLE_CONV_CHAT(swboard->conv)),
30200
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
810 who, PURPLE_MESSAGE_RECV|PURPLE_MESSAGE_SYSTEM, str,
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
811 time(NULL));
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
812 else
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
813 serv_got_im(pc, who, str, PURPLE_MESSAGE_RECV|PURPLE_MESSAGE_SYSTEM,
50c2380f3607 Use serv_got_im/serv_got_chat_in instead of purple_conversation_write so
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30064
diff changeset
814 time(NULL));
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
815 g_free(str);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
816
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
817 }
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
818
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
819 /* TODO: Make these not be such duplicates of each other */
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31240
diff changeset
820 static void
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
821 got_wink_cb(MsnSlpCall *slpcall, const guchar *data, gsize size)
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
822 {
30063
a42ac7c244c8 I'm tired of seeing this warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 29485
diff changeset
823 FILE *f = NULL;
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
824 char *path = NULL;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
825 const char *who = slpcall->slplink->remote_user;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
826 purple_debug_info("msn", "Received wink from %s\n", who);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
827
30063
a42ac7c244c8 I'm tired of seeing this warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 29485
diff changeset
828 if ((f = purple_mkstemp(&path, TRUE)) &&
30064
9e6f32b8ced9 Oops, make sure that check actually succeeds when it's supposed to.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30063
diff changeset
829 (fwrite(data, 1, size, f) == size)) {
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
830 datacast_inform_user(slpcall->slplink->swboard,
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
831 who,
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
832 _("%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"),
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
833 path);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
834 } else {
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
835 purple_debug_error("msn", "Couldn\'t create temp file to store wink\n");
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
836 datacast_inform_user(slpcall->slplink->swboard,
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
837 who,
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
838 _("%s sent a wink, but it could not be saved"),
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
839 NULL);
30063
a42ac7c244c8 I'm tired of seeing this warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 29485
diff changeset
840 }
a42ac7c244c8 I'm tired of seeing this warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 29485
diff changeset
841 if (f)
a42ac7c244c8 I'm tired of seeing this warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 29485
diff changeset
842 fclose(f);
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
843 g_free(path);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
844 }
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
845
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31240
diff changeset
846 static void
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
847 got_voiceclip_cb(MsnSlpCall *slpcall, const guchar *data, gsize size)
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
848 {
30063
a42ac7c244c8 I'm tired of seeing this warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 29485
diff changeset
849 FILE *f = NULL;
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
850 char *path = NULL;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
851 const char *who = slpcall->slplink->remote_user;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
852 purple_debug_info("msn", "Received voice clip from %s\n", who);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
853
30063
a42ac7c244c8 I'm tired of seeing this warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 29485
diff changeset
854 if ((f = purple_mkstemp(&path, TRUE)) &&
30064
9e6f32b8ced9 Oops, make sure that check actually succeeds when it's supposed to.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30063
diff changeset
855 (fwrite(data, 1, size, f) == size)) {
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
856 datacast_inform_user(slpcall->slplink->swboard,
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
857 who,
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
858 _("%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"),
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
859 path);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
860 } else {
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
861 purple_debug_error("msn", "Couldn\'t create temp file to store sound\n");
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
862 datacast_inform_user(slpcall->slplink->swboard,
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
863 who,
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
864 _("%s sent a voice clip, but it could not be saved"),
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
865 NULL);
30063
a42ac7c244c8 I'm tired of seeing this warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 29485
diff changeset
866 }
a42ac7c244c8 I'm tired of seeing this warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 29485
diff changeset
867 if (f)
a42ac7c244c8 I'm tired of seeing this warning.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 29485
diff changeset
868 fclose(f);
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
869 g_free(path);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
870 }
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
871
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
872 void
31014
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
873 msn_p2p_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
874 {
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
875 MsnSession *session;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
876 MsnSlpLink *slplink;
31787
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
877 MsnP2PVersion p2p;
31014
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
878
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
879 session = cmdproc->servconn->session;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
880 slplink = msn_session_get_slplink(session, msg->remote_user);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
881
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
882 if (slplink->swboard == NULL)
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
883 {
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
884 /*
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
885 * We will need swboard in order to change its flags. If its
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
886 * NULL, something has probably gone wrong earlier on. I
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
887 * didn't want to do this, but MSN 7 is somehow causing us
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
888 * to crash here, I couldn't reproduce it to debug more,
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
889 * and people are reporting bugs. Hopefully this doesn't
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
890 * cause more crashes. Stu.
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
891 */
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
892 if (cmdproc->data == NULL)
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
893 g_warning("msn_p2p_msg cmdproc->data was NULL\n");
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
894 else {
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
895 slplink->swboard = (MsnSwitchBoard *)cmdproc->data;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
896 slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
897 }
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
898 }
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
899
31790
fd6e676248f8 Getting the P2P version is probably the slplink's job, since it has
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31787
diff changeset
900 p2p = msn_slplink_get_p2p_version(slplink);
31787
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
901 msg->part = msn_slpmsgpart_new_from_data(p2p, msg->body, msg->body_len);
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
902
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
903 if (msg->part)
31060
67d11dfa6338 Process SlpMessageParts, a sequence of parts will generate a SlpMessage.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31052
diff changeset
904 msn_slplink_process_msg(slplink, msg->part);
31787
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
905 else
5ce831243797 I've always wondered why the SB layer was parsing the P2P stuff, when
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31781
diff changeset
906 purple_debug_warning("msn", "P2P message failed to parse.\n");
31014
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
907 }
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
908
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
909 static void
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
910 got_emoticon(MsnSlpCall *slpcall,
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
911 const guchar *data, gsize size)
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
912 {
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
913 PurpleConversation *conv;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
914 MsnSwitchBoard *swboard;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
915
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
916 swboard = slpcall->slplink->swboard;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
917 conv = swboard->conv;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
918
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
919 if (conv) {
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
920 /* FIXME: it would be better if we wrote the data as we received it
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
921 instead of all at once, calling write multiple times and
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
922 close once at the very end
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
923 */
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
924 purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
925 purple_conv_custom_smiley_close(conv, slpcall->data_info );
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
926 }
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
927 if (purple_debug_is_verbose())
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
928 purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
929 }
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
930
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
931 void msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
932 {
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
933 MsnSession *session;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
934 MsnSlpLink *slplink;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
935 MsnSwitchBoard *swboard;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
936 MsnObject *obj;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
937 char **tokens;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
938 char *smile, *body_str;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
939 const char *body, *who, *sha1;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
940 guint tok;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
941 size_t body_len;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
942
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
943 PurpleConversation *conv;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
944
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
945 session = cmdproc->servconn->session;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
946
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
947 if (!purple_account_get_bool(session->account, "custom_smileys", TRUE))
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
948 return;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
949
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
950 swboard = cmdproc->data;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
951 conv = swboard->conv;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
952
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
953 body = msn_message_get_bin_data(msg, &body_len);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
954 if (!body || !body_len)
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
955 return;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
956 body_str = g_strndup(body, body_len);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
957
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
958 /* MSN Messenger 7 may send more than one MSNObject in a single message...
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
959 * Maybe 10 tokens is a reasonable max value. */
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
960 tokens = g_strsplit(body_str, "\t", 10);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
961
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
962 g_free(body_str);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
963
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
964 for (tok = 0; tok < 9; tok += 2) {
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
965 if (tokens[tok] == NULL || tokens[tok + 1] == NULL) {
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
966 break;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
967 }
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
968
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
969 smile = tokens[tok];
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
970 obj = msn_object_new_from_string(purple_url_decode(tokens[tok + 1]));
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
971
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
972 if (obj == NULL)
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
973 break;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
974
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
975 who = msn_object_get_creator(obj);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
976 sha1 = msn_object_get_sha1(obj);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
977
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
978 slplink = msn_session_get_slplink(session, who);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
979 if (slplink->swboard != swboard) {
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
980 if (slplink->swboard != NULL)
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
981 /*
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
982 * Apparently we're using a different switchboard now or
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
983 * something? I don't know if this is normal, but it
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
984 * definitely happens. So make sure the old switchboard
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
985 * doesn't still have a reference to us.
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
986 */
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
987 slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
988 slplink->swboard = swboard;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
989 slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
990 }
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
991
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
992 /* If the conversation doesn't exist then this is a custom smiley
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
993 * used in the first message in a MSN conversation: we need to create
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
994 * the conversation now, otherwise the custom smiley won't be shown.
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
995 * This happens because every GtkIMHtml has its own smiley tree: if
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
996 * the conversation doesn't exist then we cannot associate the new
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
997 * smiley with its GtkIMHtml widget. */
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
998 if (!conv) {
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
999 conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, session->account, who);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1000 }
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1001
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1002 if (purple_conv_custom_smiley_add(conv, smile, "sha1", sha1, TRUE)) {
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1003 msn_slplink_request_object(slplink, smile, got_emoticon, NULL, obj);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1004 }
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1005
32312
44c2bc252f60 Be a bit more specific about removing non-local MSN objects, which
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31790
diff changeset
1006 msn_object_destroy(obj, FALSE);
31014
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1007 obj = NULL;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1008 who = NULL;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1009 sha1 = NULL;
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1010 }
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1011 g_strfreev(tokens);
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1012 }
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1013
3a5550f5ab47 Move MsnMessage callbacks to msn.c instead of polluting everywhere.
Jorge Villaseñor <masca@cpw.pidgin.im>
parents: 31003
diff changeset
1014 void
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1015 msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1016 {
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1017 GHashTable *body;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1018 const char *id;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1019 body = msn_message_get_hashtable_from_body(msg);
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1020
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1021 id = g_hash_table_lookup(body, "ID");
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1022
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1023 if (!strcmp(id, "1")) {
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1024 /* Nudge */
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1025 PurpleAccount *account;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1026 const char *user;
32624
f957ad287bcc Convert code to use the purple_account accessor functions.
Andrew Victor <andrew.victor@mxit.com>
parents: 32312
diff changeset
1027 PurpleConnection *gc;
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1028
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1029 account = cmdproc->session->account;
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1030 user = msg->remote_user;
32624
f957ad287bcc Convert code to use the purple_account accessor functions.
Andrew Victor <andrew.victor@mxit.com>
parents: 32312
diff changeset
1031 gc = purple_account_get_connection(account);
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1032
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
1033 if (cmdproc->servconn->type == MSN_SERVCONN_SB) {
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
1034 MsnSwitchBoard *swboard = cmdproc->data;
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
1035 if (swboard->current_users > 1 ||
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
1036 ((swboard->conv != NULL) &&
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
1037 purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
32624
f957ad287bcc Convert code to use the purple_account accessor functions.
Andrew Victor <andrew.victor@mxit.com>
parents: 32312
diff changeset
1038 purple_prpl_got_attention_in_chat(gc, swboard->chat_id, user, MSN_NUDGE);
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1039
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
1040 else
32624
f957ad287bcc Convert code to use the purple_account accessor functions.
Andrew Victor <andrew.victor@mxit.com>
parents: 32312
diff changeset
1041 purple_prpl_got_attention(gc, user, MSN_NUDGE);
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
1042 } else {
32624
f957ad287bcc Convert code to use the purple_account accessor functions.
Andrew Victor <andrew.victor@mxit.com>
parents: 32312
diff changeset
1043 purple_prpl_got_attention(gc, user, MSN_NUDGE);
25539
855cf59c9b6f Make message handlers more generic and able to work when used by the
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25538
diff changeset
1044 }
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1045
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1046 } else if (!strcmp(id, "2")) {
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1047 /* Wink */
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1048 MsnSession *session;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1049 MsnSlpLink *slplink;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1050 MsnObject *obj;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1051 const char *who;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1052 const char *data;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1053
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1054 session = cmdproc->session;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1055
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1056 data = g_hash_table_lookup(body, "Data");
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1057 obj = msn_object_new_from_string(data);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1058 who = msn_object_get_creator(obj);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1059
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1060 slplink = msn_session_get_slplink(session, who);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1061 msn_slplink_request_object(slplink, data, got_wink_cb, NULL, obj);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1062
32312
44c2bc252f60 Be a bit more specific about removing non-local MSN objects, which
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31790
diff changeset
1063 msn_object_destroy(obj, FALSE);
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1064
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1065
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1066 } else if (!strcmp(id, "3")) {
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1067 /* Voiceclip */
27690
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1068 MsnSession *session;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1069 MsnSlpLink *slplink;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1070 MsnObject *obj;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1071 const char *who;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1072 const char *data;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1073
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1074 session = cmdproc->session;
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1075
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1076 data = g_hash_table_lookup(body, "Data");
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1077 obj = msn_object_new_from_string(data);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1078 who = msn_object_get_creator(obj);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1079
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1080 slplink = msn_session_get_slplink(session, who);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1081 msn_slplink_request_object(slplink, data, got_voiceclip_cb, NULL, obj);
c84c192f7a9e Add support for receiving winks and audio clips on MSN. The resulting file
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 27569
diff changeset
1082
32312
44c2bc252f60 Be a bit more specific about removing non-local MSN objects, which
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 31790
diff changeset
1083 msn_object_destroy(obj, FALSE);
25538
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1084
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1085 } else if (!strcmp(id, "4")) {
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1086 /* Action */
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1087
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1088 } else {
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1089 purple_debug_warning("msn", "Got unknown datacast with ID %s.\n", id);
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1090 }
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1091
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1092 g_hash_table_destroy(body);
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1093 }
22182aef4300 Move some MSN message handlers from switchboard to general msg.c.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 25417
diff changeset
1094
26739
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1095 void
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1096 msn_invite_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1097 {
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1098 GHashTable *body;
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1099 const gchar *command;
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1100 const gchar *cookie;
28146
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1101 gboolean accepted = FALSE;
26739
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1102
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1103 g_return_if_fail(cmdproc != NULL);
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1104 g_return_if_fail(msg != NULL);
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1105
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1106 body = msn_message_get_hashtable_from_body(msg);
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1107
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1108 if (body == NULL) {
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1109 purple_debug_warning("msn",
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1110 "Unable to parse invite msg body.\n");
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1111 return;
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1112 }
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31240
diff changeset
1113
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1114 /*
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1115 * GUID is NOT always present but Invitation-Command and Invitation-Cookie
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1116 * are mandatory.
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1117 */
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1118 command = g_hash_table_lookup(body, "Invitation-Command");
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1119 cookie = g_hash_table_lookup(body, "Invitation-Cookie");
26739
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1120
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1121 if (command == NULL || cookie == NULL) {
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1122 purple_debug_warning("msn",
30079
d91306baf541 More minor fixes. Spelling, extra variables, etc.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30066
diff changeset
1123 "Invalid invitation message: either Invitation-Command "
d91306baf541 More minor fixes. Spelling, extra variables, etc.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30066
diff changeset
1124 "or Invitation-Cookie is missing or invalid.\n"
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1125 );
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1126 return;
28146
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1127
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1128 } else if (!strcmp(command, "INVITE")) {
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1129 const gchar *guid = g_hash_table_lookup(body, "Application-GUID");
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31240
diff changeset
1130
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1131 if (guid == NULL) {
30317
279a047f1fc8 Wait, command can't be both INVITE and CANCEL at the same time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30216
diff changeset
1132 purple_debug_warning("msn",
279a047f1fc8 Wait, command can't be both INVITE and CANCEL at the same time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30216
diff changeset
1133 "Invite msg missing Application-GUID.\n");
26739
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1134
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1135 accepted = TRUE;
26739
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1136
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1137 } else if (!strcmp(guid, MSN_FT_GUID)) {
26739
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1138
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1139 } else if (!strcmp(guid, "{02D3C01F-BF30-4825-A83A-DE7AF41648AA}")) {
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1140 purple_debug_info("msn", "Computer call\n");
26739
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1141
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1142 if (cmdproc->session) {
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1143 PurpleConversation *conv = NULL;
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1144 gchar *from = msg->remote_user;
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1145 gchar *buf = NULL;
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1146
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1147 if (from)
34622
753f46dd000f Global replace - renamed functions and types according to GObject-based PurpleConversation API
Ankit Vani <a@nevitus.org>
parents: 32987
diff changeset
1148 conv = purple_conversations_find_with_account(
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1149 PURPLE_CONV_TYPE_IM, from,
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1150 cmdproc->session->account);
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1151 if (conv)
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1152 buf = g_strdup_printf(
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1153 _("%s sent you a voice chat "
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1154 "invite, which is not yet "
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1155 "supported."), from);
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1156 if (buf) {
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1157 purple_conversation_write(conv, NULL, buf,
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1158 PURPLE_MESSAGE_SYSTEM |
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1159 PURPLE_MESSAGE_NOTIFY,
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1160 time(NULL));
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1161 g_free(buf);
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1162 }
26739
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1163 }
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1164 } else {
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1165 const gchar *application = g_hash_table_lookup(body, "Application-Name");
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1166 purple_debug_warning("msn", "Unhandled invite msg with GUID %s: %s.\n",
30079
d91306baf541 More minor fixes. Spelling, extra variables, etc.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30066
diff changeset
1167 guid, application ? application : "(null)");
26739
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1168 }
31294
73607ab89c6f Remove trailing whitespace
Richard Laager <rlaager@pidgin.im>
parents: 31240
diff changeset
1169
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1170 if (!accepted) {
28146
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1171 MsnSwitchBoard *swboard = cmdproc->data;
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1172 char *text;
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1173 MsnMessage *cancel;
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1174
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1175 cancel = msn_message_new(MSN_MSG_TEXT);
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1176 msn_message_set_content_type(cancel, "text/x-msmsgsinvite");
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1177 msn_message_set_charset(cancel, "UTF-8");
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1178 msn_message_set_flag(cancel, 'U');
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1179
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1180 text = g_strdup_printf("Invitation-Command: CANCEL\r\n"
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1181 "Invitation-Cookie: %s\r\n"
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1182 "Cancel-Code: REJECT_NOT_INSTALLED\r\n",
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1183 cookie);
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1184 msn_message_set_bin_data(cancel, text, strlen(text));
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1185 g_free(text);
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1186
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1187 msn_switchboard_send_msg(swboard, cancel, TRUE);
31162
2c596217766b msn_message_destroy() calls msn_message_unref() if refcount>0. This is
Mark Doliner <markdoliner@pidgin.im>
parents: 31136
diff changeset
1188 msn_message_unref(cancel);
28146
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1189 }
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1190
30317
279a047f1fc8 Wait, command can't be both INVITE and CANCEL at the same time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30216
diff changeset
1191 } else if (!strcmp(command, "CANCEL")) {
279a047f1fc8 Wait, command can't be both INVITE and CANCEL at the same time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30216
diff changeset
1192 const gchar *code = g_hash_table_lookup(body, "Cancel-Code");
279a047f1fc8 Wait, command can't be both INVITE and CANCEL at the same time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30216
diff changeset
1193 purple_debug_info("msn", "MSMSGS invitation cancelled: %s.\n",
279a047f1fc8 Wait, command can't be both INVITE and CANCEL at the same time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30216
diff changeset
1194 code ? code : "no reason given");
279a047f1fc8 Wait, command can't be both INVITE and CANCEL at the same time.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30216
diff changeset
1195
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1196 } else {
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1197 /*
30079
d91306baf541 More minor fixes. Spelling, extra variables, etc.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 30066
diff changeset
1198 * Some other already established invitation session.
30066
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1199 * Can be retrieved by Invitation-Cookie.
25742b976ce2 Initial support for direct connections. Preliminary patch from ticket #247
Gábor Szuromi <kukkerman@gmail.com>
parents: 29485
diff changeset
1200 */
28146
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1201 }
796c252c735e Send a cancel message for any unknown text/x-msmsgsinvite requests, so that
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 28145
diff changeset
1202
26739
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1203 g_hash_table_destroy(body);
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1204 }
ee13fa0be1a6 Notify the user if a contact invites them to a voice call over MSN.
Michael Ruprecht <maiku@pidgin.im>
parents: 25617
diff changeset
1205
27569
7f08e35e35ac Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 26739
diff changeset
1206 /* Only called from chats. Handwritten messages for IMs come as a SLP message */
7f08e35e35ac Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 26739
diff changeset
1207 void
7f08e35e35ac Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 26739
diff changeset
1208 msn_handwritten_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
7f08e35e35ac Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 26739
diff changeset
1209 {
7f08e35e35ac Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 26739
diff changeset
1210 const char *body;
7f08e35e35ac Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 26739
diff changeset
1211 size_t body_len;
7f08e35e35ac Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 26739
diff changeset
1212
7f08e35e35ac Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 26739
diff changeset
1213 body = msn_message_get_bin_data(msg, &body_len);
7f08e35e35ac Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 26739
diff changeset
1214 msn_switchboard_show_ink(cmdproc->data, msg->remote_user, body);
7f08e35e35ac Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 26739
diff changeset
1215 }
7f08e35e35ac Add support for receiving handwritten (Ink) messages from MSN buddies.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 26739
diff changeset
1216

mercurial