Mercurial > pidgin.yaz
changeset 27816:f2d96d120309
propagate from branch 'im.pidgin.pidgin' (head dce402944e0c7e7fce6947885af42ba1ea7d8a25)
to branch 'im.pidgin.pidgin.yaz' (head 4d43d7b719d8114beac80fa62df9590009a0bf9e)
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Wed, 02 Apr 2008 04:58:28 +0000 |
| parents | 8e14188032a9 (current diff) 2784043ec24d (diff) |
| children | 3c26ef82d556 |
| files | configure.ac |
| diffstat | 4 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Apr 01 02:54:44 2008 +0000 +++ b/ChangeLog Wed Apr 02 04:58:28 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
--- a/configure.ac Tue Apr 01 02:54:44 2008 +0000 +++ b/configure.ac Wed Apr 02 04:58:28 2008 +0000 @@ -46,8 +46,8 @@ m4_define([purple_lt_current], [4]) m4_define([purple_major_version], [2]) m4_define([purple_minor_version], [4]) -m4_define([purple_micro_version], [1]) -m4_define([purple_version_suffix], []) +m4_define([purple_micro_version], [2]) +m4_define([purple_version_suffix], [devel]) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) @@ -55,8 +55,8 @@ m4_define([gnt_lt_current], [4]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [4]) -m4_define([gnt_micro_version], [1]) -m4_define([gnt_version_suffix], []) +m4_define([gnt_micro_version], [2]) +m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
--- a/finch/libgnt/configure.ac Tue Apr 01 02:54:44 2008 +0000 +++ b/finch/libgnt/configure.ac Wed Apr 02 04:58:28 2008 +0000 @@ -27,8 +27,8 @@ m4_define([gnt_lt_current], [4]) m4_define([gnt_major_version], [2]) m4_define([gnt_minor_version], [4]) -m4_define([gnt_micro_version], [1]) -m4_define([gnt_version_suffix], []) +m4_define([gnt_micro_version], [2]) +m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
--- a/libpurple/protocols/myspace/myspace.c Tue Apr 01 02:54:44 2008 +0000 +++ b/libpurple/protocols/myspace/myspace.c Wed Apr 02 04:58:28 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);