# HG changeset patch
# User Jeffrey Connelly <jaconnel@calpoly.edu>
# Date 1180577843 0
# Node ID 0409947da92f9ad8faf45fc7200843c8117cd56d
# Parent  8a7238fb7905a1398772f145281c7689da3bab39# Parent  da7621e799b717241c345f95909cbc44c124c353
merge of '1f2b180ddf79376f0e3e803ced552148335c08b4'
     and 'e16446bdb94621a60e1687269cf6a0bb0b0d5a45'

diff -r 8a7238fb7905 -r 0409947da92f libpurple/protocols/myspace/myspace.h
--- 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