# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1334302744 0
# Node ID 52fb2e9551982e730304f1f24b8ad4b8e3a1609f
# Parent  1e0ded0cb2ee797e7bb895842a58b3db33a9ed80# Parent  d9d55a03ec7b2957fa0630b9c32cba2cac916504
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 6ee8e5cba5c96a1f2171038180b636724b258817)
            to branch 'im.pidgin.pidgin' (head 92cc5e21737e6702460525c581295fdd26a2380f)

diff -r d9d55a03ec7b -r 52fb2e955198 libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c	Fri Apr 06 04:30:06 2012 +0000
+++ b/libpurple/media/backend-fs2.c	Fri Apr 13 07:39:04 2012 +0000
@@ -2021,7 +2021,7 @@
 	stream->participant = g_strdup(who);
 	stream->session = session;
 	stream->stream = fsstream;
-#ifndef HAVE_FARSTREAM
+#ifndef HAVE_FARSIGHT
 	stream->supports_add = !strcmp(transmitter, "nice");
 #endif
 
diff -r d9d55a03ec7b -r 52fb2e955198 po/ChangeLog
diff -r d9d55a03ec7b -r 52fb2e955198 po/es.po
diff -r d9d55a03ec7b -r 52fb2e955198 po/ru.po
diff -r d9d55a03ec7b -r 52fb2e955198 po/sl.po