Mercurial > pidgin3 / file diff

--- a/pidgin/gtkmedia.c	Wed Sep 18 18:24:28 2013 +0200
+++ b/pidgin/gtkmedia.c	Sat Sep 21 11:54:03 2013 +0200
@@ -598,11 +598,13 @@
 	PurpleConversation *conv = purple_find_conversation_with_account(
 			PURPLE_CONV_TYPE_ANY, gtkmedia->priv->screenname,
 			purple_media_get_account(gtkmedia->priv->media));
-	if (conv != NULL)
+	if (conv != NULL) {
 		purple_conversation_write(conv, NULL, error,
-				PURPLE_MESSAGE_ERROR, time(NULL));
-	else
-		purple_notify_error(NULL, NULL, _("Media error"), error);
+			PURPLE_MESSAGE_ERROR, time(NULL));
+	} else {
+		purple_notify_error(NULL, NULL, _("Media error"), error,
+			purple_request_cpar_from_conversation(conv));
+	}
 
 	gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
 			0, error);