# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1209374864 0
# Node ID 474a510587ff7805c3d42e5c245b43d425810fc2
# Parent  8c3f6126759c9e65c0034fed02515d043672e656# Parent  eeee264cd3254cf0e417b7d712279c620ed38e24
propagate from branch 'im.pidgin.pidgin' (head 5f1a220f63d8e85758a94a2ed57381dc91b07eda)
            to branch 'im.pidgin.pidgin.yaz' (head a4a6bb9cbd4b1222fe18e3d22b9b5c7680df59a0)

diff -r eeee264cd325 -r 474a510587ff libpurple/protocols/jabber/chat.c
--- a/libpurple/protocols/jabber/chat.c	Mon Apr 28 09:04:10 2008 +0000
+++ b/libpurple/protocols/jabber/chat.c	Mon Apr 28 09:27:44 2008 +0000
@@ -238,6 +238,8 @@
 		char *buf = g_strdup_printf(_("%s is not a valid room handle"), handle);
 		purple_notify_error(gc, _("Invalid Room Handle"),
 				_("Invalid Room Handle"), buf);
+		g_free(buf);
+		return;
 	}
 
 	if(jabber_chat_find(js, room, server))
diff -r eeee264cd325 -r 474a510587ff libpurple/protocols/oscar/util.c
--- a/libpurple/protocols/oscar/util.c	Mon Apr 28 09:04:10 2008 +0000
+++ b/libpurple/protocols/oscar/util.c	Mon Apr 28 09:27:44 2008 +0000
@@ -156,7 +156,7 @@
 		return FALSE;
 
 	for (i = 0; sn[i] != '\0'; i++) {
-		if (!isalnum(sn[i]) && (sn[i] != ' ') && (sn[i] != '.'))
+		if (!isalnum(sn[i]) && (sn[i] != ' '))
 			return FALSE;
 	}