Fri, 06 Feb 2009 23:19:27 +0000
A little manual merge...
| 4542 | 1 | /** |
| 2 | * @file msg.c Message functions | |
| 3 | * | |
| 15884 | 4 | * purple |
| 4542 | 5 | * |
| 15884 | 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 | 10 | * This program is free software; you can redistribute it and/or modify |
| 11 | * it under the terms of the GNU General Public License as published by | |
| 12 | * the Free Software Foundation; either version 2 of the License, or | |
| 13 | * (at your option) any later version. | |
| 14 | * | |
| 15 | * This program is distributed in the hope that it will be useful, | |
| 16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 18 | * GNU General Public License for more details. | |
| 19 | * | |
| 20 | * You should have received a copy of the GNU General Public License | |
| 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 | 23 | */ |
| 24 | #include "msn.h" | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
25 | #include "msg.h" |
|
25943
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
26 | #include "msnutils.h" |
| 4542 | 27 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
28 | MsnMessage * |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
29 | msn_message_new(MsnMsgType type) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
30 | { |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
31 | MsnMessage *msg; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
32 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
33 | msg = g_new0(MsnMessage, 1); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
34 | msg->type = type; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
35 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
36 | #ifdef MSN_DEBUG_MSG |
| 15884 | 37 | 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
|
38 | #endif |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
39 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
40 | msg->attr_table = g_hash_table_new_full(g_str_hash, g_str_equal, |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
41 | g_free, g_free); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
42 | |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
43 | msn_message_ref(msg); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
44 | |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
45 | return msg; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
46 | } |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
47 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
48 | void |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
49 | msn_message_destroy(MsnMessage *msg) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
50 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
51 | g_return_if_fail(msg != NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
52 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
53 | if (msg->ref_count > 0) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
54 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
55 | msn_message_unref(msg); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
56 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
57 | return; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
58 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
59 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
60 | #ifdef MSN_DEBUG_MSG |
| 15884 | 61 | purple_debug_info("msn", "message destroy (%p)\n", msg); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
62 | #endif |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
63 | |
|
21067
97a745428ab0
Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents:
21065
diff
changeset
|
64 | 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
|
65 | g_free(msg->body); |
|
97a745428ab0
Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents:
21065
diff
changeset
|
66 | 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
|
67 | g_free(msg->charset); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
68 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
69 | g_hash_table_destroy(msg->attr_table); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
70 | g_list_free(msg->attr_list); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
71 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
72 | g_free(msg); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
73 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
74 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
75 | MsnMessage * |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
76 | msn_message_ref(MsnMessage *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 | g_return_val_if_fail(msg != NULL, NULL); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
79 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
80 | msg->ref_count++; |
|
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 | #ifdef MSN_DEBUG_MSG |
|
25943
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
83 | purple_debug_info("msn", "message ref (%p)[%" G_GSIZE_FORMAT "]\n", msg, msg->ref_count); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
84 | #endif |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
85 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
86 | return msg; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
87 | } |
|
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 | MsnMessage * |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
90 | msn_message_unref(MsnMessage *msg) |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
91 | { |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
92 | g_return_val_if_fail(msg != NULL, NULL); |
|
12250
5b14301dd1ec
[gaim-migrate @ 14552]
Richard Laager <rlaager@pidgin.im>
parents:
11322
diff
changeset
|
93 | g_return_val_if_fail(msg->ref_count > 0, NULL); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
94 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
95 | msg->ref_count--; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
96 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
97 | #ifdef MSN_DEBUG_MSG |
|
25943
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
98 | purple_debug_info("msn", "message unref (%p)[%" G_GSIZE_FORMAT "]\n", msg, msg->ref_count); |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
99 | #endif |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
100 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
101 | if (msg->ref_count == 0) |
|
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 | msn_message_destroy(msg); |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
104 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
105 | return NULL; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
106 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
107 | |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
108 | return msg; |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
109 | } |
|
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
110 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
111 | MsnMessage * |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
112 | msn_message_new_plain(const char *message) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
113 | { |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
114 | MsnMessage *msg; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
115 | char *message_cr; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
116 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
117 | 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
|
118 | msg->retries = 1; |
|
14932
d2b3faf48b39
[gaim-migrate @ 17639]
Evan Schoenberg <evands@pidgin.im>
parents:
14254
diff
changeset
|
119 | msn_message_set_attr(msg, "User-Agent", PACKAGE_NAME "/" VERSION); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
120 | msn_message_set_content_type(msg, "text/plain"); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
121 | msn_message_set_charset(msg, "UTF-8"); |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
122 | msn_message_set_flag(msg, 'A'); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
123 | msn_message_set_attr(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
|
124 | "FN=Segoe%20UI; EF=; CO=0; CS=1;PF=0"); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
125 | |
| 15884 | 126 | message_cr = purple_str_add_cr(message); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
127 | 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
|
128 | g_free(message_cr); |
|
5506
b53a1acacefe
[gaim-migrate @ 5905]
Christian Hammond <chipx86@chipx86.com>
parents:
5478
diff
changeset
|
129 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
130 | return msg; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
131 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
132 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
133 | MsnMessage * |
|
6800
8f99c220b503
[gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents:
6786
diff
changeset
|
134 | msn_message_new_msnslp(void) |
|
8f99c220b503
[gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents:
6786
diff
changeset
|
135 | { |
|
8f99c220b503
[gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents:
6786
diff
changeset
|
136 | MsnMessage *msg; |
|
8f99c220b503
[gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents:
6786
diff
changeset
|
137 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
138 | msg = msn_message_new(MSN_MSG_SLP); |
|
6800
8f99c220b503
[gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents:
6786
diff
changeset
|
139 | |
|
8f99c220b503
[gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents:
6786
diff
changeset
|
140 | msn_message_set_attr(msg, "User-Agent", NULL); |
|
8f99c220b503
[gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents:
6786
diff
changeset
|
141 | |
|
8f99c220b503
[gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents:
6786
diff
changeset
|
142 | msg->msnslp_message = TRUE; |
|
8f99c220b503
[gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents:
6786
diff
changeset
|
143 | |
|
6868
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
144 | msn_message_set_flag(msg, 'D'); |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
145 | msn_message_set_content_type(msg, "application/x-msnmsgrp2p"); |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
146 | |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
147 | return msg; |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
148 | } |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
149 | |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11235
diff
changeset
|
150 | MsnMessage * |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11235
diff
changeset
|
151 | msn_message_new_nudge(void) |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11235
diff
changeset
|
152 | { |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11235
diff
changeset
|
153 | MsnMessage *msg; |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11235
diff
changeset
|
154 | |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11235
diff
changeset
|
155 | 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
|
156 | msn_message_set_content_type(msg, "text/x-msnmsgr-datacast"); |
|
11321
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11235
diff
changeset
|
157 | 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
|
158 | 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
|
159 | |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11235
diff
changeset
|
160 | return msg; |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11235
diff
changeset
|
161 | } |
|
a93121c0ea16
[gaim-migrate @ 13525]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
11235
diff
changeset
|
162 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
163 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
164 | msn_message_parse_slp_body(MsnMessage *msg, const char *body, size_t len) |
|
6868
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
165 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
166 | MsnSlpHeader header; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
167 | const char *tmp; |
|
11001
a026aa937d97
[gaim-migrate @ 12851]
Daniel Atallah <datallah@pidgin.im>
parents:
10981
diff
changeset
|
168 | int body_len; |
|
6868
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
169 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
170 | tmp = body; |
|
6868
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
171 | |
|
11001
a026aa937d97
[gaim-migrate @ 12851]
Daniel Atallah <datallah@pidgin.im>
parents:
10981
diff
changeset
|
172 | if (len < sizeof(header)) { |
|
a026aa937d97
[gaim-migrate @ 12851]
Daniel Atallah <datallah@pidgin.im>
parents:
10981
diff
changeset
|
173 | g_return_if_reached(); |
|
a026aa937d97
[gaim-migrate @ 12851]
Daniel Atallah <datallah@pidgin.im>
parents:
10981
diff
changeset
|
174 | } |
|
a026aa937d97
[gaim-migrate @ 12851]
Daniel Atallah <datallah@pidgin.im>
parents:
10981
diff
changeset
|
175 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
176 | /* Import the header. */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
177 | memcpy(&header, tmp, sizeof(header)); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
178 | tmp += sizeof(header); |
|
6868
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
179 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
180 | msg->msnslp_header.session_id = GUINT32_FROM_LE(header.session_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
181 | msg->msnslp_header.id = GUINT32_FROM_LE(header.id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
182 | msg->msnslp_header.offset = GUINT64_FROM_LE(header.offset); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
183 | msg->msnslp_header.total_size = GUINT64_FROM_LE(header.total_size); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
184 | msg->msnslp_header.length = GUINT32_FROM_LE(header.length); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
185 | msg->msnslp_header.flags = GUINT32_FROM_LE(header.flags); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
186 | msg->msnslp_header.ack_id = GUINT32_FROM_LE(header.ack_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
187 | msg->msnslp_header.ack_sub_id = GUINT32_FROM_LE(header.ack_sub_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
188 | msg->msnslp_header.ack_size = GUINT64_FROM_LE(header.ack_size); |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
189 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
190 | /* Import the body. */ |
|
11001
a026aa937d97
[gaim-migrate @ 12851]
Daniel Atallah <datallah@pidgin.im>
parents:
10981
diff
changeset
|
191 | body_len = len - (tmp - body); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
192 | /* msg->body_len = msg->msnslp_header.length; */ |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
193 | |
|
11001
a026aa937d97
[gaim-migrate @ 12851]
Daniel Atallah <datallah@pidgin.im>
parents:
10981
diff
changeset
|
194 | if (body_len > 0) { |
|
a026aa937d97
[gaim-migrate @ 12851]
Daniel Atallah <datallah@pidgin.im>
parents:
10981
diff
changeset
|
195 | msg->body_len = len - (tmp - body); |
|
24608
9f21d921daaf
It should be more efficient to just use g_mallc() and then manually
Mark Doliner <markdoliner@pidgin.im>
parents:
24420
diff
changeset
|
196 | msg->body = g_malloc(msg->body_len + 1); |
|
11235
7e1cd737137b
[gaim-migrate @ 13380]
Federico G. Schwindt <fgsch@lodoss.net>
parents:
11001
diff
changeset
|
197 | memcpy(msg->body, tmp, msg->body_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
|
198 | msg->body[msg->body_len] = '\0'; |
|
11001
a026aa937d97
[gaim-migrate @ 12851]
Daniel Atallah <datallah@pidgin.im>
parents:
10981
diff
changeset
|
199 | tmp += body_len; |
|
a026aa937d97
[gaim-migrate @ 12851]
Daniel Atallah <datallah@pidgin.im>
parents:
10981
diff
changeset
|
200 | } |
|
6800
8f99c220b503
[gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents:
6786
diff
changeset
|
201 | } |
|
8f99c220b503
[gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents:
6786
diff
changeset
|
202 | |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
203 | void |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
204 | msn_message_parse_payload(MsnMessage *msg, |
| 13886 | 205 | const char *payload, size_t payload_len, |
| 206 | const char *line_dem,const char *body_dem) | |
| 4542 | 207 | { |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
208 | char *tmp_base, *tmp; |
|
7845
edeb70aa2413
[gaim-migrate @ 8499]
Christian Hammond <chipx86@chipx86.com>
parents:
7604
diff
changeset
|
209 | const char *content_type; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
210 | char *end; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
211 | char **elems, **cur, **tokens; |
|
5454
5263b77f0ad9
[gaim-migrate @ 5842]
Christian Hammond <chipx86@chipx86.com>
parents:
5315
diff
changeset
|
212 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
213 | 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
|
214 | tmp_base = tmp = g_malloc(payload_len + 1); |
|
10481
a5d6b8e1717d
[gaim-migrate @ 11769]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10345
diff
changeset
|
215 | 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
|
216 | tmp_base[payload_len] = '\0'; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
217 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
218 | /* Parse the attributes. */ |
| 13886 | 219 | end = strstr(tmp, body_dem); |
|
10284
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10275
diff
changeset
|
220 | /* 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
|
221 | * 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
|
222 | * avoid crashing for now */ |
|
10981
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
223 | if (end == NULL) { |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
224 | g_free(tmp_base); |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
225 | g_return_if_reached(); |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
226 | } |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
227 | *end = '\0'; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
228 | |
| 13886 | 229 | elems = g_strsplit(tmp, line_dem, 0); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
230 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
231 | for (cur = elems; *cur != NULL; cur++) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
232 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
233 | const char *key, *value; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
234 | |
|
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
|
235 | /* 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
|
236 | 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
|
237 | 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
|
238 | 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
|
239 | 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
|
240 | 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
|
241 | |
|
4dacf7e20b77
When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24608
diff
changeset
|
242 | /* 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
|
243 | 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
|
244 | 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
|
245 | 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
|
246 | *end = '\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
|
247 | msn_message_set_attr(msg, key, 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
|
248 | } |
|
4dacf7e20b77
When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24608
diff
changeset
|
249 | |
|
4dacf7e20b77
When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24608
diff
changeset
|
250 | 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
|
251 | 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
|
252 | } |
|
4dacf7e20b77
When parsing MSN message payload headers, check for folded lines. The only
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
24608
diff
changeset
|
253 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
254 | tokens = g_strsplit(*cur, ": ", 2); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
255 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
256 | key = tokens[0]; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
257 | value = tokens[1]; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
258 | |
| 13854 | 259 | /*if not MIME content ,then return*/ |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
260 | if (!strcmp(key, "MIME-Version")) |
|
10284
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10275
diff
changeset
|
261 | { |
|
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10275
diff
changeset
|
262 | g_strfreev(tokens); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
263 | continue; |
|
10284
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10275
diff
changeset
|
264 | } |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
265 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
266 | if (!strcmp(key, "Content-Type")) |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
267 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
268 | char *charset, *c; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
269 | |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
270 | if ((c = strchr(value, ';')) != NULL) |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
271 | { |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
272 | if ((charset = strchr(c, '=')) != NULL) |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
273 | { |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
274 | charset++; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
275 | msn_message_set_charset(msg, charset); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
276 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
277 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
278 | *c = '\0'; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
279 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
280 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
281 | msn_message_set_content_type(msg, value); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
282 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
283 | else |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
284 | { |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
285 | msn_message_set_attr(msg, key, value); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
286 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
287 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
288 | g_strfreev(tokens); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
289 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
290 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
291 | g_strfreev(elems); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
292 | |
|
10981
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
293 | /* Proceed to the end of the "\r\n\r\n" */ |
| 13886 | 294 | tmp = end + strlen(body_dem); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
295 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
296 | /* Now we *should* be at the body. */ |
|
7845
edeb70aa2413
[gaim-migrate @ 8499]
Christian Hammond <chipx86@chipx86.com>
parents:
7604
diff
changeset
|
297 | content_type = msn_message_get_content_type(msg); |
|
edeb70aa2413
[gaim-migrate @ 8499]
Christian Hammond <chipx86@chipx86.com>
parents:
7604
diff
changeset
|
298 | |
|
edeb70aa2413
[gaim-migrate @ 8499]
Christian Hammond <chipx86@chipx86.com>
parents:
7604
diff
changeset
|
299 | if (content_type != NULL && |
|
edeb70aa2413
[gaim-migrate @ 8499]
Christian Hammond <chipx86@chipx86.com>
parents:
7604
diff
changeset
|
300 | !strcmp(content_type, "application/x-msnmsgrp2p")) |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
301 | { |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
302 | MsnSlpHeader header; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
303 | MsnSlpFooter footer; |
|
10981
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
304 | int body_len; |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
305 | |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
306 | if (payload_len - (tmp - tmp_base) < sizeof(header)) { |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
307 | g_free(tmp_base); |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
308 | g_return_if_reached(); |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
309 | } |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
310 | |
|
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
311 | msg->msnslp_message = TRUE; |
|
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
312 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
313 | /* Import the header. */ |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
314 | memcpy(&header, tmp, sizeof(header)); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
315 | tmp += sizeof(header); |
|
7604
0800df4e5045
[gaim-migrate @ 8227]
Christian Hammond <chipx86@chipx86.com>
parents:
7592
diff
changeset
|
316 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
317 | msg->msnslp_header.session_id = GUINT32_FROM_LE(header.session_id); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
318 | msg->msnslp_header.id = GUINT32_FROM_LE(header.id); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
319 | msg->msnslp_header.offset = GUINT64_FROM_LE(header.offset); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
320 | msg->msnslp_header.total_size = GUINT64_FROM_LE(header.total_size); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
321 | msg->msnslp_header.length = GUINT32_FROM_LE(header.length); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
322 | msg->msnslp_header.flags = GUINT32_FROM_LE(header.flags); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
323 | msg->msnslp_header.ack_id = GUINT32_FROM_LE(header.ack_id); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
324 | msg->msnslp_header.ack_sub_id = GUINT32_FROM_LE(header.ack_sub_id); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
325 | msg->msnslp_header.ack_size = GUINT64_FROM_LE(header.ack_size); |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
326 | |
|
10981
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
327 | body_len = payload_len - (tmp - tmp_base) - sizeof(footer); |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
328 | |
|
10981
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
329 | /* Import the body. */ |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
330 | if (body_len > 0) { |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
331 | msg->body_len = body_len; |
|
21065
8bbf0f6700ed
Fix some leaks and prevent some unnecessary allocations and frees.
Daniel Atallah <datallah@pidgin.im>
parents:
21010
diff
changeset
|
332 | g_free(msg->body); |
|
24608
9f21d921daaf
It should be more efficient to just use g_mallc() and then manually
Mark Doliner <markdoliner@pidgin.im>
parents:
24420
diff
changeset
|
333 | msg->body = g_malloc(msg->body_len + 1); |
|
11235
7e1cd737137b
[gaim-migrate @ 13380]
Federico G. Schwindt <fgsch@lodoss.net>
parents:
11001
diff
changeset
|
334 | memcpy(msg->body, tmp, msg->body_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
|
335 | msg->body[msg->body_len] = '\0'; |
|
10981
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
336 | tmp += body_len; |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
337 | } |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
338 | |
|
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
339 | /* Import the footer. */ |
|
10981
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
340 | if (body_len >= 0) { |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
341 | memcpy(&footer, tmp, sizeof(footer)); |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
342 | tmp += sizeof(footer); |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
343 | msg->msnslp_footer.value = GUINT32_FROM_BE(footer.value); |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
344 | } |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
345 | } |
|
6705
e9dfe71c40df
[gaim-migrate @ 7231]
Christian Hammond <chipx86@chipx86.com>
parents:
6701
diff
changeset
|
346 | else |
|
e9dfe71c40df
[gaim-migrate @ 7231]
Christian Hammond <chipx86@chipx86.com>
parents:
6701
diff
changeset
|
347 | { |
|
10981
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
348 | if (payload_len - (tmp - tmp_base) > 0) { |
|
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
349 | msg->body_len = payload_len - (tmp - tmp_base); |
|
21065
8bbf0f6700ed
Fix some leaks and prevent some unnecessary allocations and frees.
Daniel Atallah <datallah@pidgin.im>
parents:
21010
diff
changeset
|
350 | g_free(msg->body); |
|
24608
9f21d921daaf
It should be more efficient to just use g_mallc() and then manually
Mark Doliner <markdoliner@pidgin.im>
parents:
24420
diff
changeset
|
351 | msg->body = g_malloc(msg->body_len + 1); |
|
11235
7e1cd737137b
[gaim-migrate @ 13380]
Federico G. Schwindt <fgsch@lodoss.net>
parents:
11001
diff
changeset
|
352 | memcpy(msg->body, tmp, msg->body_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
|
353 | msg->body[msg->body_len] = '\0'; |
|
10981
11def8085a30
[gaim-migrate @ 12812]
Daniel Atallah <datallah@pidgin.im>
parents:
10481
diff
changeset
|
354 | } |
|
6705
e9dfe71c40df
[gaim-migrate @ 7231]
Christian Hammond <chipx86@chipx86.com>
parents:
6701
diff
changeset
|
355 | } |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
356 | |
|
6011
a7fd3284655c
[gaim-migrate @ 6459]
Christian Hammond <chipx86@chipx86.com>
parents:
5506
diff
changeset
|
357 | g_free(tmp_base); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
358 | } |
|
6011
a7fd3284655c
[gaim-migrate @ 6459]
Christian Hammond <chipx86@chipx86.com>
parents:
5506
diff
changeset
|
359 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
360 | MsnMessage * |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
361 | msn_message_new_from_cmd(MsnSession *session, MsnCommand *cmd) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
362 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
363 | MsnMessage *msg; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
364 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
365 | g_return_val_if_fail(cmd != NULL, NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
366 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
367 | msg = msn_message_new(MSN_MSG_UNKNOWN); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
368 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
369 | msg->remote_user = g_strdup(cmd->params[0]); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
370 | /* msg->size = atoi(cmd->params[2]); */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
371 | msg->cmd = cmd; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
372 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
373 | return msg; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
374 | } |
| 4542 | 375 | |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
376 | char * |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
377 | msn_message_gen_slp_body(MsnMessage *msg, size_t *ret_size) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
378 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
379 | MsnSlpHeader header; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
380 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
381 | char *tmp, *base; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
382 | const void *body; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
383 | size_t len, body_len; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
384 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
385 | g_return_val_if_fail(msg != NULL, NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
386 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
387 | len = MSN_BUF_LEN; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
388 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
389 | base = tmp = g_malloc(len + 1); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
390 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
391 | body = msn_message_get_bin_data(msg, &body_len); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
392 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
393 | header.session_id = GUINT32_TO_LE(msg->msnslp_header.session_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
394 | header.id = GUINT32_TO_LE(msg->msnslp_header.id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
395 | header.offset = GUINT64_TO_LE(msg->msnslp_header.offset); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
396 | header.total_size = GUINT64_TO_LE(msg->msnslp_header.total_size); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
397 | header.length = GUINT32_TO_LE(msg->msnslp_header.length); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
398 | header.flags = GUINT32_TO_LE(msg->msnslp_header.flags); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
399 | header.ack_id = GUINT32_TO_LE(msg->msnslp_header.ack_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
400 | header.ack_sub_id = GUINT32_TO_LE(msg->msnslp_header.ack_sub_id); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
401 | header.ack_size = GUINT64_TO_LE(msg->msnslp_header.ack_size); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
402 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
403 | memcpy(tmp, &header, 48); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
404 | tmp += 48; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
405 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
406 | if (body != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
407 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
408 | memcpy(tmp, body, body_len); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
409 | tmp += body_len; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
410 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
411 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
412 | if (ret_size != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
413 | *ret_size = tmp - base; |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
414 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
415 | return base; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
416 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
417 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
418 | char * |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
419 | msn_message_gen_payload(MsnMessage *msg, size_t *ret_size) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
420 | { |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
421 | GList *l; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
422 | char *n, *base, *end; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
423 | 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
|
424 | size_t body_len = 0; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
425 | const void *body; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
426 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
427 | g_return_val_if_fail(msg != NULL, NULL); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
428 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
429 | len = MSN_BUF_LEN; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
430 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
431 | base = n = end = g_malloc(len + 1); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
432 | end += len; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
433 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
434 | /* Standard header. */ |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
435 | if (msg->charset == NULL) |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
436 | { |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
437 | g_snprintf(n, len, |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
438 | "MIME-Version: 1.0\r\n" |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
439 | "Content-Type: %s\r\n", |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
440 | msg->content_type); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
441 | } |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
442 | else |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
443 | { |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
444 | g_snprintf(n, len, |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
445 | "MIME-Version: 1.0\r\n" |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
446 | "Content-Type: %s; charset=%s\r\n", |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
447 | msg->content_type, msg->charset); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
448 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
449 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
450 | n += strlen(n); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
451 | |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
452 | for (l = msg->attr_list; l != NULL; l = l->next) |
|
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
453 | { |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
454 | const char *key; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
455 | const char *value; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
456 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
457 | key = l->data; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
458 | value = msn_message_get_attr(msg, key); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
459 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
460 | 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
|
461 | n += strlen(n); |
|
5309
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 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
464 | n += g_strlcpy(n, "\r\n", end - n); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
465 | |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
466 | body = msn_message_get_bin_data(msg, &body_len); |
|
6827
df4411142ece
[gaim-migrate @ 7372]
Christian Hammond <chipx86@chipx86.com>
parents:
6826
diff
changeset
|
467 | |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
468 | if (msg->msnslp_message) |
|
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
469 | { |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
470 | MsnSlpHeader header; |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
471 | MsnSlpFooter footer; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
472 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
473 | header.session_id = GUINT32_TO_LE(msg->msnslp_header.session_id); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
474 | header.id = GUINT32_TO_LE(msg->msnslp_header.id); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
475 | header.offset = GUINT64_TO_LE(msg->msnslp_header.offset); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
476 | header.total_size = GUINT64_TO_LE(msg->msnslp_header.total_size); |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
477 | header.length = GUINT32_TO_LE(msg->msnslp_header.length); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
478 | header.flags = GUINT32_TO_LE(msg->msnslp_header.flags); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
479 | header.ack_id = GUINT32_TO_LE(msg->msnslp_header.ack_id); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
480 | header.ack_sub_id = GUINT32_TO_LE(msg->msnslp_header.ack_sub_id); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
481 | header.ack_size = GUINT64_TO_LE(msg->msnslp_header.ack_size); |
|
6868
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
482 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
483 | memcpy(n, &header, 48); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
484 | n += 48; |
|
6827
df4411142ece
[gaim-migrate @ 7372]
Christian Hammond <chipx86@chipx86.com>
parents:
6826
diff
changeset
|
485 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
486 | if (body != NULL) |
|
6868
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
487 | { |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
488 | memcpy(n, body, body_len); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
489 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
490 | n += body_len; |
|
6827
df4411142ece
[gaim-migrate @ 7372]
Christian Hammond <chipx86@chipx86.com>
parents:
6826
diff
changeset
|
491 | } |
|
df4411142ece
[gaim-migrate @ 7372]
Christian Hammond <chipx86@chipx86.com>
parents:
6826
diff
changeset
|
492 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
493 | footer.value = GUINT32_TO_BE(msg->msnslp_footer.value); |
|
6827
df4411142ece
[gaim-migrate @ 7372]
Christian Hammond <chipx86@chipx86.com>
parents:
6826
diff
changeset
|
494 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
495 | memcpy(n, &footer, 4); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
496 | n += 4; |
|
6701
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
497 | } |
|
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
498 | else |
|
7e2db9273748
[gaim-migrate @ 7227]
Christian Hammond <chipx86@chipx86.com>
parents:
6181
diff
changeset
|
499 | { |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
500 | if (body != NULL) |
|
8646
74d0e7406e3b
[gaim-migrate @ 9398]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8475
diff
changeset
|
501 | { |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
502 | memcpy(n, body, body_len); |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
503 | n += body_len; |
| 13890 | 504 | *n = '\0'; |
|
6800
8f99c220b503
[gaim-migrate @ 7340]
Christian Hammond <chipx86@chipx86.com>
parents:
6786
diff
changeset
|
505 | } |
|
5310
ac2ee6a1f846
[gaim-migrate @ 5682]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
506 | } |
|
ac2ee6a1f846
[gaim-migrate @ 5682]
Christian Hammond <chipx86@chipx86.com>
parents:
5309
diff
changeset
|
507 | |
|
6826
986589449e69
[gaim-migrate @ 7371]
Christian Hammond <chipx86@chipx86.com>
parents:
6800
diff
changeset
|
508 | if (ret_size != NULL) |
|
9092
34b9e78827f6
[gaim-migrate @ 9869]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8647
diff
changeset
|
509 | { |
|
10274
f329b1d7fd43
[gaim-migrate @ 11424]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
510 | *ret_size = n - base; |
|
f329b1d7fd43
[gaim-migrate @ 11424]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10225
diff
changeset
|
511 | |
|
9092
34b9e78827f6
[gaim-migrate @ 9869]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8647
diff
changeset
|
512 | if (*ret_size > 1664) |
|
34b9e78827f6
[gaim-migrate @ 9869]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8647
diff
changeset
|
513 | *ret_size = 1664; |
|
34b9e78827f6
[gaim-migrate @ 9869]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8647
diff
changeset
|
514 | } |
|
34b9e78827f6
[gaim-migrate @ 9869]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
8647
diff
changeset
|
515 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
516 | return base; |
| 4542 | 517 | } |
| 518 | ||
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
519 | void |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
520 | msn_message_set_flag(MsnMessage *msg, char flag) |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
521 | { |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
522 | g_return_if_fail(msg != NULL); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
523 | g_return_if_fail(flag != 0); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
524 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
525 | msg->flag = flag; |
|
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 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
528 | char |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
529 | msn_message_get_flag(const MsnMessage *msg) |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
530 | { |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
531 | g_return_val_if_fail(msg != NULL, 0); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
532 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
533 | return msg->flag; |
|
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 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
536 | void |
|
6868
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
537 | 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
|
538 | { |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
539 | g_return_if_fail(msg != NULL); |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
540 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
541 | /* 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
|
542 | if (len > 1664) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
543 | len = 1664; |
|
6868
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
544 | |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
545 | if (msg->body != NULL) |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
546 | g_free(msg->body); |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
547 | |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
548 | if (data != NULL && len > 0) |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
549 | { |
|
24608
9f21d921daaf
It should be more efficient to just use g_mallc() and then manually
Mark Doliner <markdoliner@pidgin.im>
parents:
24420
diff
changeset
|
550 | msg->body = g_malloc(len + 1); |
|
11235
7e1cd737137b
[gaim-migrate @ 13380]
Federico G. Schwindt <fgsch@lodoss.net>
parents:
11001
diff
changeset
|
551 | 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
|
552 | msg->body[len] = '\0'; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
553 | msg->body_len = len; |
|
6868
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
554 | } |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
555 | else |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
556 | { |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
557 | msg->body = NULL; |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
558 | msg->body_len = 0; |
|
6868
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
559 | } |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
560 | } |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
561 | |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
562 | const void * |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
563 | msn_message_get_bin_data(const MsnMessage *msg, size_t *len) |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
564 | { |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
565 | g_return_val_if_fail(msg != NULL, NULL); |
|
b9cc0730e11c
[gaim-migrate @ 7414]
Christian Hammond <chipx86@chipx86.com>
parents:
6842
diff
changeset
|
566 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
567 | if (len) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
568 | *len = msg->body_len; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
569 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
570 | return msg->body; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
571 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
572 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
573 | void |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
574 | msn_message_set_content_type(MsnMessage *msg, const char *type) |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
575 | { |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
576 | g_return_if_fail(msg != NULL); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
577 | |
|
21067
97a745428ab0
Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents:
21065
diff
changeset
|
578 | 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
|
579 | msg->content_type = g_strdup(type); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
580 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
581 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
582 | const char * |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
583 | msn_message_get_content_type(const MsnMessage *msg) |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
584 | { |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
585 | g_return_val_if_fail(msg != NULL, NULL); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
586 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
587 | return msg->content_type; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
588 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
589 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
590 | void |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
591 | msn_message_set_charset(MsnMessage *msg, const char *charset) |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
592 | { |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
593 | g_return_if_fail(msg != NULL); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
594 | |
|
21067
97a745428ab0
Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents:
21065
diff
changeset
|
595 | g_free(msg->charset); |
|
97a745428ab0
Cleanup some unnecessary NULL checks in g_strdup()/g_free().
Daniel Atallah <datallah@pidgin.im>
parents:
21065
diff
changeset
|
596 | msg->charset = g_strdup(charset); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
597 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
598 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
599 | const char * |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
600 | msn_message_get_charset(const MsnMessage *msg) |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
601 | { |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
602 | g_return_val_if_fail(msg != NULL, NULL); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
603 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
604 | return msg->charset; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
605 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
606 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
607 | void |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
608 | msn_message_set_attr(MsnMessage *msg, const char *attr, const char *value) |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
609 | { |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
610 | const char *temp; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
611 | char *new_attr; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
612 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
613 | g_return_if_fail(msg != NULL); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
614 | g_return_if_fail(attr != NULL); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
615 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
616 | temp = msn_message_get_attr(msg, attr); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
617 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
618 | if (value == NULL) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
619 | { |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
620 | if (temp != NULL) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
621 | { |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
622 | GList *l; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
623 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
624 | for (l = msg->attr_list; l != NULL; l = l->next) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
625 | { |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
626 | if (!g_ascii_strcasecmp(l->data, attr)) |
|
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
627 | { |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
628 | msg->attr_list = g_list_remove(msg->attr_list, l->data); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
629 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
630 | break; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
631 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
632 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
633 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
634 | g_hash_table_remove(msg->attr_table, attr); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
635 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
636 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
637 | return; |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
638 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
639 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
640 | new_attr = g_strdup(attr); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
641 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
642 | g_hash_table_insert(msg->attr_table, new_attr, g_strdup(value)); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
643 | |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
644 | if (temp == NULL) |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
645 | msg->attr_list = g_list_append(msg->attr_list, new_attr); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
646 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
647 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
648 | const char * |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
649 | msn_message_get_attr(const MsnMessage *msg, const char *attr) |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
650 | { |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
651 | g_return_val_if_fail(msg != NULL, NULL); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
652 | g_return_val_if_fail(attr != NULL, NULL); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
653 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
654 | return g_hash_table_lookup(msg->attr_table, attr); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
655 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
656 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
657 | GHashTable * |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
658 | msn_message_get_hashtable_from_body(const MsnMessage *msg) |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
659 | { |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
660 | GHashTable *table; |
|
10284
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10275
diff
changeset
|
661 | size_t body_len; |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
662 | const char *body; |
|
10284
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10275
diff
changeset
|
663 | char **elems, **cur, **tokens, *body_str; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
664 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
665 | g_return_val_if_fail(msg != NULL, NULL); |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
666 | |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
667 | 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
|
668 | |
|
10284
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10275
diff
changeset
|
669 | body = msn_message_get_bin_data(msg, &body_len); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
670 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
671 | g_return_val_if_fail(body != NULL, NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
672 | |
|
10284
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10275
diff
changeset
|
673 | body_str = g_strndup(body, body_len); |
|
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10275
diff
changeset
|
674 | elems = g_strsplit(body_str, "\r\n", 0); |
|
257978b5df5b
[gaim-migrate @ 11454]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
10275
diff
changeset
|
675 | g_free(body_str); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
676 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
677 | for (cur = elems; *cur != NULL; cur++) |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
678 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
679 | if (**cur == '\0') |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
680 | break; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
681 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
682 | tokens = g_strsplit(*cur, ": ", 2); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
683 | |
| 21010 | 684 | if (tokens[0] != NULL && tokens[1] != NULL) { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
685 | g_hash_table_insert(table, tokens[0], tokens[1]); |
| 21010 | 686 | g_free(tokens); |
| 687 | } else | |
| 688 | g_strfreev(tokens); | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
689 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
690 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
691 | g_strfreev(elems); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
692 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
693 | return table; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
694 | } |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
695 | |
|
10225
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
696 | char * |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
697 | msn_message_to_string(MsnMessage *msg) |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
698 | { |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
699 | size_t body_len; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
700 | const char *body; |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
701 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
702 | g_return_val_if_fail(msg != NULL, NULL); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
703 | 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
|
704 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
705 | body = msn_message_get_bin_data(msg, &body_len); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
706 | |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
707 | return g_strndup(body, body_len); |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
708 | } |
|
0dfea1bc8695
[gaim-migrate @ 11357]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10112
diff
changeset
|
709 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
710 | void |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
711 | msn_message_show_readable(MsnMessage *msg, const char *info, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
712 | gboolean text_body) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
713 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
714 | GString *str; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
715 | size_t body_len; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
716 | const char *body; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
717 | GList *l; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
718 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
719 | g_return_if_fail(msg != NULL); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
720 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
721 | str = g_string_new(NULL); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
722 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
723 | /* Standard header. */ |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
724 | if (msg->charset == NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
725 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
726 | g_string_append_printf(str, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
727 | "MIME-Version: 1.0\r\n" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
728 | "Content-Type: %s\r\n", |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
729 | msg->content_type); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
730 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
731 | else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
732 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
733 | g_string_append_printf(str, |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
734 | "MIME-Version: 1.0\r\n" |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
735 | "Content-Type: %s; charset=%s\r\n", |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
736 | msg->content_type, msg->charset); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
737 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
738 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
739 | for (l = msg->attr_list; l; l = l->next) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
740 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
741 | char *key; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
742 | const char *value; |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
743 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
744 | key = l->data; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
745 | value = msn_message_get_attr(msg, key); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
746 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
747 | 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
|
748 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
749 | |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
750 | g_string_append(str, "\r\n"); |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
751 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
752 | body = msn_message_get_bin_data(msg, &body_len); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
753 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
754 | if (msg->msnslp_message) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
755 | { |
|
10092
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
756 | g_string_append_printf(str, "Session ID: %u\r\n", msg->msnslp_header.session_id); |
|
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
757 | g_string_append_printf(str, "ID: %u\r\n", msg->msnslp_header.id); |
| 10112 | 758 | g_string_append_printf(str, "Offset: %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.offset); |
| 759 | g_string_append_printf(str, "Total size: %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.total_size); | |
|
10092
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
760 | g_string_append_printf(str, "Length: %u\r\n", msg->msnslp_header.length); |
|
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
761 | g_string_append_printf(str, "Flags: 0x%x\r\n", msg->msnslp_header.flags); |
|
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
762 | g_string_append_printf(str, "ACK ID: %u\r\n", msg->msnslp_header.ack_id); |
|
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
763 | g_string_append_printf(str, "SUB ID: %u\r\n", msg->msnslp_header.ack_sub_id); |
| 10112 | 764 | g_string_append_printf(str, "ACK Size: %" G_GUINT64_FORMAT "\r\n", msg->msnslp_header.ack_size); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
765 | |
|
10345
7d7f8cfa2b4f
[gaim-migrate @ 11556]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
10284
diff
changeset
|
766 | #ifdef MSN_DEBUG_SLP_VERBOSE |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
767 | if (body != NULL) |
|
9158
f8dab42adeaf
[gaim-migrate @ 9942]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9092
diff
changeset
|
768 | { |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
769 | if (text_body) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
770 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
771 | g_string_append_len(str, body, body_len); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
772 | if (body[body_len - 1] == '\0') |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
773 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
774 | str->len--; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
775 | g_string_append(str, " 0x00"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
776 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
777 | g_string_append(str, "\r\n"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
778 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
779 | else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
780 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
781 | int i; |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
782 | for (i = 0; i < msg->body_len; i++) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
783 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
784 | g_string_append_printf(str, "%.2hhX ", body[i]); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
785 | if ((i % 16) == 15) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
786 | g_string_append(str, "\r\n"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
787 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
788 | g_string_append(str, "\r\n"); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
789 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
790 | } |
|
10092
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
791 | #endif |
|
9198
e8eb6d5eb9eb
[gaim-migrate @ 9993]
Christian Hammond <chipx86@chipx86.com>
parents:
9193
diff
changeset
|
792 | |
|
10092
48f870a068a1
[gaim-migrate @ 11109]
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
9198
diff
changeset
|
793 | g_string_append_printf(str, "Footer: %u\r\n", msg->msnslp_footer.value); |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
794 | } |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
795 | else |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
796 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
797 | if (body != NULL) |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
798 | { |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
799 | g_string_append_len(str, body, body_len); |
|
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
800 | g_string_append(str, "\r\n"); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
801 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
802 | } |
|
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
803 | |
| 15884 | 804 | 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
|
805 | |
|
9193
6e76f1367896
[gaim-migrate @ 9988]
Felipe Contreras <felipe.contreras@gmail.com>
parents:
9158
diff
changeset
|
806 | g_string_free(str, TRUE); |
|
5309
3178acad1449
[gaim-migrate @ 5681]
Christian Hammond <chipx86@chipx86.com>
parents:
5221
diff
changeset
|
807 | } |
|
25943
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
808 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
809 | /************************************************************************** |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
810 | * Message Handlers |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
811 | **************************************************************************/ |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
812 | void |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
813 | msn_plain_msg(MsnCmdProc *cmdproc, MsnMessage *msg) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
814 | { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
815 | PurpleConnection *gc; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
816 | const char *body; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
817 | char *body_str; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
818 | char *body_enc; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
819 | char *body_final; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
820 | size_t body_len; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
821 | const char *passport; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
822 | const char *value; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
823 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
824 | gc = cmdproc->session->account->gc; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
825 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
826 | body = msn_message_get_bin_data(msg, &body_len); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
827 | body_str = g_strndup(body, body_len); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
828 | body_enc = g_markup_escape_text(body_str, -1); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
829 | g_free(body_str); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
830 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
831 | passport = msg->remote_user; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
832 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
833 | if (!strcmp(passport, "messenger@microsoft.com") && |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
834 | strstr(body, "immediate security update")) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
835 | { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
836 | return; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
837 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
838 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
839 | #if 0 |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
840 | if ((value = msn_message_get_attr(msg, "User-Agent")) != NULL) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
841 | { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
842 | purple_debug_misc("msn", "User-Agent = '%s'\n", value); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
843 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
844 | #endif |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
845 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
846 | if ((value = msn_message_get_attr(msg, "X-MMS-IM-Format")) != NULL) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
847 | { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
848 | char *pre, *post; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
849 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
850 | msn_parse_format(value, &pre, &post); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
851 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
852 | body_final = g_strdup_printf("%s%s%s", pre ? pre : "", |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
853 | body_enc ? body_enc : "", post ? post : ""); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
854 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
855 | g_free(pre); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
856 | g_free(post); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
857 | g_free(body_enc); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
858 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
859 | else |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
860 | { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
861 | body_final = body_enc; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
862 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
863 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
864 | if (cmdproc->servconn->type == MSN_SERVCONN_SB) { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
865 | MsnSwitchBoard *swboard = cmdproc->data; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
866 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
867 | swboard->flag |= MSN_SB_FLAG_IM; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
868 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
869 | if (swboard->current_users > 1 || |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
870 | ((swboard->conv != NULL) && |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
871 | purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
872 | { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
873 | /* If current_users is always ok as it should then there is no need to |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
874 | * check if this is a chat. */ |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
875 | if (swboard->current_users <= 1) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
876 | purple_debug_misc("msn", "plain_msg: current_users(%d)\n", |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
877 | swboard->current_users); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
878 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
879 | serv_got_chat_in(gc, swboard->chat_id, passport, 0, body_final, |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
880 | time(NULL)); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
881 | if (swboard->conv == NULL) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
882 | { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
883 | swboard->conv = purple_find_chat(gc, swboard->chat_id); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
884 | swboard->flag |= MSN_SB_FLAG_IM; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
885 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
886 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
887 | else |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
888 | { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
889 | serv_got_im(gc, passport, body_final, 0, time(NULL)); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
890 | if (swboard->conv == NULL) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
891 | { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
892 | swboard->conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
893 | passport, purple_connection_get_account(gc)); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
894 | swboard->flag |= MSN_SB_FLAG_IM; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
895 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
896 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
897 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
898 | } else { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
899 | serv_got_im(gc, passport, body_final, 0, time(NULL)); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
900 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
901 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
902 | g_free(body_final); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
903 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
904 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
905 | void |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
906 | msn_control_msg(MsnCmdProc *cmdproc, MsnMessage *msg) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
907 | { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
908 | PurpleConnection *gc; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
909 | char *passport; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
910 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
911 | gc = cmdproc->session->account->gc; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
912 | passport = msg->remote_user; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
913 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
914 | if (msn_message_get_attr(msg, "TypingUser") == NULL) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
915 | return; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
916 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
917 | if (cmdproc->servconn->type == MSN_SERVCONN_SB) { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
918 | MsnSwitchBoard *swboard = cmdproc->data; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
919 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
920 | if (swboard->current_users == 1) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
921 | { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
922 | serv_got_typing(gc, passport, MSN_TYPING_RECV_TIMEOUT, |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
923 | PURPLE_TYPING); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
924 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
925 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
926 | } else { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
927 | serv_got_typing(gc, passport, MSN_TYPING_RECV_TIMEOUT, |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
928 | PURPLE_TYPING); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
929 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
930 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
931 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
932 | void |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
933 | msn_datacast_msg(MsnCmdProc *cmdproc, MsnMessage *msg) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
934 | { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
935 | GHashTable *body; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
936 | const char *id; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
937 | body = msn_message_get_hashtable_from_body(msg); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
938 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
939 | id = g_hash_table_lookup(body, "ID"); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
940 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
941 | if (!strcmp(id, "1")) { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
942 | /* Nudge */ |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
943 | PurpleAccount *account; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
944 | const char *user; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
945 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
946 | account = cmdproc->session->account; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
947 | user = msg->remote_user; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
948 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
949 | if (cmdproc->servconn->type == MSN_SERVCONN_SB) { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
950 | MsnSwitchBoard *swboard = cmdproc->data; |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
951 | if (swboard->current_users > 1 || |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
952 | ((swboard->conv != NULL) && |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
953 | purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
954 | purple_prpl_got_attention_in_chat(account->gc, swboard->chat_id, user, MSN_NUDGE); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
955 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
956 | else |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
957 | purple_prpl_got_attention(account->gc, user, MSN_NUDGE); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
958 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
959 | purple_conversation_attention(swboard->conv, user, MSN_NUDGE, |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
960 | PURPLE_MESSAGE_SEND, time(NULL)); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
961 | } else { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
962 | purple_prpl_got_attention(account->gc, user, MSN_NUDGE); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
963 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
964 | } else if (!strcmp(id, "2")) { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
965 | /* Wink */ |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
966 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
967 | } else if (!strcmp(id, "3")) { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
968 | /* Voiceclip */ |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
969 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
970 | } else if (!strcmp(id, "4")) { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
971 | /* Action */ |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
972 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
973 | } else { |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
974 | purple_debug_warning("msn", "Got unknown datacast with ID %s.\n", id); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
975 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
976 | |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
977 | g_hash_table_destroy(body); |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
978 | } |
|
e73a4ae5ff23
A little manual merge...
Marcus Lundblad <malu@pidgin.im>
parents:
25417
diff
changeset
|
979 |