Mercurial > pidgin

changeset 29325:858d1a47bf83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compile with --disable-gstreamer.
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Mon, 23 Nov 2009 21:58:45 +0000
parents 4135044c6497
children 45a94940c122
files libpurple/media/backend-fs2.c libpurple/media/media.c
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/media/backend-fs2.c	Mon Nov 23 21:52:44 2009 +0000
+++ b/libpurple/media/backend-fs2.c	Mon Nov 23 21:58:45 2009 +0000
@@ -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 @@
 #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 @@
 	}
 #endif /* USE_VV */
 }
+#endif /* USE_GSTREAMER */
--- a/libpurple/media/media.c	Mon Nov 23 21:52:44 2009 +0000
+++ b/libpurple/media/media.c	Mon Nov 23 21:58:45 2009 +0000
@@ -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