Mercurial > pidgin
changeset 29729:a3b78a080a5b
merge of '1993306ee130a8c1c8eb294a1a05f86aa098cb9f'
and 'e5c9e334137918bc4e82fa4a3305623348817152'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 14 Apr 2010 19:58:42 +0000 |
| parents | 62cc2156961f (diff) 3bb9bef6ac23 (current diff) |
| children | 2e0dffa155db b00abe5ec15e |
| files | pidgin/eggtrayicon.c pidgin/eggtrayicon.h |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/simple/simple.c Wed Apr 14 16:43:12 2010 +0000 +++ b/libpurple/protocols/simple/simple.c Wed Apr 14 19:58:42 2010 +0000 @@ -1671,8 +1671,10 @@ buffer[len] = '\0'; purple_debug_info("simple", "\n\nreceived - %s\n######\n%s\n#######\n\n", ctime(&currtime), buffer); msg = sipmsg_parse_msg(buffer); - if(msg) process_input_message(sip, msg); - sipmsg_free(msg); + if (msg) { + process_input_message(sip, msg); + sipmsg_free(msg); + } } }