Mercurial > pidgin.yaz
changeset 22273:c2115e5e613d
merge of '72a2b71dfe259097d115f67e0442fb44934ce686'
and 'a411a09d2289df3a95a63d76420099ba40c49395'
author | Etan Reisner <pidgin@unreliablesource.net> |
---|---|
date | Sat, 09 Feb 2008 03:09:13 +0000 |
parents | 0e68dab2a362 (diff) 510ce2239296 (current diff) |
children | 4fced932324a bd25f8c9d94e |
files | |
diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/myspace/message.c Fri Feb 08 15:09:33 2008 +0000 +++ b/libpurple/protocols/myspace/message.c Sat Feb 09 03:09:13 2008 +0000 @@ -50,11 +50,12 @@ { GString *gs; guint i, j; + guint msg_len; gs = g_string_new(""); - + msg_len = strlen(msg); - for (i = 0; i < strlen(msg); ++i) { + for (i = 0; i < msg_len; ++i) { struct MSIM_ESCAPE_REPLACEMENT *replacement; gchar *replace; @@ -93,10 +94,12 @@ { GString *gs; guint i, j; + guint msg_len; gs = g_string_new(""); + msg_len = strlen(msg); - for (i = 0; i < strlen(msg); ++i) { + for (i = 0; i < msg_len; ++i) { struct MSIM_ESCAPE_REPLACEMENT *replacement; gchar replace; @@ -105,7 +108,7 @@ for (j = 0; (replacement = &msim_escape_replacements[j]) && replacement->code != NULL; ++j) { if (msg[i] == replacement->code[0] && - i + 1 < strlen(msg) && + i + 1 < msg_len && msg[i + 1] == replacement->code[1]) { replace = replacement->text; ++i;