pidgin: 8952794c: Include the media API on win32 even thou...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 8952794c1397b9cba4b98accf0639bb5499387d4
Ancestor: a1c902f30c51b755e7c047ab91f9dae471e8d007
Author: datallah at pidgin.im
Date: 2009-04-12T23:40:01
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8952794c1397b9cba4b98accf0639bb5499387d4

Modified files:
        libpurple/Makefile.mingw libpurple/media.c
        libpurple/mediamanager.c

ChangeLog: 

Include the media API on win32 even though it isn't actually enabled.

-------------- next part --------------
============================================================
--- libpurple/Makefile.mingw	3342db43f09afb0e082aeec557b87013f9c55a8b
+++ libpurple/Makefile.mingw	6dbe2689684904f93b276a15be868104d0df8aeb
@@ -35,6 +35,7 @@ C_SRC =	\
 			buddyicon.c \
 			certificate.c \
 			cipher.c \
+			circbuffer.c \
 			cmds.c \
 			connection.c \
 			conversation.c \
@@ -44,10 +45,11 @@ C_SRC =	\
 			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 @@ C_SRC =	\
 			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
============================================================
--- libpurple/media.c	0f4674bdfd96e1f502dc31232947bf2a2c4c379f
+++ libpurple/media.c	66f96142a56eff74397bc7e1c2c7b10a1280e889
@@ -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
 
============================================================
--- libpurple/mediamanager.c	c139c201fe1a005d2eb5a4c5affd0c4db6bd877d
+++ libpurple/mediamanager.c	2fafe3d7f9ea11fc9275a9114cbba9d93576c9bf
@@ -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