changeset 31259:531bcead5652

merge of '06e774c0ba90c7cb6ce1c2299d19bb31c24fab05' and '962710d72c1f2eb3170a63fefc39af2d5b34e6a5'
author Paul Aurich <paul@darkrain42.org>
date Thu, 24 Feb 2011 18:02:21 +0000
parents 4ef9165ebe45 (current diff) 065d7229dff8 (diff)
children 3ff4467e4b46 2a5e10237d69
files libpurple/conversation.c libpurple/conversation.h libpurple/protocols/irc/irc.c libpurple/protocols/irc/irc.h libpurple/protocols/irc/msgs.c libpurple/protocols/irc/parse.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/jabber/auth_scram.c	Tue Feb 22 04:45:54 2011 +0000
+++ b/libpurple/protocols/jabber/auth_scram.c	Thu Feb 24 18:02:21 2011 +0000
@@ -375,7 +375,7 @@
 	gchar *tmp, *tmp2;
 
 	tmp = purple_strreplace(in, "=", "=3D");
-	tmp2 = purple_strreplace(tmp, ",", "=2D");
+	tmp2 = purple_strreplace(tmp, ",", "=2C");
 	g_free(tmp);
 	return tmp2;
 }