Mercurial > pidgin.yaz

changeset 26509:4103d15e4205

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '269d61606f225241d08360ffde046e471f03b833' and '8c2755d7dda295a13479b339d8c3a21851906f70'
author Paul Aurich <paul@darkrain42.org>
date Fri, 03 Apr 2009 16:38:12 +0000
parents c8a495ad479b (current diff) beb22a90bf5d (diff)
children 57324f0a0a83 4f14455a86d2
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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>