Mercurial > pidgin

changeset 28095:0b3142f3edb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '6a17707ef96a5fb4dde26e6700ad3e0d39c40561' and 'cf52f515f41f2668c92606c9ad852fb55460da9c'
author maiku@pidgin.im
date Tue, 25 Aug 2009 09:37:38 +0000
parents 0775b7b7298e (diff) a68f2782957a (current diff)
children b357216b7b79 7a66b8d66456
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
 				}