Mercurial > pidgin.yaz
changeset 17320:0409947da92f
merge of '1f2b180ddf79376f0e3e803ced552148335c08b4'
and 'e16446bdb94621a60e1687269cf6a0bb0b0d5a45'
| author | Jeffrey Connelly <jaconnel@calpoly.edu> |
|---|---|
| date | Thu, 31 May 2007 02:17:23 +0000 |
| parents | 8a7238fb7905 (current diff) da7621e799b7 (diff) |
| children | ddcf9ef2ccec |
| files | pidgin/pixmaps/about_menu.png |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/myspace/myspace.h Wed May 30 02:56:25 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.h Thu May 31 02:17:23 2007 +0000 @@ -59,7 +59,8 @@ /* RC4 didn't make it into Libpurple 2.0.0's cipher suite, so we have * to use our own RC4 code (from Samba) by not defining this. */ -/*#define MSIM_USE_PURPLE_RC4 */ +/* RC4 is in Libpurple 2.0.1, so define this. */ +#define MSIM_USE_PURPLE_RC4 /* TODO: when RC4 makes it into libpurple, use the PURPLE_VERSION_CHECK * macro to conditionally compile. And then later, get rid of our own