Mercurial > pidgin
annotate libpurple/protocols/myspace/message.c @ 24592:104f6f755c7e
Make our purple_util_fetch_url_request() function able to handle
fetching stuff from https urls. This is needed by yahoo's
webmessenger style login, if we want to try enable it again.
And it will be needed by the new oscar authentication.
I wrote this maybe a year ago and we've been using it at Meebo
with no problems, but it would be great if one person could look
through these changes.
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 06 Dec 2008 01:08:20 +0000 |
| parents | f10aba5592c6 |
| children | 0e8d91cdd63a |
| rev | line source |
|---|---|
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
1 /** MySpaceIM protocol messages |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
2 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
3 * \author Jeff Connelly |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
4 * |
|
17680
d87916bd1d73
Fix email address.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17661
diff
changeset
|
5 * Copyright (C) 2007, Jeff Connelly <jeff2@soc.pidgin.im> |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
6 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
7 * This program is free software; you can redistribute it and/or modify |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
8 * it under the terms of the GNU General Public License as published by |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
9 * the Free Software Foundation; either version 2 of the License, or |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
10 * (at your option) any later version. |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
11 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
12 * This program is distributed in the hope that it will be useful, |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
15 * GNU General Public License for more details. |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
16 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
17 * You should have received a copy of the GNU General Public License |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
18 * along with this program; if not, write to the Free Software |
|
19681
44b4e8bd759b
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19431
diff
changeset
|
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
20 */ |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
21 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
22 #include "myspace.h" |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
23 #include "message.h" |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
24 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
25 static void msim_msg_free_element(gpointer data, gpointer user_data); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
26 static void msim_msg_debug_string_element(gpointer data, gpointer user_data); |
|
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17318
diff
changeset
|
27 static gchar *msim_msg_pack_using(MsimMessage *msg, GFunc gf, const gchar *sep, const gchar *begin, const gchar *end); |
|
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17318
diff
changeset
|
28 static GList *msim_msg_get_node(MsimMessage *msg, const gchar *name); |
|
18897
d0be4366e876
Change msim_msg_new() and msim_msg_new_v() to accept the first key name as
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18895
diff
changeset
|
29 static MsimMessage *msim_msg_new_v(gchar *first_key, va_list argp); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
30 |
|
18889
a3a5b2e9079a
Change escape code replacement text parallel arrays to an array of structs,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18882
diff
changeset
|
31 /* Escape codes and associated replacement text, used for protocol message |
|
a3a5b2e9079a
Change escape code replacement text parallel arrays to an array of structs,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18882
diff
changeset
|
32 * escaping and unescaping. */ |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
33 static struct MSIM_ESCAPE_REPLACEMENT { |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
34 gchar *code; |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
35 gchar text; |
|
18889
a3a5b2e9079a
Change escape code replacement text parallel arrays to an array of structs,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18882
diff
changeset
|
36 } msim_escape_replacements[] = { |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
37 { "/1", '/' }, |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
38 { "/2", '\\' }, |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
39 /* { "/3", "|" }, */ /* Not used here -- only for within arrays */ |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
40 { NULL, 0 } |
|
18889
a3a5b2e9079a
Change escape code replacement text parallel arrays to an array of structs,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18882
diff
changeset
|
41 }; |
|
17968
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
42 |
|
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
43 /** |
|
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
44 * Escape a protocol message. |
|
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
45 * |
|
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
46 * @return The escaped message. Caller must g_free(). |
|
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
47 */ |
|
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
48 gchar * |
|
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
49 msim_escape(const gchar *msg) |
|
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
50 { |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
51 GString *gs; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
52 guint i, j; |
|
22269
0e68dab2a362
Patch from oliver:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
20336
diff
changeset
|
53 guint msg_len; |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
54 |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
55 gs = g_string_new(""); |
|
22269
0e68dab2a362
Patch from oliver:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
20336
diff
changeset
|
56 msg_len = strlen(msg); |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
57 |
|
22269
0e68dab2a362
Patch from oliver:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
20336
diff
changeset
|
58 for (i = 0; i < msg_len; ++i) { |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
59 struct MSIM_ESCAPE_REPLACEMENT *replacement; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
60 gchar *replace; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
61 |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
62 replace = NULL; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
63 |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
64 /* Check for characters that need to be escaped, and escape them. */ |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
65 for (j = 0; (replacement = &msim_escape_replacements[j]) && |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
66 replacement->code != NULL; ++j) { |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
67 if (msg[i] == replacement->text) { |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
68 replace = replacement->code; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
69 break; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
70 } |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
71 } |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
72 |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
73 if (replace) { |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
74 g_string_append(gs, replace); |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
75 } else { |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
76 g_string_append_c(gs, msg[i]); |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
77 } |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
78 } |
|
18911
692b128fe74a
Conditionally-compile out debugging statements of escaping.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18909
diff
changeset
|
79 |
|
692b128fe74a
Conditionally-compile out debugging statements of escaping.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18909
diff
changeset
|
80 #ifdef MSIM_DEBUG_ESCAPE |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
81 purple_debug_info("msim", "msim_escape: msg=%s, ret=%s\n", msg, gs->str); |
|
18911
692b128fe74a
Conditionally-compile out debugging statements of escaping.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18909
diff
changeset
|
82 #endif |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
83 |
|
20243
5440eed4ec7e
applied changes from efedefa70ee1d6f7f4dd39afe5db10c7e5bfe64c
Richard Laager <rlaager@wiktel.com>
parents:
19681
diff
changeset
|
84 return g_string_free(gs, FALSE); |
|
17968
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
85 } |
|
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
86 |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
87 /** |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
88 * Unescape a protocol message. |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
89 * |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
90 * @return The unescaped message, caller must g_free(). |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
91 */ |
|
17968
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
92 gchar * |
|
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
93 msim_unescape(const gchar *msg) |
|
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
94 { |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
95 GString *gs; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
96 guint i, j; |
|
22269
0e68dab2a362
Patch from oliver:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
20336
diff
changeset
|
97 guint msg_len; |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
98 |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
99 gs = g_string_new(""); |
|
22269
0e68dab2a362
Patch from oliver:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
20336
diff
changeset
|
100 msg_len = strlen(msg); |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
101 |
|
22269
0e68dab2a362
Patch from oliver:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
20336
diff
changeset
|
102 for (i = 0; i < msg_len; ++i) { |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
103 struct MSIM_ESCAPE_REPLACEMENT *replacement; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
104 gchar replace; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
105 |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
106 replace = msg[i]; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
107 |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
108 for (j = 0; (replacement = &msim_escape_replacements[j]) && |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
109 replacement->code != NULL; ++j) { |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
110 if (msg[i] == replacement->code[0] && |
|
22269
0e68dab2a362
Patch from oliver:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
20336
diff
changeset
|
111 i + 1 < msg_len && |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
112 msg[i + 1] == replacement->code[1]) { |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
113 replace = replacement->text; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
114 ++i; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
115 break; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
116 } |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
117 } |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
118 |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
119 g_string_append_c(gs, replace); |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
120 } |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
121 |
|
18911
692b128fe74a
Conditionally-compile out debugging statements of escaping.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18909
diff
changeset
|
122 #ifdef MSIM_DEBUG_ESCAPE |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
123 purple_debug_info("msim", "msim_unescape: msg=%s, ret=%s\n", msg, gs->str); |
|
18911
692b128fe74a
Conditionally-compile out debugging statements of escaping.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18909
diff
changeset
|
124 #endif |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
125 |
|
20243
5440eed4ec7e
applied changes from efedefa70ee1d6f7f4dd39afe5db10c7e5bfe64c
Richard Laager <rlaager@wiktel.com>
parents:
19681
diff
changeset
|
126 return g_string_free(gs, FALSE); |
|
17968
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
127 } |
|
a2298513db8b
Move msim_escape() and msim_unescape() to message.c.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17964
diff
changeset
|
128 |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
129 /** Create a new MsimMessage. |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
130 * |
|
18897
d0be4366e876
Change msim_msg_new() and msim_msg_new_v() to accept the first key name as
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18895
diff
changeset
|
131 * @param first_key The first key in the sequence, or NULL for an empty message. |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
132 * @param ... A sequence of gchar* key/type/value triplets, terminated with NULL. |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
133 * |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
134 * See msim_msg_append() documentation for details on types. |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
135 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
136 MsimMessage * |
|
18897
d0be4366e876
Change msim_msg_new() and msim_msg_new_v() to accept the first key name as
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18895
diff
changeset
|
137 msim_msg_new(gchar *first_key, ...) |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
138 { |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
139 va_list argp; |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
140 |
|
18897
d0be4366e876
Change msim_msg_new() and msim_msg_new_v() to accept the first key name as
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18895
diff
changeset
|
141 if (first_key) { |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
142 va_start(argp, first_key); |
|
18897
d0be4366e876
Change msim_msg_new() and msim_msg_new_v() to accept the first key name as
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18895
diff
changeset
|
143 return msim_msg_new_v(first_key, argp); |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
144 } else { |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
145 return NULL; |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
146 } |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
147 } |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
148 |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
149 /** Create a new message from va_list and its first argument. |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
150 * |
|
18897
d0be4366e876
Change msim_msg_new() and msim_msg_new_v() to accept the first key name as
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18895
diff
changeset
|
151 * @param first_key The first argument (a key), or NULL to take all arguments |
|
d0be4366e876
Change msim_msg_new() and msim_msg_new_v() to accept the first key name as
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18895
diff
changeset
|
152 * from argp. |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
153 * @param argp A va_list of variadic arguments, already started with va_start(). Will be va_end()'d. |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
154 * @return New MsimMessage *, must be freed with msim_msg_free(). |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
155 * |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
156 * For internal use - users probably want msim_msg_new() or msim_send(). |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
157 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
158 static MsimMessage * |
|
18897
d0be4366e876
Change msim_msg_new() and msim_msg_new_v() to accept the first key name as
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18895
diff
changeset
|
159 msim_msg_new_v(gchar *first_key, va_list argp) |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
160 { |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
161 gchar *key, *value; |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
162 MsimMessageType type; |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
163 MsimMessage *msg; |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
164 gboolean first; |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
165 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
166 GString *gs; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
167 GList *gl; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
168 MsimMessage *dict; |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
169 |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
170 /* Begin with an empty message. */ |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
171 msg = NULL; |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
172 |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
173 /* First parameter can be given explicitly. */ |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
174 first = first_key != NULL; |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
175 |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
176 /* Read key, type, value triplets until NULL. */ |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
177 do { |
|
19252
cfbd89a98431
Remove msim_parse_body(), obsoleted by msim_msg_get_dictionary().
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19248
diff
changeset
|
178 if (first) { |
|
18905
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
179 key = first_key; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
180 first = FALSE; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
181 } else { |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
182 key = va_arg(argp, gchar *); |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
183 if (!key) { |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
184 break; |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
185 } |
|
3f95e691bad2
Rewrite escaping so that it is more correct, in order to fix #2521. Test it.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18897
diff
changeset
|
186 } |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
187 |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
188 type = va_arg(argp, int); |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
189 |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
190 /* Interpret variadic arguments. */ |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
191 switch (type) { |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
192 case MSIM_TYPE_INTEGER: |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
193 case MSIM_TYPE_BOOLEAN: |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
194 msg = msim_msg_append(msg, key, type, GUINT_TO_POINTER(va_arg(argp, int))); |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
195 break; |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
196 |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
197 case MSIM_TYPE_STRING: |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
198 value = va_arg(argp, char *); |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
199 |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
200 g_return_val_if_fail(value != NULL, FALSE); |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
201 |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
202 msg = msim_msg_append(msg, key, type, value); |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
203 break; |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
204 |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
205 case MSIM_TYPE_BINARY: |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
206 gs = va_arg(argp, GString *); |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
207 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
208 g_return_val_if_fail(gs != NULL, FALSE); |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
209 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
210 /* msim_msg_free() will free this GString the caller created. */ |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
211 msg = msim_msg_append(msg, key, type, gs); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
212 break; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
213 |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
214 case MSIM_TYPE_LIST: |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
215 gl = va_arg(argp, GList *); |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
216 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
217 g_return_val_if_fail(gl != NULL, FALSE); |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
218 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
219 msg = msim_msg_append(msg, key, type, gl); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
220 break; |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
221 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
222 case MSIM_TYPE_DICTIONARY: |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
223 dict = va_arg(argp, MsimMessage *); |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
224 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
225 g_return_val_if_fail(dict != NULL, FALSE); |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
226 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
227 msg = msim_msg_append(msg, key, type, dict); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
228 break; |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
229 |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
230 default: |
|
17694
231b87b76da4
In debug messages, don't output unknown elem->type fields as %c too (only as
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17692
diff
changeset
|
231 purple_debug_info("msim", "msim_send: unknown type %d\n", type); |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
232 break; |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
233 } |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
234 } while(key); |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
235 va_end(argp); |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
236 |
|
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
237 return msg; |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
238 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
239 |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
240 /** Perform a deep copy on a GList * of gchar * strings. Free with msim_msg_list_free(). */ |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
241 GList * |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
242 msim_msg_list_copy(GList *old) |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
243 { |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
244 GList *new_list; |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
245 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
246 new_list = NULL; |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
247 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
248 /* Deep copy (g_list_copy is shallow). Copy each string. */ |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
249 for (; old != NULL; old = g_list_next(old)) { |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
250 new_list = g_list_append(new_list, g_strdup(old->data)); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
251 } |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
252 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
253 return new_list; |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
254 } |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
255 |
|
19431
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
256 /** Free a GList * of MsimMessageElement *'s. */ |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
257 void |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
258 msim_msg_list_free(GList *l) |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
259 { |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
260 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
261 for (; l != NULL; l = g_list_next(l)) { |
|
19431
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
262 MsimMessageElement *elem; |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
263 |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
264 elem = (MsimMessageElement *)l->data; |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
265 |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
266 /* Note that name is almost never dynamically allocated elsewhere; |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
267 * it is usually a static string, but not in lists. So cast it. */ |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
268 g_free((gchar *)elem->name); |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
269 g_free(elem->data); |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
270 g_free(elem); |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
271 } |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
272 g_list_free(l); |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
273 } |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
274 |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
275 /** Parse a |-separated string into a new GList. Free with msim_msg_list_free(). */ |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
276 GList * |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
277 msim_msg_list_parse(const gchar *raw) |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
278 { |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
279 gchar **array; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
280 GList *list; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
281 guint i; |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
282 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
283 array = g_strsplit(raw, "|", 0); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
284 list = NULL; |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
285 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
286 /* TODO: escape/unescape /3 <-> | within list elements */ |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
287 |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
288 for (i = 0; array[i] != NULL; ++i) { |
|
19431
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
289 MsimMessageElement *elem; |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
290 |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
291 /* Freed in msim_msg_list_free() */ |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
292 elem = g_new0(MsimMessageElement, 1); |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
293 |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
294 /* Give the element a name for debugging purposes. |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
295 * Not supposed to be looked up by this name; instead, |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
296 * lookup the elements by indexing the array. */ |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
297 elem->name = g_strdup_printf("(list item #%d)", i); |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
298 elem->type = MSIM_TYPE_RAW; |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
299 elem->data = g_strdup(array[i]); |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
300 |
|
3b7539c7402e
Now that MsimMessageElement's are more accessible outside message.c,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19256
diff
changeset
|
301 list = g_list_append(list, elem); |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
302 } |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
303 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
304 g_strfreev(array); |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
305 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
306 return list; |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
307 } |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
308 |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
309 /** Clone an individual element. |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
310 * |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
311 * @param data MsimMessageElement * to clone. |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
312 * @param user_data Pointer to MsimMessage * to add cloned element to. |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
313 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
314 static void |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
315 msim_msg_clone_element(gpointer data, gpointer user_data) |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
316 { |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
317 MsimMessageElement *elem; |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
318 MsimMessage **new; |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
319 gpointer new_data; |
|
20336
b93e7be3847b
applied changes from 9d35dde0c779cca73548172223ba557f27d61882
Luke Schierer <lschiere@pidgin.im>
parents:
20243
diff
changeset
|
320 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
321 GString *gs; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
322 MsimMessage *dict; |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
323 |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
324 elem = (MsimMessageElement *)data; |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
325 new = (MsimMessage **)user_data; |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
326 |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
327 switch (elem->type) { |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
328 case MSIM_TYPE_BOOLEAN: |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
329 case MSIM_TYPE_INTEGER: |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
330 new_data = elem->data; |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
331 break; |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
332 |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
333 case MSIM_TYPE_RAW: |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
334 case MSIM_TYPE_STRING: |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
335 new_data = g_strdup((gchar *)elem->data); |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
336 break; |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
337 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
338 case MSIM_TYPE_LIST: |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
339 new_data = (gpointer)msim_msg_list_copy((GList *)(elem->data)); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
340 break; |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
341 |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
342 case MSIM_TYPE_BINARY: |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
343 gs = (GString *)elem->data; |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
344 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
345 new_data = g_string_new_len(gs->str, gs->len); |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
346 break; |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
347 case MSIM_TYPE_DICTIONARY: |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
348 dict = (MsimMessage *)elem->data; |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
349 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
350 new_data = msim_msg_clone(dict); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
351 break; |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
352 |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
353 default: |
|
17694
231b87b76da4
In debug messages, don't output unknown elem->type fields as %c too (only as
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17692
diff
changeset
|
354 purple_debug_info("msim", "msim_msg_clone_element: unknown type %d\n", elem->type); |
|
20336
b93e7be3847b
applied changes from 9d35dde0c779cca73548172223ba557f27d61882
Luke Schierer <lschiere@pidgin.im>
parents:
20243
diff
changeset
|
355 g_return_if_reached(); |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
356 } |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
357 |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
358 /* Append cloned data. Note that the 'name' field is a static string, so it |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
359 * never needs to be copied nor freed. */ |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
360 *new = msim_msg_append(*new, elem->name, elem->type, new_data); |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
361 } |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
362 |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
363 /** Clone an existing MsimMessage. |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
364 * |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
365 * @return Cloned message; caller should free with msim_msg_free(). |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
366 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
367 MsimMessage * |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
368 msim_msg_clone(MsimMessage *old) |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
369 { |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
370 MsimMessage *new; |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
371 |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
372 if (old == NULL) { |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
373 return NULL; |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
374 } |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
375 |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
376 new = msim_msg_new(FALSE); |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
377 |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
378 g_list_foreach(old, msim_msg_clone_element, &new); |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
379 |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
380 return new; |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
381 } |
|
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
382 |
|
18880
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
383 /** Free the data of a message element. |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
384 * |
|
18880
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
385 * @param elem The MsimMessageElement * |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
386 * |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
387 * Note this only frees the element data; you may also want to free the |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
388 * element itself with g_free() (see msim_msg_free_element()). |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
389 */ |
|
18880
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
390 void |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
391 msim_msg_free_element_data(MsimMessageElement *elem) |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
392 { |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
393 switch (elem->type) { |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
394 case MSIM_TYPE_BOOLEAN: |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
395 case MSIM_TYPE_INTEGER: |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
396 /* Integer value stored in gpointer - no need to free(). */ |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
397 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
398 |
|
17291
d8903e1320a9
Previously, the return value of the processing function and msim_process() told
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17285
diff
changeset
|
399 case MSIM_TYPE_RAW: |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
400 case MSIM_TYPE_STRING: |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
401 /* Always free strings - caller should have g_strdup()'d if |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
402 * string was static or temporary and not to be freed. */ |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
403 g_free(elem->data); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
404 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
405 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
406 case MSIM_TYPE_BINARY: |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
407 /* Free the GString itself and the binary data. */ |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
408 g_string_free((GString *)elem->data, TRUE); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
409 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
410 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
411 case MSIM_TYPE_DICTIONARY: |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
412 msim_msg_free((MsimMessage *)elem->data); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
413 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
414 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
415 case MSIM_TYPE_LIST: |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
416 g_list_free((GList *)elem->data); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
417 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
418 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
419 default: |
|
18880
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
420 purple_debug_info("msim", "msim_msg_free_element_data: " |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
421 "not freeing unknown type %d\n", elem->type); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
422 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
423 } |
|
18880
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
424 } |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
425 |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
426 /** Free an individual message element. |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
427 * |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
428 * @param data MsimMessageElement * to free. |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
429 * @param user_data Not used; required to match g_list_foreach() callback prototype. |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
430 * |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
431 * Frees both the element data and the element itself. |
|
22334
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
432 * Also frees the name if dynamic_name is TRUE. |
|
18880
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
433 */ |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
434 static void |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
435 msim_msg_free_element(gpointer data, gpointer user_data) |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
436 { |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
437 MsimMessageElement *elem; |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
438 |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
439 elem = (MsimMessageElement *)data; |
|
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
440 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
441 msim_msg_free_element_data(elem); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
442 |
|
22334
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
443 if (elem->dynamic_name) |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
444 /* Need to cast to remove const-ness, because |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
445 * elem->name is almost always a constant, static |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
446 * string, but not in this case. */ |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
447 g_free((gchar *)elem->name); |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
448 |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
449 g_free(elem); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
450 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
451 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
452 /** Free a complete message. */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
453 void |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
454 msim_msg_free(MsimMessage *msg) |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
455 { |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
456 if (!msg) { |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
457 /* already free as can be */ |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
458 return; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
459 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
460 |
|
18909
c32fcdef2809
Only say we are connected after the MsimSession structure is fully setup.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18908
diff
changeset
|
461 #ifdef MSIM_MSG_DEBUG_FREE |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
462 msim_msg_dump("msim_msg_free: freeing %s", msg); |
|
18909
c32fcdef2809
Only say we are connected after the MsimSession structure is fully setup.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18908
diff
changeset
|
463 #endif |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
464 |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
465 g_list_foreach(msg, msim_msg_free_element, NULL); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
466 g_list_free(msg); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
467 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
468 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
469 /** Send an existing MsimMessage. */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
470 gboolean |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
471 msim_msg_send(MsimSession *session, MsimMessage *msg) |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
472 { |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
473 gchar *raw; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
474 gboolean success; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
475 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
476 raw = msim_msg_pack(msg); |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
477 g_return_val_if_fail(raw != NULL, FALSE); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
478 success = msim_send_raw(session, raw); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
479 g_free(raw); |
|
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17302
diff
changeset
|
480 |
|
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17302
diff
changeset
|
481 msim_msg_dump("msim_msg_send()ing %s\n", msg); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
482 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
483 return success; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
484 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
485 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
486 /** |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
487 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
488 * Send a message to the server, whose contents is specified using |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
489 * variable arguments. |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
490 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
491 * @param session |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
492 * @param ... A sequence of gchar* key/type/value triplets, terminated with NULL. |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
493 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
494 * This function exists for coding convenience: it allows a message to be created |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
495 * and sent in one line of code. Internally it calls msim_msg_send(). |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
496 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
497 * IMPORTANT: See msim_msg_append() documentation for details on element types. |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
498 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
499 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
500 gboolean |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
501 msim_send(MsimSession *session, ...) |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
502 { |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
503 gboolean success; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
504 MsimMessage *msg; |
|
17302
d69bcd74c240
Enhance msim_msg_new() to accept a variadic arguments, like msim_send(),
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17301
diff
changeset
|
505 va_list argp; |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
506 |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
507 va_start(argp, session); |
|
18897
d0be4366e876
Change msim_msg_new() and msim_msg_new_v() to accept the first key name as
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18895
diff
changeset
|
508 msg = msim_msg_new_v(NULL, argp); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
509 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
510 /* Actually send the message. */ |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
511 success = msim_msg_send(session, msg); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
512 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
513 /* Cleanup. */ |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
514 msim_msg_free(msg); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
515 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
516 return success; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
517 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
518 |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
519 /** Create a new MsimMessageElement * - must be g_free()'d. |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
520 * |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
521 * For internal use; users probably want msim_msg_append() or msim_msg_insert_before(). |
|
22334
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
522 * |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
523 * @param dynamic_name Whether 'name' should be freed when the message is destroyed. |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
524 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
525 static MsimMessageElement * |
|
22334
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
526 msim_msg_element_new(const gchar *name, MsimMessageType type, gpointer data, gboolean dynamic_name) |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
527 { |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
528 MsimMessageElement *elem; |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
529 |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
530 elem = g_new0(MsimMessageElement, 1); |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
531 |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
532 elem->name = name; |
|
22334
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
533 elem->dynamic_name = dynamic_name; |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
534 elem->type = type; |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
535 elem->data = data; |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
536 |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
537 return elem; |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
538 } |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
539 |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
540 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
541 /** Append a new element to a message. |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
542 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
543 * @param name Textual name of element (static string, neither copied nor freed). |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
544 * @param type An MSIM_TYPE_* code. |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
545 * @param data Pointer to data, see below. |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
546 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
547 * @return The new message - must be assigned to as with GList*. For example: |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
548 * |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
549 * msg = msim_msg_append(msg, ...) |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
550 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
551 * The data parameter depends on the type given: |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
552 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
553 * * MSIM_TYPE_INTEGER: Use GUINT_TO_POINTER(x). |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
554 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
555 * * MSIM_TYPE_BINARY: Same as integer, non-zero is TRUE and zero is FALSE. |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
556 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
557 * * MSIM_TYPE_STRING: gchar *. The data WILL BE FREED - use g_strdup() if needed. |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
558 * |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
559 * * MSIM_TYPE_RAW: gchar *. The data WILL BE FREED - use g_strdup() if needed. |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
560 * |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
561 * * MSIM_TYPE_BINARY: g_string_new_len(data, length). The data AND GString will be freed. |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
562 * |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
563 * * MSIM_TYPE_DICTIONARY: An MsimMessage *. Freed when message is destroyed. |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
564 * |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
565 * * MSIM_TYPE_LIST: GList * of gchar *. Again, everything will be freed. |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
566 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
567 * */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
568 MsimMessage * |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
569 msim_msg_append(MsimMessage *msg, const gchar *name, |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
570 MsimMessageType type, gpointer data) |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
571 { |
|
22334
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
572 return g_list_append(msg, msim_msg_element_new(name, type, data, FALSE)); |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
573 } |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
574 |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
575 /** Append a new element, but with a dynamically-allocated name. |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
576 * Exactly the same as msim_msg_append(), except 'name' will be freed when |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
577 * the message is destroyed. Normally, it isn't, because a static string is given. |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
578 */ |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
579 static MsimMessage * |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
580 msim_msg_append_dynamic_name(MsimMessage *msg, gchar *name, |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
581 MsimMessageType type, gpointer data) |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
582 { |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
583 return g_list_append(msg, msim_msg_element_new(name, type, data, TRUE)); |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
584 } |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
585 |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
586 /** Insert a new element into a message, before the given element name. |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
587 * |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
588 * @param name_before Name of the element to insert the new element before. If |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
589 * could not be found or NULL, new element will be inserted at end. |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
590 * |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
591 * See msim_msg_append() for usage of other parameters, and an important note about return value. |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
592 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
593 MsimMessage * |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
594 msim_msg_insert_before(MsimMessage *msg, const gchar *name_before, |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
595 const gchar *name, MsimMessageType type, gpointer data) |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
596 { |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
597 MsimMessageElement *new_elem; |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
598 GList *node_before; |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
599 |
|
22334
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
600 new_elem = msim_msg_element_new(name, type, data, FALSE); |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
601 |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
602 node_before = msim_msg_get_node(msg, name_before); |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
603 |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
604 return g_list_insert_before(msg, node_before, new_elem); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
605 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
606 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
607 /** Pack a string using the given GFunc and seperator. |
|
17298
9c5b1dc7404f
Change msim_msg_debug_string() to msim_msg_dump(), which prints the string
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17294
diff
changeset
|
608 * Used by msim_msg_dump() and msim_msg_pack(). |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
609 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
610 gchar * |
|
18879
e0cac5db762b
In msim_msg_pack_element_dict(), separate keys and values with '=' for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17976
diff
changeset
|
611 msim_msg_pack_using(MsimMessage *msg, |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
612 GFunc gf, |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
613 const gchar *sep, |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
614 const gchar *begin, const gchar *end) |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
615 { |
|
24552
f10aba5592c6
The other day while struct hiding, I noticed a for loop that was checking
Richard Laager <rlaager@wiktel.com>
parents:
22334
diff
changeset
|
616 int num_items; |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
617 gchar **strings; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
618 gchar **strings_tmp; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
619 gchar *joined; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
620 gchar *final; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
621 int i; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
622 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
623 g_return_val_if_fail(msg != NULL, NULL); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
624 |
|
24552
f10aba5592c6
The other day while struct hiding, I noticed a for loop that was checking
Richard Laager <rlaager@wiktel.com>
parents:
22334
diff
changeset
|
625 num_items = g_list_length(msg); |
|
f10aba5592c6
The other day while struct hiding, I noticed a for loop that was checking
Richard Laager <rlaager@wiktel.com>
parents:
22334
diff
changeset
|
626 |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
627 /* Add one for NULL terminator for g_strjoinv(). */ |
|
24552
f10aba5592c6
The other day while struct hiding, I noticed a for loop that was checking
Richard Laager <rlaager@wiktel.com>
parents:
22334
diff
changeset
|
628 strings = (gchar **)g_new0(gchar *, num_items + 1); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
629 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
630 strings_tmp = strings; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
631 g_list_foreach(msg, gf, &strings_tmp); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
632 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
633 joined = g_strjoinv(sep, strings); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
634 final = g_strconcat(begin, joined, end, NULL); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
635 g_free(joined); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
636 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
637 /* Clean up. */ |
|
24552
f10aba5592c6
The other day while struct hiding, I noticed a for loop that was checking
Richard Laager <rlaager@wiktel.com>
parents:
22334
diff
changeset
|
638 for (i = 0; i < num_items; ++i) { |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
639 g_free(strings[i]); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
640 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
641 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
642 g_free(strings); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
643 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
644 return final; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
645 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
646 /** Store a human-readable string describing the element. |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
647 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
648 * @param data Pointer to an MsimMessageElement. |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
649 * @param user_data |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
650 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
651 static void |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
652 msim_msg_debug_string_element(gpointer data, gpointer user_data) |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
653 { |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
654 MsimMessageElement *elem; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
655 gchar *string; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
656 GString *gs; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
657 gchar *binary; |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
658 gchar ***items; /* wow, a pointer to a pointer to a pointer */ |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
659 |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
660 gchar *s; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
661 GList *gl; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
662 guint i; |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
663 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
664 elem = (MsimMessageElement *)data; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
665 items = user_data; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
666 |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
667 switch (elem->type) { |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
668 case MSIM_TYPE_INTEGER: |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
669 string = g_strdup_printf("%s(integer): %d", elem->name, |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
670 GPOINTER_TO_UINT(elem->data)); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
671 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
672 |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
673 case MSIM_TYPE_RAW: |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
674 string = g_strdup_printf("%s(raw): %s", elem->name, |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
675 elem->data ? (gchar *)elem->data : "(NULL)"); |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
676 break; |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
677 |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
678 case MSIM_TYPE_STRING: |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
679 string = g_strdup_printf("%s(string): %s", elem->name, |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
680 elem->data ? (gchar *)elem->data : "(NULL)"); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
681 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
682 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
683 case MSIM_TYPE_BINARY: |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
684 gs = (GString *)elem->data; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
685 binary = purple_base64_encode((guchar*)gs->str, gs->len); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
686 string = g_strdup_printf("%s(binary, %d bytes): %s", elem->name, (int)gs->len, binary); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
687 g_free(binary); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
688 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
689 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
690 case MSIM_TYPE_BOOLEAN: |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
691 string = g_strdup_printf("%s(boolean): %s", elem->name, |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
692 elem->data ? "TRUE" : "FALSE"); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
693 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
694 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
695 case MSIM_TYPE_DICTIONARY: |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
696 if (!elem->data) { |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
697 s = g_strdup("(NULL)"); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
698 } else { |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
699 s = msim_msg_dump_to_str((MsimMessage *)elem->data); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
700 } |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
701 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
702 if (!s) { |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
703 s = g_strdup("(NULL, couldn't msim_msg_dump_to_str)"); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
704 } |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
705 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
706 string = g_strdup_printf("%s(dict): %s", elem->name, s); |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
707 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
708 g_free(s); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
709 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
710 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
711 case MSIM_TYPE_LIST: |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
712 gs = g_string_new(""); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
713 g_string_append_printf(gs, "%s(list): \n", elem->name); |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
714 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
715 i = 0; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
716 for (gl = (GList *)elem->data; gl != NULL; gl = g_list_next(gl)) { |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
717 g_string_append_printf(gs, " %d. %s\n", i, (gchar *)(gl->data)); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
718 ++i; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
719 } |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
720 |
|
20243
5440eed4ec7e
applied changes from efedefa70ee1d6f7f4dd39afe5db10c7e5bfe64c
Richard Laager <rlaager@wiktel.com>
parents:
19681
diff
changeset
|
721 string = g_string_free(gs, FALSE); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
722 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
723 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
724 default: |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
725 string = g_strdup_printf("%s(unknown type %d", |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
726 elem->name ? elem->name : "(NULL)", elem->type); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
727 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
728 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
729 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
730 **items = string; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
731 ++(*items); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
732 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
733 |
|
17298
9c5b1dc7404f
Change msim_msg_debug_string() to msim_msg_dump(), which prints the string
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17294
diff
changeset
|
734 /** Print a human-readable string of the message to Purple's debug log. |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
735 * |
|
17298
9c5b1dc7404f
Change msim_msg_debug_string() to msim_msg_dump(), which prints the string
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17294
diff
changeset
|
736 * @param fmt_string A static string, in which '%s' will be replaced. |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
737 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
738 void |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
739 msim_msg_dump(const gchar *fmt_string, MsimMessage *msg) |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
740 { |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
741 gchar *debug_str; |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
742 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
743 g_return_if_fail(fmt_string != NULL); |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
744 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
745 debug_str = msim_msg_dump_to_str(msg); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
746 |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
747 g_return_if_fail(debug_str != NULL); |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
748 |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
749 purple_debug_info("msim", fmt_string, debug_str); |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
750 |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
751 g_free(debug_str); |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
752 } |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
753 |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
754 /** Return a human-readable string of the message. |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
755 * |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
756 * @return A new gchar *, must be g_free()'d. |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
757 */ |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
758 gchar * |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
759 msim_msg_dump_to_str(MsimMessage *msg) |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
760 { |
|
17298
9c5b1dc7404f
Change msim_msg_debug_string() to msim_msg_dump(), which prints the string
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17294
diff
changeset
|
761 gchar *debug_str; |
|
9c5b1dc7404f
Change msim_msg_debug_string() to msim_msg_dump(), which prints the string
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17294
diff
changeset
|
762 |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
763 if (!msg) { |
|
17298
9c5b1dc7404f
Change msim_msg_debug_string() to msim_msg_dump(), which prints the string
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17294
diff
changeset
|
764 debug_str = g_strdup("<MsimMessage: empty>"); |
|
9c5b1dc7404f
Change msim_msg_debug_string() to msim_msg_dump(), which prints the string
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17294
diff
changeset
|
765 } else { |
|
9c5b1dc7404f
Change msim_msg_debug_string() to msim_msg_dump(), which prints the string
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17294
diff
changeset
|
766 debug_str = msim_msg_pack_using(msg, msim_msg_debug_string_element, |
|
9c5b1dc7404f
Change msim_msg_debug_string() to msim_msg_dump(), which prints the string
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17294
diff
changeset
|
767 "\n", "<MsimMessage: \n", "\n/MsimMessage>"); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
768 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
769 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
770 return debug_str; |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
771 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
772 |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
773 /** Return a message element data as a new string for a raw protocol message, converting from other types (integer, etc.) if necessary. |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
774 * |
|
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17318
diff
changeset
|
775 * @return const gchar * The data as a string, or NULL. Caller must g_free(). |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
776 * |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
777 * Returns a string suitable for inclusion in a raw protocol message, not necessarily |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
778 * optimal for human consumption. For example, strings are escaped. Use |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
779 * msim_msg_get_string() if you want a string, which in some cases is same as this. |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
780 */ |
|
18880
f41db253c1af
Add a new public function msim_msg_free_element_data(), that frees element data (but the MsimMessageElement * still must be g_free()'d). Internally, msim_msg_free_element() is still used, as a callback to g_list_foreach() to free every element in an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18879
diff
changeset
|
781 gchar * |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
782 msim_msg_pack_element_data(MsimMessageElement *elem) |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
783 { |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
784 GString *gs; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
785 GList *gl; |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
786 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
787 g_return_val_if_fail(elem != NULL, NULL); |
|
17976
b2d81d13f015
Be more careful about null strings in %s format specifier in debug messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17973
diff
changeset
|
788 |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
789 switch (elem->type) { |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
790 case MSIM_TYPE_INTEGER: |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
791 return g_strdup_printf("%d", GPOINTER_TO_UINT(elem->data)); |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
792 |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
793 case MSIM_TYPE_RAW: |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
794 /* Not un-escaped - this is a raw element, already escaped if necessary. */ |
|
17326
f057837085b0
Change to use const gchar * where appropriate.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17318
diff
changeset
|
795 return (gchar *)g_strdup((gchar *)elem->data); |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
796 |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
797 case MSIM_TYPE_STRING: |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
798 /* Strings get escaped. msim_escape() creates a new string. */ |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
799 g_return_val_if_fail(elem->data != NULL, NULL); |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
800 return elem->data ? msim_escape((gchar *)elem->data) : |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
801 g_strdup("(NULL)"); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
802 |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
803 case MSIM_TYPE_BINARY: |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
804 gs = (GString *)elem->data; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
805 /* Do not escape! */ |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
806 return purple_base64_encode((guchar *)gs->str, gs->len); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
807 |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
808 case MSIM_TYPE_BOOLEAN: |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
809 /* Not used by messages in the wire protocol * -- see msim_msg_pack_element. |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
810 * Only used by dictionaries, see msim_msg_pack_element_dict. */ |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
811 return elem->data ? g_strdup("On") : g_strdup("Off"); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
812 |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
813 case MSIM_TYPE_DICTIONARY: |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
814 return msim_msg_pack_dict((MsimMessage *)elem->data); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
815 |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
816 case MSIM_TYPE_LIST: |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
817 /* Pack using a|b|c|d|... */ |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
818 gs = g_string_new(""); |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
819 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
820 for (gl = (GList *)elem->data; gl != NULL; gl = g_list_next(gl)) { |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
821 g_string_append_printf(gs, "%s", (gchar*)(gl->data)); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
822 |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
823 /* All but last element is separated by a bar. */ |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
824 if (g_list_next(gl)) |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
825 g_string_append(gs, "|"); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
826 } |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
827 |
|
20243
5440eed4ec7e
applied changes from efedefa70ee1d6f7f4dd39afe5db10c7e5bfe64c
Richard Laager <rlaager@wiktel.com>
parents:
19681
diff
changeset
|
828 return g_string_free(gs, FALSE); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
829 |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
830 default: |
|
17976
b2d81d13f015
Be more careful about null strings in %s format specifier in debug messages.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17973
diff
changeset
|
831 purple_debug_info("msim", "field %s, unknown type %d\n", |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
832 elem->name ? elem->name : "(NULL)", |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
833 elem->type); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
834 return NULL; |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
835 } |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
836 } |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
837 |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
838 /** Pack an element into its protcol representation inside a dictionary. |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
839 * |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
840 * See msim_msg_pack_element(). |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
841 */ |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
842 static void |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
843 msim_msg_pack_element_dict(gpointer data, gpointer user_data) |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
844 { |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
845 MsimMessageElement *elem; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
846 gchar *string, *data_string, ***items; |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
847 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
848 elem = (MsimMessageElement *)data; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
849 items = (gchar ***)user_data; |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
850 |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
851 /* Exclude elements beginning with '_' from packed protocol messages. */ |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
852 if (elem->name[0] == '_') { |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
853 return; |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
854 } |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
855 |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
856 data_string = msim_msg_pack_element_data(elem); |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
857 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
858 g_return_if_fail(data_string != NULL); |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
859 |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
860 switch (elem->type) { |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
861 /* These types are represented by key name/value pairs (converted above). */ |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
862 case MSIM_TYPE_INTEGER: |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
863 case MSIM_TYPE_RAW: |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
864 case MSIM_TYPE_STRING: |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
865 case MSIM_TYPE_BINARY: |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
866 case MSIM_TYPE_DICTIONARY: |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
867 case MSIM_TYPE_LIST: |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
868 case MSIM_TYPE_BOOLEAN: /* Boolean is On or Off */ |
|
18879
e0cac5db762b
In msim_msg_pack_element_dict(), separate keys and values with '=' for
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17976
diff
changeset
|
869 string = g_strconcat(elem->name, "=", data_string, NULL); |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
870 break; |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
871 |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
872 default: |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
873 g_free(data_string); |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
874 g_return_if_fail(FALSE); |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
875 break; |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
876 } |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
877 |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
878 g_free(data_string); |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
879 |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
880 **items = string; |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
881 ++(*items); |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
882 } |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
883 |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
884 /** Pack an element into its protocol representation. |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
885 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
886 * @param data Pointer to an MsimMessageElement. |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
887 * @param user_data Pointer to a gchar ** array of string items. |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
888 * |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
889 * Called by msim_msg_pack(). Will pack the MsimMessageElement into |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
890 * a part of the protocol string and append it to the array. Caller |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
891 * is responsible for creating array to correct dimensions, and |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
892 * freeing each string element of the array added by this function. |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
893 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
894 static void |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
895 msim_msg_pack_element(gpointer data, gpointer user_data) |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
896 { |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
897 MsimMessageElement *elem; |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
898 gchar *string, *data_string; |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
899 gchar ***items; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
900 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
901 elem = (MsimMessageElement *)data; |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
902 items = (gchar ***)user_data; |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
903 |
|
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17302
diff
changeset
|
904 /* Exclude elements beginning with '_' from packed protocol messages. */ |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
905 if (elem->name[0] == '_') { |
|
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17302
diff
changeset
|
906 return; |
|
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17302
diff
changeset
|
907 } |
|
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17302
diff
changeset
|
908 |
|
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17302
diff
changeset
|
909 data_string = msim_msg_pack_element_data(elem); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
910 |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
911 switch (elem->type) { |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
912 /* These types are represented by key name/value pairs (converted above). */ |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
913 case MSIM_TYPE_INTEGER: |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
914 case MSIM_TYPE_RAW: |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
915 case MSIM_TYPE_STRING: |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
916 case MSIM_TYPE_BINARY: |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
917 case MSIM_TYPE_DICTIONARY: |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
918 case MSIM_TYPE_LIST: |
|
17281
d8afaaf24f34
Trivial fixes to clean up MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17277
diff
changeset
|
919 string = g_strconcat(elem->name, "\\", data_string, NULL); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
920 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
921 |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
922 /* Boolean is represented by absence or presence of name. */ |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
923 case MSIM_TYPE_BOOLEAN: |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
924 if (GPOINTER_TO_UINT(elem->data)) { |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
925 /* True - leave in, with blank value. */ |
|
17318
7abd1eca3d18
Bug fixes in MsimMessage:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
926 string = g_strdup_printf("%s\\", elem->name); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
927 } else { |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
928 /* False - leave out. */ |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
929 string = g_strdup(""); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
930 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
931 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
932 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
933 default: |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
934 g_free(data_string); |
|
20336
b93e7be3847b
applied changes from 9d35dde0c779cca73548172223ba557f27d61882
Luke Schierer <lschiere@pidgin.im>
parents:
20243
diff
changeset
|
935 g_return_if_reached(); |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
936 break; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
937 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
938 |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
939 g_free(data_string); |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
940 |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
941 **items = string; |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
942 ++(*items); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
943 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
944 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
945 |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
946 /** Return a packed string of a message suitable for sending over the wire. |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
947 * |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
948 * @return A string. Caller must g_free(). |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
949 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
950 gchar * |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
951 msim_msg_pack(MsimMessage *msg) |
|
17264
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
952 { |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
953 g_return_val_if_fail(msg != NULL, NULL); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
954 |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
955 return msim_msg_pack_using(msg, msim_msg_pack_element, "\\", "\\", "\\final\\"); |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
956 } |
|
ddcf9ef2ccec
Add MsimMessage implementation (sending only).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
diff
changeset
|
957 |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
958 /** Return a packed string of a dictionary, suitable for embedding in MSIM_TYPE_DICTIONARY. |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
959 * |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
960 * @return A string; caller must g_free(). |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
961 */ |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
962 gchar * |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
963 msim_msg_pack_dict(MsimMessage *msg) |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
964 { |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
965 g_return_val_if_fail(msg != NULL, NULL); |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
966 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
967 return msim_msg_pack_using(msg, msim_msg_pack_element_dict, "\034", "", ""); |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
968 } |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
969 |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
970 /** |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
971 * Parse a raw protocol message string into a MsimMessage *. |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
972 * |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
973 * @param raw The raw message string to parse, will be g_free()'d. |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
974 * |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
975 * @return MsimMessage *. Caller should msim_msg_free() when done. |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
976 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
977 MsimMessage * |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
978 msim_parse(gchar *raw) |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
979 { |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
980 MsimMessage *msg; |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
981 gchar *token; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
982 gchar **tokens; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
983 gchar *key; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
984 gchar *value; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
985 int i; |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
986 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
987 g_return_val_if_fail(raw != NULL, NULL); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
988 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
989 purple_debug_info("msim", "msim_parse: got <%s>\n", raw); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
990 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
991 key = NULL; |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
992 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
993 /* All messages begin with a \. */ |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
994 if (raw[0] != '\\' || raw[1] == 0) { |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
995 purple_debug_info("msim", "msim_parse: incomplete/bad string, " |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
996 "missing initial backslash: <%s>\n", raw); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
997 /* XXX: Should we try to recover, and read to first backslash? */ |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
998 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
999 g_free(raw); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1000 return NULL; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1001 } |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1002 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1003 msg = msim_msg_new(FALSE); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1004 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1005 for (tokens = g_strsplit(raw + 1, "\\", 0), i = 0; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1006 (token = tokens[i]); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1007 i++) { |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1008 #ifdef MSIM_DEBUG_PARSE |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1009 purple_debug_info("msim", "tok=<%s>, i%2=%d\n", token, i % 2); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1010 #endif |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1011 if (i % 2) { |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1012 /* Odd-numbered ordinal is a value. */ |
|
17285
4f54e8c41086
Cosmetic improvement to MsimMessage debug output.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17284
diff
changeset
|
1013 |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1014 value = token; |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1015 |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1016 /* Incoming protocol messages get tagged as MSIM_TYPE_RAW, which |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1017 * represents an untyped piece of data. msim_msg_get_* will |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1018 * convert to appropriate types for caller, and handle unescaping if needed. */ |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1019 msg = msim_msg_append(msg, g_strdup(key), MSIM_TYPE_RAW, g_strdup(value)); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1020 #ifdef MSIM_DEBUG_PARSE |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1021 purple_debug_info("msim", "insert string: |%s|=|%s|\n", key, value); |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1022 #endif |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1023 } else { |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1024 /* Even numbered indexes are key names. */ |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1025 key = token; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1026 } |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1027 } |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1028 g_strfreev(tokens); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1029 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1030 /* Can free now since all data was copied to hash key/values */ |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1031 g_free(raw); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1032 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1033 return msg; |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1034 } |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1035 |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1036 /** Search for and return the node in msg, matching name, or NULL. |
|
17318
7abd1eca3d18
Bug fixes in MsimMessage:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1037 * |
|
7abd1eca3d18
Bug fixes in MsimMessage:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1038 * @param msg Message to search within. |
|
7abd1eca3d18
Bug fixes in MsimMessage:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1039 * @param name Field name to search for. |
|
7abd1eca3d18
Bug fixes in MsimMessage:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1040 * |
|
7abd1eca3d18
Bug fixes in MsimMessage:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1041 * @return The GList * node for the MsimMessageElement with the given name, or NULL if not found or name is NULL. |
|
7abd1eca3d18
Bug fixes in MsimMessage:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1042 * |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1043 * For internal use - users probably want to use msim_msg_get() to |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1044 * access the MsimMessageElement *, instead of the GList * container. |
|
17318
7abd1eca3d18
Bug fixes in MsimMessage:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1045 * |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1046 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
1047 static GList * |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
1048 msim_msg_get_node(MsimMessage *msg, const gchar *name) |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1049 { |
|
19254
9245404fe70c
In msim_msg_get(), start at the given node instead of using g_list_first()
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19253
diff
changeset
|
1050 GList *node; |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1051 |
|
19255
1ea47b06f1a6
Initial implementation of friend importing. Not well tested.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19254
diff
changeset
|
1052 if (!name || !msg) { |
|
17318
7abd1eca3d18
Bug fixes in MsimMessage:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1053 return NULL; |
|
7abd1eca3d18
Bug fixes in MsimMessage:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1054 } |
|
7abd1eca3d18
Bug fixes in MsimMessage:
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17311
diff
changeset
|
1055 |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1056 /* Linear search for the given name. O(n) but n is small. */ |
|
19254
9245404fe70c
In msim_msg_get(), start at the given node instead of using g_list_first()
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19253
diff
changeset
|
1057 for (node = msg; node != NULL; node = g_list_next(node)) { |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1058 MsimMessageElement *elem; |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1059 |
|
19256
34a1957de14b
Fix crashes. In myspace.c, clone the contact_info message before sending it to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19255
diff
changeset
|
1060 elem = (MsimMessageElement *)node->data; |
|
34a1957de14b
Fix crashes. In myspace.c, clone the contact_info message before sending it to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19255
diff
changeset
|
1061 |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1062 g_return_val_if_fail(elem != NULL, NULL); |
|
19256
34a1957de14b
Fix crashes. In myspace.c, clone the contact_info message before sending it to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19255
diff
changeset
|
1063 g_return_val_if_fail(elem->name != NULL, NULL); |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1064 |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
1065 if (strcmp(elem->name, name) == 0) { |
|
19254
9245404fe70c
In msim_msg_get(), start at the given node instead of using g_list_first()
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19253
diff
changeset
|
1066 return node; |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1067 } |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1068 } |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1069 return NULL; |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1070 } |
|
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1071 |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1072 /** Return the first MsimMessageElement * with given name in the MsimMessage *. |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1073 * |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1074 * @param name Name to search for. |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1075 * |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1076 * @return MsimMessageElement * matching name, or NULL. |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1077 * |
|
17274
9accf6d6cd61
Change msim_msg_get_element to msim_msg_get.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17273
diff
changeset
|
1078 * Note: useful fields of MsimMessageElement are 'data' and 'type', which |
|
9accf6d6cd61
Change msim_msg_get_element to msim_msg_get.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17273
diff
changeset
|
1079 * you can access directly. But it is often more convenient to use |
|
9accf6d6cd61
Change msim_msg_get_element to msim_msg_get.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17273
diff
changeset
|
1080 * another msim_msg_get_* that converts the data to what type you want. |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1081 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
1082 MsimMessageElement * |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
1083 msim_msg_get(MsimMessage *msg, const gchar *name) |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1084 { |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1085 GList *node; |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1086 |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1087 node = msim_msg_get_node(msg, name); |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
1088 if (node) { |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1089 return (MsimMessageElement *)node->data; |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1090 } else { |
|
17301
641c96277fa6
Add msim_msg_insert_before(), needed since some elements must be in a certain order.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17298
diff
changeset
|
1091 return NULL; |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1092 } |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1093 } |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1094 |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1095 /** Return the data of an element of a given name, as a string. |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1096 * |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1097 * @param name Name of element. |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1098 * |
|
18908
6541b0edee26
Fix some assertion failures, that should really not be assertions. Found by using
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18905
diff
changeset
|
1099 * @return gchar * The data as a string, or NULL if not found. |
|
6541b0edee26
Fix some assertion failures, that should really not be assertions. Found by using
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18905
diff
changeset
|
1100 * Caller must g_free(). |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1101 * |
|
17311
3720176bdac6
Pass postprocessing parameters inside MsimMessage * instead of in a new struct.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17302
diff
changeset
|
1102 * Note that msim_msg_pack_element_data() is similar, but returns a string |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1103 * for inclusion into a raw protocol string (escaped and everything). |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1104 * This function unescapes the string for you, if needed. |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1105 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
1106 gchar * |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
1107 msim_msg_get_string(MsimMessage *msg, const gchar *name) |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1108 { |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1109 MsimMessageElement *elem; |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1110 |
|
17274
9accf6d6cd61
Change msim_msg_get_element to msim_msg_get.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17273
diff
changeset
|
1111 elem = msim_msg_get(msg, name); |
|
18908
6541b0edee26
Fix some assertion failures, that should really not be assertions. Found by using
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18905
diff
changeset
|
1112 if (!elem) { |
|
6541b0edee26
Fix some assertion failures, that should really not be assertions. Found by using
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18905
diff
changeset
|
1113 return NULL; |
|
6541b0edee26
Fix some assertion failures, that should really not be assertions. Found by using
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18905
diff
changeset
|
1114 } |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1115 |
|
19253
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1116 return msim_msg_get_string_from_element(elem); |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1117 } |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1118 |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1119 gchar * |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1120 msim_msg_get_string_from_element(MsimMessageElement *elem) |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1121 { |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1122 g_return_val_if_fail(elem != NULL, NULL); |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
1123 switch (elem->type) { |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1124 case MSIM_TYPE_INTEGER: |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1125 return g_strdup_printf("%d", GPOINTER_TO_UINT(elem->data)); |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1126 |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1127 case MSIM_TYPE_RAW: |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1128 /* Raw element from incoming message - if its a string, it'll |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1129 * be escaped. */ |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1130 return msim_unescape((gchar *)elem->data); |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1131 |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1132 case MSIM_TYPE_STRING: |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1133 /* Already unescaped. */ |
|
17692
3aed9c8c6af7
Fix bug where string returned from msim_msg_get_string() is not a new
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17680
diff
changeset
|
1134 return g_strdup((gchar *)elem->data); |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1135 |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1136 default: |
|
19253
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1137 purple_debug_info("msim", "msim_msg_get_string_element: type %d unknown, name %s\n", |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1138 elem->type, elem->name ? elem->name : "(NULL)"); |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1139 return NULL; |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1140 } |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1141 } |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1142 |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
1143 /** Return an element as a new list. Caller frees with msim_msg_list_free(). */ |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
1144 GList * |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
1145 msim_msg_get_list(MsimMessage *msg, const gchar *name) |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
1146 { |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1147 MsimMessageElement *elem; |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
1148 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1149 elem = msim_msg_get(msg, name); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1150 if (!elem) { |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1151 return NULL; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1152 } |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
1153 |
|
19253
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1154 return msim_msg_get_list_from_element(elem); |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1155 } |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1156 |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1157 GList * |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1158 msim_msg_get_list_from_element(MsimMessageElement *elem) |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1159 { |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1160 g_return_val_if_fail(elem != NULL, NULL); |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1161 switch (elem->type) { |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1162 case MSIM_TYPE_LIST: |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1163 return msim_msg_list_copy((GList *)elem->data); |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
1164 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1165 case MSIM_TYPE_RAW: |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1166 return msim_msg_list_parse((gchar *)elem->data); |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
1167 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1168 default: |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1169 purple_debug_info("msim_msg_get_list", "type %d unknown, name %s\n", |
|
19253
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1170 elem->type, elem->name ? elem->name : "(NULL)"); |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1171 return NULL; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1172 } |
|
17964
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
1173 } |
|
6d1d86ab6a59
In MsimMessage, add support for MSIM_TYPE_LIST - pipe-separated lists.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17944
diff
changeset
|
1174 |
|
19248
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1175 /** |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1176 * Parse a \x1c-separated "dictionary" of key=value pairs into a hash table. |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1177 * |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1178 * @param raw The text of the dictionary to parse. Often the |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1179 * value for the 'body' field. |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1180 * |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1181 * @return A new MsimMessage *. Must msim_msg_free() when done. |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1182 */ |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1183 MsimMessage * |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1184 msim_msg_dictionary_parse(gchar *raw) |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1185 { |
|
19248
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1186 MsimMessage *dict; |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1187 gchar *item; |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1188 gchar **items; |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1189 gchar **elements; |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1190 guint i; |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1191 |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1192 g_return_val_if_fail(raw != NULL, NULL); |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1193 |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1194 dict = msim_msg_new(NULL); |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1195 |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1196 for (items = g_strsplit(raw, "\x1c", 0), i = 0; |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1197 (item = items[i]); |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1198 i++) { |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1199 gchar *key, *value; |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1200 |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1201 elements = g_strsplit(item, "=", 2); |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1202 |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1203 key = elements[0]; |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1204 if (!key) { |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1205 purple_debug_info("msim", "msim_msg_parse_dictionary(%s): null key\n", |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1206 raw); |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1207 g_strfreev(elements); |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1208 break; |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1209 } |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1210 |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1211 value = elements[1]; |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1212 if (!value) { |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1213 purple_debug_info("msim", "msim_msg_parse_dictionary(%s): null value\n", |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1214 raw); |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1215 g_strfreev(elements); |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1216 break; |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1217 } |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1218 |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1219 #ifdef MSIM_DEBUG_PARSE |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1220 purple_debug_info("msim_msg_parse_dictionary","-- %s: %s\n", key ? key : "(NULL)", |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1221 value ? value : "(NULL)"); |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1222 #endif |
|
22334
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
1223 /* Append with _dynamic_name since g_strdup(key) is dynamic, and |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
1224 * needs to be freed when the message is destroyed. It isn't static as usual. */ |
|
9479cf89a97d
In msimprpl, support dynamically-allocated strings in message element names,
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
22269
diff
changeset
|
1225 dict = msim_msg_append_dynamic_name(dict, g_strdup(key), MSIM_TYPE_RAW, g_strdup(value)); |
|
19248
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1226 |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1227 g_strfreev(elements); |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1228 } |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1229 |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1230 g_strfreev(items); |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1231 |
|
d34e49d8fac7
Implement msim_msg_dictionary_parse() based on msim_parse_body(). This allows
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18911
diff
changeset
|
1232 return dict; |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1233 } |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1234 |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1235 /** Return an element as a new dictionary. Caller frees with msim_msg_free(). */ |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1236 MsimMessage * |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1237 msim_msg_get_dictionary(MsimMessage *msg, const gchar *name) |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1238 { |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1239 MsimMessageElement *elem; |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1240 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1241 elem = msim_msg_get(msg, name); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1242 if (!elem) { |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1243 return NULL; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1244 } |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1245 |
|
19253
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1246 return msim_msg_get_dictionary_from_element(elem); |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1247 } |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1248 |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1249 MsimMessage * |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1250 msim_msg_get_dictionary_from_element(MsimMessageElement *elem) |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1251 { |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1252 g_return_val_if_fail(elem != NULL, NULL); |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1253 switch (elem->type) { |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1254 case MSIM_TYPE_DICTIONARY: |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1255 return msim_msg_clone((MsimMessage *)elem->data); |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1256 |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1257 case MSIM_TYPE_RAW: |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1258 return msim_msg_dictionary_parse((gchar *)elem->data); |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1259 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1260 default: |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1261 purple_debug_info("msim_msg_get_dictionary", "type %d unknown, name %s\n", |
|
19253
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1262 elem->type, elem->name ? elem->name : "(NULL)"); |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1263 return NULL; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1264 } |
|
17973
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1265 } |
|
acff371d7908
Fix crash when deleting buddies on Windows. This was done by
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17968
diff
changeset
|
1266 |
|
19253
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1267 /** Return the data of an element of a given name, as an unsigned integer. |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1268 * |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1269 * @param name Name of element. |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1270 * |
|
17327
320b0b450c7b
msim_msg_get_integer() - if could not find element, return 0.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17326
diff
changeset
|
1271 * @return guint Numeric representation of data, or 0 if could not be converted / not found. |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1272 * |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1273 * Useful to obtain an element's data if you know it should be an integer, |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1274 * even if it is not stored as an MSIM_TYPE_INTEGER. MSIM_TYPE_STRING will |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1275 * be converted handled correctly, for example. |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1276 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
1277 guint |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
1278 msim_msg_get_integer(MsimMessage *msg, const gchar *name) |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1279 { |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1280 MsimMessageElement *elem; |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1281 |
|
17274
9accf6d6cd61
Change msim_msg_get_element to msim_msg_get.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17273
diff
changeset
|
1282 elem = msim_msg_get(msg, name); |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1283 |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
1284 if (!elem) { |
|
17327
320b0b450c7b
msim_msg_get_integer() - if could not find element, return 0.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17326
diff
changeset
|
1285 return 0; |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1286 } |
|
17327
320b0b450c7b
msim_msg_get_integer() - if could not find element, return 0.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17326
diff
changeset
|
1287 |
|
19253
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1288 return msim_msg_get_integer_from_element(elem); |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1289 } |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1290 |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1291 |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1292 guint |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1293 msim_msg_get_integer_from_element(MsimMessageElement *elem) |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1294 { |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1295 g_return_val_if_fail(elem != NULL, 0); |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
1296 switch (elem->type) { |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1297 case MSIM_TYPE_INTEGER: |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1298 return GPOINTER_TO_UINT(elem->data); |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1299 |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1300 case MSIM_TYPE_RAW: |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1301 case MSIM_TYPE_STRING: |
|
17276
b9c0a8bb94b9
Add msim_msg_get_binary() - retrieves binary data values from an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17274
diff
changeset
|
1302 /* TODO: find out if we need larger integers */ |
|
17266
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1303 return (guint)atoi((gchar *)elem->data); |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1304 |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1305 default: |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1306 return 0; |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1307 } |
|
793301c04e3a
(Incomplete - plugin does not load) Begin migrating protocol message receiving to MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17264
diff
changeset
|
1308 } |
|
17276
b9c0a8bb94b9
Add msim_msg_get_binary() - retrieves binary data values from an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17274
diff
changeset
|
1309 |
|
b9c0a8bb94b9
Add msim_msg_get_binary() - retrieves binary data values from an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17274
diff
changeset
|
1310 /** Return the data of an element of a given name, as a binary GString. |
|
b9c0a8bb94b9
Add msim_msg_get_binary() - retrieves binary data values from an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17274
diff
changeset
|
1311 * |
|
17277
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1312 * @param binary_data A pointer to a new pointer, which will be filled in with the binary data. CALLER MUST g_free(). |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1313 * |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1314 * @param binary_length A pointer to an integer, which will be set to the binary data length. |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1315 * |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1316 * @return TRUE if successful, FALSE if not. |
|
17276
b9c0a8bb94b9
Add msim_msg_get_binary() - retrieves binary data values from an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17274
diff
changeset
|
1317 */ |
|
17661
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
1318 gboolean |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
1319 msim_msg_get_binary(MsimMessage *msg, const gchar *name, |
|
38030f1a2e56
Split return type and function name + arguments on to separate lines, to
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17327
diff
changeset
|
1320 gchar **binary_data, gsize *binary_length) |
|
17276
b9c0a8bb94b9
Add msim_msg_get_binary() - retrieves binary data values from an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17274
diff
changeset
|
1321 { |
|
17281
d8afaaf24f34
Trivial fixes to clean up MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17277
diff
changeset
|
1322 MsimMessageElement *elem; |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
1323 |
|
17281
d8afaaf24f34
Trivial fixes to clean up MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17277
diff
changeset
|
1324 elem = msim_msg_get(msg, name); |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1325 if (!elem) { |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1326 return FALSE; |
|
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1327 } |
|
17281
d8afaaf24f34
Trivial fixes to clean up MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17277
diff
changeset
|
1328 |
|
19253
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1329 return msim_msg_get_binary_from_element(elem, binary_data, binary_length); |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1330 } |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1331 |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1332 gboolean |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1333 msim_msg_get_binary_from_element(MsimMessageElement *elem, gchar **binary_data, gsize *binary_length) |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1334 { |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1335 GString *gs; |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1336 |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1337 g_return_val_if_fail(elem != NULL, FALSE); |
|
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1338 |
|
18890
00499df91ffe
Use cuddled if's etc. everywhere, to better match style of Pidgin/libpurple.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18889
diff
changeset
|
1339 switch (elem->type) { |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1340 case MSIM_TYPE_RAW: |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1341 /* Incoming messages are tagged with MSIM_TYPE_RAW, and |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1342 * converted appropriately. They can still be "strings", just they won't |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1343 * be tagged as MSIM_TYPE_STRING (as MSIM_TYPE_STRING is intended to be used |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1344 * by msimprpl code for things like instant messages - stuff that should be |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1345 * escaped if needed). DWIM. |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1346 */ |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1347 |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1348 /* Previously, incoming messages were stored as MSIM_TYPE_STRING. |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1349 * This was fine for integers and strings, since they can easily be |
|
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1350 * converted in msim_get_*, as desirable. However, it does not work |
|
17277
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1351 * well for binary strings. Consider: |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1352 * |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1353 * If incoming base64'd elements were tagged as MSIM_TYPE_STRING. |
|
17277
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1354 * msim_msg_get_binary() sees MSIM_TYPE_STRING, base64 decodes, returns. |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1355 * everything is fine. |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1356 * But then, msim_send() is called on the incoming message, which has |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1357 * a base64'd MSIM_TYPE_STRING that really is encoded binary. The values |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1358 * will be escaped since strings are escaped, and / becomes /2; no good. |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1359 * |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1360 */ |
|
17281
d8afaaf24f34
Trivial fixes to clean up MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17277
diff
changeset
|
1361 *binary_data = (gchar *)purple_base64_decode((const gchar *)elem->data, binary_length); |
|
17277
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1362 return TRUE; |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1363 |
|
17276
b9c0a8bb94b9
Add msim_msg_get_binary() - retrieves binary data values from an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17274
diff
changeset
|
1364 case MSIM_TYPE_BINARY: |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1365 gs = (GString *)elem->data; |
|
17277
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1366 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1367 /* Duplicate data, so caller can g_free() it. */ |
|
20243
5440eed4ec7e
applied changes from efedefa70ee1d6f7f4dd39afe5db10c7e5bfe64c
Richard Laager <rlaager@wiktel.com>
parents:
19681
diff
changeset
|
1368 *binary_data = g_memdup(gs->str, gs->len); |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1369 *binary_length = gs->len; |
|
17277
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1370 |
|
18895
f732d072b118
Change all code to better match the style of libpurple - use 8-space tabs
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
18891
diff
changeset
|
1371 return TRUE; |
|
17277
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1372 |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1373 |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1374 /* Rejected because if it isn't already a GString, have to g_new0 it and |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1375 * then caller has to ALSO free the GString! |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1376 * |
|
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1377 * return (GString *)elem->data; */ |
|
17276
b9c0a8bb94b9
Add msim_msg_get_binary() - retrieves binary data values from an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17274
diff
changeset
|
1378 |
|
b9c0a8bb94b9
Add msim_msg_get_binary() - retrieves binary data values from an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17274
diff
changeset
|
1379 default: |
|
17284
37499e926a42
Add new MsimMessage element type, MSIM_TYPE_RAW, for fields in incoming
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17282
diff
changeset
|
1380 purple_debug_info("msim", "msim_msg_get_binary: unhandled type %d for key %s\n", |
|
19253
b66c5991c011
For each msim_msg_get_*() function that takes an element name, add
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
19252
diff
changeset
|
1381 elem->type, elem->name ? elem->name : "(NULL)"); |
|
17277
af7083a8ada7
Add MSIM_TYPE_STRING to msim_msg_get_binary() (but with reservations).
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17276
diff
changeset
|
1382 return FALSE; |
|
17276
b9c0a8bb94b9
Add msim_msg_get_binary() - retrieves binary data values from an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17274
diff
changeset
|
1383 } |
|
b9c0a8bb94b9
Add msim_msg_get_binary() - retrieves binary data values from an MsimMessage.
Jeffrey Connelly <jaconnel@calpoly.edu>
parents:
17274
diff
changeset
|
1384 } |
