pidgin: f23ff84c: g_warn_if_reached was added in glib 2.16...

markdoliner at pidgin.im markdoliner at pidgin.im
Mon Feb 14 21:01:07 EST 2011


----------------------------------------------------------------------
Revision: f23ff84c6d73ce743343a1f0547b7e0dba692407
Parent:   2679e81d33ef8b6f8087c9d7aa5f4e563a32f3d1
Author:   markdoliner at pidgin.im
Date:     02/14/11 20:58:41
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f23ff84c6d73ce743343a1f0547b7e0dba692407

Changelog: 

g_warn_if_reached was added in glib 2.16.0, but we agree to support 2.12.0.
Fix this particular probably by using g_log, instead.  This should print
the same output in this case, and seemed like the simplest solution.

Changes against parent 2679e81d33ef8b6f8087c9d7aa5f4e563a32f3d1

  patched  libpurple/protocols/jabber/bosh.c

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/bosh.c	d38d958250a7e80f988e8594ef0bdbc60e285e9b
+++ libpurple/protocols/jabber/bosh.c	abcfb33b443a534e8f0813a1fcd4cc29456eea15
@@ -484,7 +484,13 @@ jabber_bosh_disable_pipelining(PurpleBOS
 		/* 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
 	}
 }
 


More information about the Commits mailing list