pidgin.next.minor: 751c26dd: Fix compile with --disable-gstreamer.

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 751c26dd5e4a9b90bbec6931f1d2476831d5b409
Ancestor: b0c022ae6780dfeeb2c0a2439c80ebf9963df741
Author: sadrul at pidgin.im
Date: 2009-11-23T21:58:45
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/751c26dd5e4a9b90bbec6931f1d2476831d5b409

Modified files:
        libpurple/media/backend-fs2.c libpurple/media/media.c

ChangeLog: 

Fix compile with --disable-gstreamer.

-------------- next part --------------
============================================================
--- libpurple/media/backend-fs2.c	03f289e150d606c5bf3535e6382a2bdecd29345b
+++ libpurple/media/backend-fs2.c	e6768345910dc8f32df775fb48eade7d74c71422
@@ -24,11 +24,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "backend-fs2.h"
-
 #include "internal.h"
 
 #ifdef USE_VV
+#include "backend-fs2.h"
+
 #include "backend-iface.h"
 #include "debug.h"
 #include "network.h"
@@ -1967,7 +1967,6 @@ purple_media_backend_fs2_get_tee(PurpleM
 #endif /* USE_VV */
 	g_return_val_if_reached(NULL);
 }
-#endif /* USE_GSTREAMER */
 
 void
 purple_media_backend_fs2_set_input_volume(PurpleMediaBackendFs2 *self,
@@ -2030,3 +2029,4 @@ purple_media_backend_fs2_set_output_volu
 	}
 #endif /* USE_VV */
 }
+#endif /* USE_GSTREAMER */
============================================================
--- libpurple/media/media.c	a6f38f2695e65684cb7afa71e812ca0f87ec75e7
+++ libpurple/media/media.c	6b80fc6780d2798ba8247e7b20c6cd769d0898d4
@@ -28,13 +28,13 @@
 
 #include "account.h"
 #include "media.h"
-#include "media/backend-fs2.h"
 #include "media/backend-iface.h"
 #include "mediamanager.h"
 
 #include "debug.h"
 
 #ifdef USE_GSTREAMER
+#include "media/backend-fs2.h"
 #include "marshallers.h"
 #include "media-gst.h"
 #endif