Merged default branch gtkdoc-conversion

Fri, 07 Feb 2014 21:48:18 +0530

author
Ankit Vani <a@nevitus.org>
date
Fri, 07 Feb 2014 21:48:18 +0530
branch
gtkdoc-conversion
changeset 35488
e3629f978fb4
parent 35487
494f09f7f331 (current diff)
parent 35380
2f76e3b8732a (diff)
child 35489
e1452d2416ed
child 37094
84873ce721dc

Merged default branch

--- a/libpurple/protocols/gg/purplew.c	Fri Feb 07 21:45:54 2014 +0530
+++ b/libpurple/protocols/gg/purplew.c	Fri Feb 07 21:48:18 2014 +0530
@@ -39,8 +39,8 @@
 {
 	if (purple_debug_is_verbose()) {
 		purple_debug_misc("gg", "ggp_purplew_http_input_add: "
-			"[req=%x, fd=%d, cond=%d]\n",
-			(unsigned int)http_req, http_req->fd, http_req->check);
+			"[req=%p, fd=%d, cond=%d]\n",
+			http_req, http_req->fd, http_req->check);
 	}
 	return purple_input_add(http_req->fd,
 		ggp_tcpsocket_inputcond_gg_to_purple(http_req->check),

mercurial