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