# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1146600475 0
# Node ID 3b3430042849e07eeec873bad915cd84fd10c7bb
# Parent  963703ee5f919956f1a40447f35725e6d305786b
[gaim-migrate @ 16126]
SF Patch #1480620 from Sadrul
Small typo fix. "Conversation" -> "Conversion"

committer: Tailor Script <tailor@pidgin.im>

diff -r 963703ee5f91 -r 3b3430042849 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Tue May 02 06:36:36 2006 +0000
+++ b/src/protocols/oscar/oscar.c	Tue May 02 20:07:55 2006 +0000
@@ -384,7 +384,7 @@
 		else
 			ret = g_convert(data, datalen, "UTF-8", charsetstr, NULL, NULL, &err);
 		if (err != NULL) {
-			gaim_debug_warning("oscar", "Conversation from %s failed: %s.\n",
+			gaim_debug_warning("oscar", "Conversion from %s failed: %s.\n",
 							   charsetstr, err->message);
 			g_error_free(err);
 		}