Mercurial > pidgin
changeset 29551:80724c326423
merge of '25d4fad7d77b9c892b18504c1bdc49e0ecf41a0f'
and '758002db4911cba4399db3131f17cff39238db06'
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 07 Mar 2010 19:56:38 +0000 |
| parents | 54975f0cbc37 (diff) 2f73b0a78f4f (current diff) |
| children | b71821db0516 0b4ae43d7f1a |
| files | |
| diffstat | 4 files changed, 26 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Mar 07 19:45:12 2010 +0000 +++ b/ChangeLog Sun Mar 07 19:56:38 2010 +0000 @@ -24,6 +24,14 @@ Bonjour: * Added support for IPv6. (Thanks to T_X for testing) + Gadu-Gadu: + * Updated our bundled libgadu to 1.9.0-rc2 (many thanks to Krzysztof + Klinikowski for the work and testing put in here!) + + ICQ: + * X-Status (Custom ICQ status icon) support (Andrew Ivanov, Tomáš Kebert, + Yuriy Yevgrafov, and trac users bob007, salieff, and nops) + version 2.6.6 (02/18/2010): libpurple: * Fix 'make check' on OS X. (David Fang)
--- a/libpurple/protocols/jabber/jutil.c Sun Mar 07 19:45:12 2010 +0000 +++ b/libpurple/protocols/jabber/jutil.c Sun Mar 07 19:56:38 2010 +0000 @@ -302,7 +302,7 @@ const guchar *c; c = (const guchar *)in; - while (*c) { + for ( ; *c; ++c) { if (*c > 0x7f || (*c < 0x20 && *c != '\t' && *c != '\n' && *c != '\r')) return NULL;
--- a/libpurple/signals.c Sun Mar 07 19:45:12 2010 +0000 +++ b/libpurple/signals.c Sun Mar 07 19:56:38 2010 +0000 @@ -1009,6 +1009,21 @@ } void +purple_marshal_POINTER__POINTER( + PurpleCallback cb, va_list args, void *data, + void **return_val) +{ + gpointer ret_val; + void *arg1 = va_arg(args, void *); + + ret_val = ((gpointer(*)(void *, void *))cb)(arg1, data); + + if (return_val != NULL) + *return_val = ret_val; +} + + +void purple_marshal_POINTER__POINTER_INT( PurpleCallback cb, va_list args, void *data, void **return_val)
--- a/libpurple/signals.h Sun Mar 07 19:45:12 2010 +0000 +++ b/libpurple/signals.h Sun Mar 07 19:56:38 2010 +0000 @@ -355,6 +355,8 @@ void purple_marshal_BOOLEAN__INT_POINTER( PurpleCallback cb, va_list args, void *data, void **return_val); +void purple_marshal_POINTER__POINTER( + PurpleCallback cb, va_list args, void *data, void **return_val); void purple_marshal_POINTER__POINTER_INT( PurpleCallback cb, va_list args, void *data, void **return_val); void purple_marshal_POINTER__POINTER_INT64(