summaryrefslogtreecommitdiff
path: root/pidgin/gtkmedia.c
diff options
context:
space:
mode:
Diffstat (limited to 'pidgin/gtkmedia.c')
-rw-r--r--pidgin/gtkmedia.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/pidgin/gtkmedia.c b/pidgin/gtkmedia.c
index d91a951061..33567ea7cf 100644
--- a/pidgin/gtkmedia.c
+++ b/pidgin/gtkmedia.c
@@ -42,7 +42,9 @@
#include <gdk/gdkwin32.h>
#endif
+#if !GST_CHECK_VERSION(1,0,0)
#include <gst/interfaces/xoverlay.h>
+#endif
#define PIDGIN_TYPE_MEDIA (pidgin_media_get_type())
#define PIDGIN_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PIDGIN_TYPE_MEDIA, PidginMedia))
@@ -589,6 +591,9 @@ pidgin_media_error_cb(PidginMedia *media, const char *error, PidginMedia *gtkmed
if (conv != NULL)
purple_conversation_write(conv, NULL, error,
PURPLE_MESSAGE_ERROR, time(NULL));
+ else
+ purple_notify_error(NULL, NULL, _("Media error"), error);
+
gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
0, error);
}