# HG changeset patch
# User maiku@pidgin.im
# Date 1251193058 0
# Node ID 0b3142f3edb4a8f74d32547659e7ad55aac45e3c
# Parent  0775b7b7298ebba45fa5e89a8c6b71a5315cedf1# Parent  a68f2782957a0b30e8d5877d50f2652bf6a0dbac
merge of '6a17707ef96a5fb4dde26e6700ad3e0d39c40561'
     and 'cf52f515f41f2668c92606c9ad852fb55460da9c'

diff -r a68f2782957a -r 0b3142f3edb4 libpurple/media.c
--- a/libpurple/media.c	Tue Aug 25 06:17:37 2009 +0000
+++ b/libpurple/media.c	Tue Aug 25 09:37:38 2009 +0000
@@ -2134,7 +2134,7 @@
 			GstElement *lastElement = NULL;
 			while (!GST_IS_PIPELINE(element)) {
 				if (element == media->priv->confbin) {
-					purple_media_error("media", _("Conference error."));
+					purple_media_error(media, _("Conference error."));
 					purple_media_end(media, NULL, NULL);
 					break;
 				}