Mercurial > pidgin

changeset 32771:52fb2e955198

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 6ee8e5cba5c96a1f2171038180b636724b258817) to branch 'im.pidgin.pidgin' (head 92cc5e21737e6702460525c581295fdd26a2380f)
author Mark Doliner <mark@kingant.net>
date Fri, 13 Apr 2012 07:39:04 +0000
parents 1e0ded0cb2ee (diff) d9d55a03ec7b (current diff)
children 638a67eb5f4f
files gaim-uninstalled.pc.in gaim.pc.in libpurple/gaim-compat.h libpurple/protocols/silc10/Makefile.am libpurple/protocols/silc10/Makefile.mingw libpurple/protocols/silc10/README libpurple/protocols/silc10/TODO libpurple/protocols/silc10/buddy.c libpurple/protocols/silc10/chat.c libpurple/protocols/silc10/ft.c libpurple/protocols/silc10/ops.c libpurple/protocols/silc10/pk.c libpurple/protocols/silc10/silc.c libpurple/protocols/silc10/silcpurple.h libpurple/protocols/silc10/util.c libpurple/protocols/silc10/wb.c libpurple/protocols/silc10/wb.h libpurple/purple-2-uninstalled.pc.in libpurple/purple-2.pc.in libpurple/purple-uninstalled.pc.in libpurple/purple.pc.in pidgin/gtkdocklet-gtk.c pidgin/gtkgaim-compat.h pidgin/pidgin-2-uninstalled.pc.in pidgin/pidgin-2.pc.in pidgin/pidgin-uninstalled.pc.in pidgin/pidgin.pc.in
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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