merge of '182125d7b7fc17f7e78885d2e6eaf736383d595f'

Fri, 02 Jan 2009 07:42:04 +0000

author
Daniel Atallah <datallah@pidgin.im>
date
Fri, 02 Jan 2009 07:42:04 +0000
changeset 25334
77afd547b676
parent 25333
182125d7b7fc (current diff)
parent 25282
ffe5ffe9f876 (diff)
child 25335
f1039393e25a

merge of '182125d7b7fc17f7e78885d2e6eaf736383d595f'
and 'ffe5ffe9f876aa9eb382ff478baebe3e332a9a0a'

--- a/libpurple/proxy.c	Thu Jan 01 23:17:11 2009 +0000
+++ b/libpurple/proxy.c	Fri Jan 02 07:42:04 2009 +0000
@@ -621,7 +621,7 @@
 	if (!PURPLE_PROXY_CONNECT_DATA_IS_VALID(connect_data))
 		return;
 
-	purple_debug_info("proxy", "Connected to %s:%d.\n",
+	purple_debug_info("proxy", "Connecting to %s:%d.\n",
 					connect_data->host, connect_data->port);
 
 	/*

mercurial