# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1252105710 0
# Node ID 9ab9e5f1eec2ea36499ea3ce0a05e3eaaeb7c7af
# Parent  33921125348da2927a7677721fae4de9c7a16997# Parent  73a30365c2933a111ed3d63e886d72d51ce20772
merge of '65195a427a4340ca3f017d8d052c0b85c1f482f2'
     and 'd8d0c78fad568b2380be8a8c68c1474ff3ad4ea5'

diff -r 33921125348d -r 9ab9e5f1eec2 libpurple/protocols/qq/buddy_list.c
--- a/libpurple/protocols/qq/buddy_list.c	Fri Sep 04 22:50:26 2009 +0000
+++ b/libpurple/protocols/qq/buddy_list.c	Fri Sep 04 23:08:30 2009 +0000
@@ -215,7 +215,7 @@
 		if (qd->client_version >= 2007)	bytes += 4;
 
 		if (bs.uid == 0 || (bytes - bytes_start) != entry_len) {
-			purple_debug_error("QQ", "uid=0 or entry complete len(%d) != %d",
+			purple_debug_error("QQ", "uid=0 or entry complete len(%d) != %d\n",
 					(bytes - bytes_start), entry_len);
 			continue;
 		}	/* check if it is a valid entry */
@@ -281,7 +281,7 @@
 	qd = (qq_data *) gc->proto_data;
 
 	if (data_len <= 2) {
-		purple_debug_error("QQ", "empty buddies list");
+		purple_debug_error("QQ", "empty buddies list\n");
 		return -1;
 	}
 	/* qq_show_packet("QQ get buddies list", data, data_len); */
@@ -352,7 +352,7 @@
 
 	if(bytes > data_len) {
 		purple_debug_error("QQ",
-				"qq_process_get_buddies: Dangerous error! maybe protocol changed, notify developers!");
+				"qq_process_get_buddies: Dangerous error! maybe protocol changed, notify developers!\n");
 	}
 
 	purple_debug_info("QQ", "Received %d buddies, nextposition=%u\n",
@@ -397,7 +397,7 @@
 		/* 05: skip unknow 0x00 */
 		bytes += 1;
 		if (uid == 0 || (type != 0x1 && type != 0x4)) {
-			purple_debug_info("QQ", "Buddy entry, uid=%u, type=%d", uid, type);
+			purple_debug_info("QQ", "Buddy entry, uid=%u, type=%d\n", uid, type);
 			continue;
 		}
 		if(0x1 == type) { /* a buddy */
@@ -407,7 +407,7 @@
 		} else { /* a group */
 			rmd = qq_room_data_find(gc, uid);
 			if(rmd == NULL) {
-				purple_debug_info("QQ", "Unknow room id %u", uid);
+				purple_debug_info("QQ", "Unknown room id %u\n", uid);
 				qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, uid);
 			} else {
 				rmd->my_role = QQ_ROOM_ROLE_YES;
@@ -418,7 +418,7 @@
 
 	if(bytes > data_len) {
 		purple_debug_error("QQ",
-				"qq_process_get_buddies_and_rooms: Dangerous error! maybe protocol changed, notify developers!");
+				"qq_process_get_buddies_and_rooms: Dangerous error! maybe protocol changed, notify developers!\n");
 	}
 
 	purple_debug_info("QQ", "Received %d buddies and %d groups, nextposition=%u\n", i, j, (guint) position);
diff -r 33921125348d -r 9ab9e5f1eec2 libpurple/protocols/qq/buddy_opt.c
--- a/libpurple/protocols/qq/buddy_opt.c	Fri Sep 04 22:50:26 2009 +0000
+++ b/libpurple/protocols/qq/buddy_opt.c	Fri Sep 04 23:08:30 2009 +0000
@@ -805,7 +805,7 @@
 	dest_uid = segments[0];
 	reply = segments[1];
 	if (strtoul(dest_uid, NULL, 10) != qd->uid) {	/* should not happen */
-		purple_debug_error("QQ", "Add buddy reply is to [%s], not me!", dest_uid);
+		purple_debug_error("QQ", "Add buddy reply is to [%s], not me!\n", dest_uid);
 		g_strfreev(segments);
 		return;
 	}
@@ -822,7 +822,7 @@
 		}
 		qq_request_get_buddies_online(gc, 0, 0);
 
-		purple_debug_info("QQ", "Successed adding into %u's buddy list", uid);
+		purple_debug_info("QQ", "Successed adding into %u's buddy list\n", uid);
 		g_strfreev(segments);
 		return;
 	}
@@ -868,7 +868,7 @@
 	g_return_if_fail(dest_uid == uid);
 
 	if (reply == 0x99) {
-		purple_debug_info("QQ", "Successed adding buddy %u\n", uid);
+		purple_debug_info("QQ", "Successfully added buddy %u\n", uid);
 		qq_buddy_find_or_new(gc, uid);
 
 		qq_request_buddy_info(gc, uid, 0, 0);
@@ -882,7 +882,7 @@
 	}
 
 	if (reply != 0) {
-		purple_debug_info("QQ", "Failed adding buddy %u, Unknow reply 0x%02X\n",
+		purple_debug_info("QQ", "Failed adding buddy %u, Unknown reply 0x%02X\n",
 			uid, reply);
 	}
 
diff -r 33921125348d -r 9ab9e5f1eec2 libpurple/protocols/qq/file_trans.c
--- a/libpurple/protocols/qq/file_trans.c	Fri Sep 04 22:50:26 2009 +0000
+++ b/libpurple/protocols/qq/file_trans.c	Fri Sep 04 23:08:30 2009 +0000
@@ -325,7 +325,7 @@
 	}
 
 	if (bytes != bytes_expected) {
-		purple_debug_error("QQ", "qq_send_file_ctl_packet: Expected to get %d bytes, but get %d",
+		purple_debug_error("QQ", "qq_send_file_ctl_packet: Expected to get %d bytes, but get %d\n",
 				bytes_expected, bytes);
 		return;
 	}
@@ -342,7 +342,7 @@
 	guint8 *buf;
 	int buflen;
 	hex_dump = hex_dump_to_str(encrypted, encrypted_len);
-	purple_debug_info("QQ", "encrypted packet: \n%s", hex_dump);
+	purple_debug_info("QQ", "encrypted packet: \n%s\n", hex_dump);
 	g_free(hex_dump);
 	buf = g_newa(guint8, MAX_PACKET_SIZE);
 	buflen = encrypted_len;
@@ -352,7 +352,7 @@
 			purple_debug_info("QQ", "checksum ok\n");
 
 		hex_dump = hex_dump_to_str(buf, buflen);
-		purple_debug_info("QQ", "decrypted packet: \n%s", hex_dump);
+		purple_debug_info("QQ", "decrypted packet: \n%s\n", hex_dump);
 		g_free(hex_dump);
 	 } else {
 		purple_debug_info("QQ", "decrypt fail\n");
@@ -820,6 +820,6 @@
 			_qq_process_recv_file_data(gc, data + bytes, len - bytes);
 			break;
 		default:
-			purple_debug_info("QQ", "unknown packet tag");
+			purple_debug_info("QQ", "unknown packet tag\n");
 	}
 }
diff -r 33921125348d -r 9ab9e5f1eec2 libpurple/protocols/qq/group_im.c
--- a/libpurple/protocols/qq/group_im.c	Fri Sep 04 22:50:26 2009 +0000
+++ b/libpurple/protocols/qq/group_im.c	Fri Sep 04 23:08:30 2009 +0000
@@ -185,7 +185,7 @@
 	}
 
 	if (NULL == conv) {
-		purple_debug_info("QQ", "Conversion of %u is not open, missing from %d:/n%s/v",
+		purple_debug_info("QQ", "Conversion of %u is not open, missing from %d:/n%s/v\n",
 				room_id, uid_from, msg);
 		return;
 	}
diff -r 33921125348d -r 9ab9e5f1eec2 libpurple/protocols/qq/group_internal.c
--- a/libpurple/protocols/qq/group_internal.c	Fri Sep 04 22:50:26 2009 +0000
+++ b/libpurple/protocols/qq/group_internal.c	Fri Sep 04 23:08:30 2009 +0000
@@ -188,7 +188,7 @@
 	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
 	qd = (qq_data *) gc->proto_data;
 
-	purple_debug_info("QQ", "Find and remove room data, id %u", id);
+	purple_debug_info("QQ", "Find and remove room data, id %u\n", id);
 	rmd = qq_room_data_find(gc, id);
 	g_return_if_fail (rmd != NULL);
 
@@ -196,7 +196,7 @@
 	qd->groups = g_list_remove(qd->groups, rmd);
 	room_data_free(rmd);
 
-	purple_debug_info("QQ", "Find and remove chat, ext_id %u", ext_id);
+	purple_debug_info("QQ", "Find and remove chat, ext_id %u\n", ext_id);
 	num_str = g_strdup_printf("%u", ext_id);
 	chat = purple_blist_find_chat(purple_connection_get_account(gc), num_str);
 	g_free(num_str);
diff -r 33921125348d -r 9ab9e5f1eec2 libpurple/protocols/qq/qq_network.c
--- a/libpurple/protocols/qq/qq_network.c	Fri Sep 04 22:50:26 2009 +0000
+++ b/libpurple/protocols/qq/qq_network.c	Fri Sep 04 23:08:30 2009 +0000
@@ -968,7 +968,7 @@
 		qd->conn_data = purple_proxy_connect_udp(gc, account, server, port, connect_cb, gc);
 	}
 	if ( qd->conn_data == NULL ) {
-		purple_debug_error("QQ", "Couldn't create socket");
+		purple_debug_error("QQ", "Couldn't create socket\n");
 		return FALSE;
 	}
 #else
@@ -978,7 +978,7 @@
 	if(qd->use_tcp) {
 		qd->conn_data = purple_proxy_connect(gc, account, server, port, connect_cb, gc);
 		if ( qd->conn_data == NULL ) {
-			purple_debug_error("QQ", "Unable to connect.");
+			purple_debug_error("QQ", "Unable to connect.\n");
 			return FALSE;
 		}
 		return TRUE;
@@ -987,7 +987,7 @@
 	purple_debug_info("QQ", "UDP Connect to %s:%d\n", server, port);
 	qd->udp_query_data = purple_dnsquery_a(server, port, udp_host_resolved, gc);
 	if ( qd->udp_query_data == NULL ) {
-		purple_debug_error("QQ", "Could not resolve hostname");
+		purple_debug_error("QQ", "Could not resolve hostname\n");
 		return FALSE;
 	}
 #endif
diff -r 33921125348d -r 9ab9e5f1eec2 libpurple/protocols/qq/qq_process.c
--- a/libpurple/protocols/qq/qq_process.c	Fri Sep 04 22:50:26 2009 +0000
+++ b/libpurple/protocols/qq/qq_process.c	Fri Sep 04 23:08:30 2009 +0000
@@ -426,7 +426,7 @@
 	if (qd->is_show_notice) {
 		qq_got_message(gc, content);
 	} else {
-		purple_debug_info("QQ", "QQ Server notice from %s:\n%s", from, msg_utf8);
+		purple_debug_info("QQ", "QQ Server notice from %s:\n%s\n", from, msg_utf8);
 	}
 	g_free(msg_utf8);
 	g_free(title);
diff -r 33921125348d -r 9ab9e5f1eec2 libpurple/protocols/qq/send_file.c
--- a/libpurple/protocols/qq/send_file.c	Fri Sep 04 22:50:26 2009 +0000
+++ b/libpurple/protocols/qq/send_file.c	Fri Sep 04 23:08:30 2009 +0000
@@ -390,7 +390,7 @@
 	info->local_real_ip = 0x7f000001;
 	*/
 	info->local_real_ip = g_ntohl(inet_addr(purple_network_get_my_ip(-1)));
-	purple_debug_info("QQ", "local real ip is %x", info->local_real_ip);
+	purple_debug_info("QQ", "local real ip is %x\n", info->local_real_ip);
 
 	for (i = 0; i < 2; i++) {
 		sockfd = socket(PF_INET, SOCK_DGRAM, 0);
@@ -558,7 +558,7 @@
 	guint8 *raw_data;
 	gint packet_len, bytes;
 
-	purple_debug_info("_qq_send_packet_file_reject", "start");
+	purple_debug_info("_qq_send_packet_file_reject", "start\n");
 	qd = (qq_data *) gc->proto_data;
 
 	packet_len = 64;
diff -r 33921125348d -r 9ab9e5f1eec2 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Fri Sep 04 22:50:26 2009 +0000
+++ b/pidgin/gtkblist.c	Fri Sep 04 23:08:30 2009 +0000
@@ -6513,7 +6513,7 @@
 			gchar *mark, *tmp;
 			const gchar *fg_color, *font;
 			GdkColor *color = NULL;
-			PidginBlistTheme *theme = pidgin_blist_get_theme();
+			PidginBlistTheme *theme;
 			PidginThemeFont *pair;
 			gboolean selected = (gtkblist->selected_node == cnode);