# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1238776692 0
# Node ID 4103d15e42053ffff67968a6e03c85d98b570429
# Parent  c8a495ad479b51c4ec65a0f180e9b7379151588c# Parent  beb22a90bf5db3ba28f0cf1a0d443bdfb282aad1
merge of '269d61606f225241d08360ffde046e471f03b833'
     and '8c2755d7dda295a13479b339d8c3a21851906f70'

diff -r c8a495ad479b -r 4103d15e4205 pidgin/gtkmedia.c
--- a/pidgin/gtkmedia.c	Fri Apr 03 14:13:16 2009 +0000
+++ b/pidgin/gtkmedia.c	Fri Apr 03 16:38:12 2009 +0000
@@ -28,7 +28,6 @@
 #include "internal.h"
 #include "connection.h"
 #include "media.h"
-#include "media-gst.h"
 #include "mediamanager.h"
 #include "pidgin.h"
 #include "request.h"
@@ -37,6 +36,7 @@
 #include "gtkutils.h"
 
 #ifdef USE_VV
+#include "media-gst.h"
 
 #include <gst/interfaces/xoverlay.h>