# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1207088733 0
# Node ID dcfe7a855d7e6f9f72bd78c75afed297ba69014d
# Parent  8b952cb84f4556bb439c210af0ea058321eaa0bc# Parent  c7742b830585cd93f28d17c4ceb60f5f555a906d
merge of '2eb97f7d46ac5955e6a217661513d28e3b5ce060'
     and '4ae935a838132794ea30db892805e76c69e4a45e'

diff -r 8b952cb84f45 -r dcfe7a855d7e ChangeLog
--- a/ChangeLog	Mon Mar 31 22:01:43 2008 +0000
+++ b/ChangeLog	Tue Apr 01 22:25:33 2008 +0000
@@ -1,5 +1,9 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.x.x:
+	libpurple:
+	* In MySpaceIM, messages from spambots are discarded (Justin Williams)
+
 version 2.4.1 (03/31/2008):
 	http://developer.pidgin.im/query?status=closed&milestone=2.4.1
 
diff -r 8b952cb84f45 -r dcfe7a855d7e libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Mon Mar 31 22:01:43 2008 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Tue Apr 01 22:25:33 2008 +0000
@@ -688,6 +688,13 @@
 	username = msim_msg_get_string(msg, "_username");
 	g_return_val_if_fail(username != NULL, FALSE);
 
+	if (msim_is_userid(username)) {
+		purple_debug_info("msim", "Ignoring message from spambot (%s) on account %s\n",
+				username, purple_account_get_username(session->account));
+		g_free(username);
+		return FALSE;
+	}
+
 	msg_msim_markup = msim_msg_get_string(msg, "msg");
 	g_return_val_if_fail(msg_msim_markup != NULL, FALSE);