changeset 26645:75b473f216f2

Include the media API on win32 even though it isn't actually enabled.
author Daniel Atallah <daniel.atallah@gmail.com>
date Sun, 12 Apr 2009 23:40:01 +0000
parents 16e2f915e3a0
children 8c3b1a059ecc
files libpurple/Makefile.mingw libpurple/media.c libpurple/mediamanager.c
diffstat 3 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/Makefile.mingw	Sun Apr 12 22:42:38 2009 +0000
+++ b/libpurple/Makefile.mingw	Sun Apr 12 23:40:01 2009 +0000
@@ -35,6 +35,7 @@
 			buddyicon.c \
 			certificate.c \
 			cipher.c \
+			circbuffer.c \
 			cmds.c \
 			connection.c \
 			conversation.c \
@@ -44,10 +45,11 @@
 			dnssrv.c \
 			eventloop.c \
 			ft.c \
-			circbuffer.c \
 			idle.c \
 			imgstore.c \
 			log.c \
+			media.c \
+			mediamanager.c \
 			mime.c \
 			nat-pmp.c \
 			network.c \
@@ -66,22 +68,22 @@
 			server.c \
 			signals.c \
 			smiley.c \
-			sound.c \
+			sound-theme-loader.c \
 			sound-theme.c \
-			sound-theme-loader.c \
+			sound.c \
 			sslconn.c \
 			status.c \
 			stringref.c \
 			stun.c \
-			theme.c \
 			theme-loader.c \
 			theme-manager.c \
+			theme.c \
 			upnp.c \
 			util.c \
 			value.c \
 			version.c \
+			whiteboard.c \
 			xmlnode.c \
-			whiteboard.c \
 			win32/giowin32.c \
 			win32/libc_interface.c \
 			win32/win32dep.c
--- a/libpurple/media.c	Sun Apr 12 22:42:38 2009 +0000
+++ b/libpurple/media.c	Sun Apr 12 23:40:01 2009 +0000
@@ -29,7 +29,6 @@
 #include "internal.h"
 
 #include "account.h"
-#include "marshallers.h"
 #include "media.h"
 #include "mediamanager.h"
 #include "network.h"
@@ -37,6 +36,7 @@
 #include "debug.h"
 
 #ifdef USE_GSTREAMER
+#include "marshallers.h"
 #include "media-gst.h"
 #endif
 
--- a/libpurple/mediamanager.c	Sun Apr 12 22:42:38 2009 +0000
+++ b/libpurple/mediamanager.c	Sun Apr 12 23:40:01 2009 +0000
@@ -28,11 +28,11 @@
 
 #include "account.h"
 #include "debug.h"
-#include "marshallers.h"
 #include "media.h"
 #include "mediamanager.h"
 
 #ifdef USE_GSTREAMER
+#include "marshallers.h"
 #include "media-gst.h"
 #endif