Mercurial > pidgin
changeset 31211:5dccfd26108b
merge of '84e4c2078413eedc9eaea26df534ecca59425b69'
and 'f23ff84c6d73ce743343a1f0547b7e0dba692407'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 15 Feb 2011 15:49:58 +0000 |
| parents | 0dade4c34d24 (current diff) f876cb251c7a (diff) |
| children | cb04febce5e4 |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/bosh.c Tue Feb 15 01:49:11 2011 +0000 +++ b/libpurple/protocols/jabber/bosh.c Tue Feb 15 15:49:58 2011 +0000 @@ -484,7 +484,13 @@ /* Shouldn't happen; this should be the only place pipelining * is turned off. */ +#if GLIB_CHECK_VERSION(2,16,0) g_warn_if_reached(); +#else + g_log(G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + "(%s:%d):%s%s code should not be reached", + __FILE__, __LINE__, G_STRFUNC, G_STRFUNC[0] ? ":" : ""); +#endif } }