diff libpurple/mediamanager.c @ 26425:90c65a8575bf

Make it compile with --disable-vv... again!
author Mike Ruprecht <maiku@soc.pidgin.im>
date Fri, 03 Apr 2009 19:28:00 +0000
parents 86c5499f36e8
children df9042312063
line wrap: on
line diff
--- a/libpurple/mediamanager.c	Fri Apr 03 15:57:25 2009 +0000
+++ b/libpurple/mediamanager.c	Fri Apr 03 19:28:00 2009 +0000
@@ -67,7 +67,6 @@
 	gulong window_id;
 	GstElement *sink;
 };
-#endif
 
 struct _PurpleMediaManagerPrivate
 {
@@ -100,10 +99,12 @@
 	LAST_SIGNAL
 };
 static guint purple_media_manager_signals[LAST_SIGNAL] = {0};
+#endif
 
 GType
 purple_media_manager_get_type()
 {
+#ifdef USE_VV
 	static GType type = 0;
 
 	if (type == 0) {
@@ -122,9 +123,12 @@
 		type = g_type_register_static(G_TYPE_OBJECT, "PurpleMediaManager", &info, 0);
 	}
 	return type;
+#else
+	return G_TYPE_NONE;
+#endif
 }
 
-
+#ifdef USE_VV
 static void
 purple_media_manager_class_init (PurpleMediaManagerClass *klass)
 {
@@ -165,6 +169,7 @@
 	}
 	parent_class->finalize(media);
 }
+#endif
 
 PurpleMediaManager *
 purple_media_manager_get()
@@ -837,7 +842,7 @@
 			PURPLE_MEDIA_CAPS_NONE);
 	return manager->priv->ui_caps;
 #else
-	return PURPLE_CAPS_NONE;
+	return PURPLE_MEDIA_CAPS_NONE;
 #endif
 }
 
@@ -909,6 +914,7 @@
 	GObject parent;
 };
 
+#ifdef USE_VV
 struct _PurpleMediaElementInfoPrivate
 {
 	gchar *id;
@@ -1048,6 +1054,13 @@
 
 G_DEFINE_TYPE(PurpleMediaElementInfo,
 		purple_media_element_info, G_TYPE_OBJECT);
+#else
+GType
+purple_media_element_info_get_type()
+{
+	return G_TYPE_NONE;
+}
+#endif
 
 gchar *
 purple_media_element_info_get_id(PurpleMediaElementInfo *info)