pidgin: e4b10961: Make it compile with --disable-vv... aga...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: e4b10961a2266d17625787c506f1b258ffa97873
Ancestor: 8c2755d7dda295a13479b339d8c3a21851906f70
Author: maiku at soc.pidgin.im
Date: 2009-04-03T19:28:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e4b10961a2266d17625787c506f1b258ffa97873

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

ChangeLog: 

Make it compile with --disable-vv... again!

-------------- next part --------------
============================================================
--- libpurple/media.c	586162d6cfeb980fd4f6043561d9884383e2a7d7
+++ libpurple/media.c	a524e919d4dac7fad86ab5a802547bb495c50afc
@@ -655,6 +655,7 @@ struct _PurpleMediaCandidate
 	GObject parent;
 };
 
+#ifdef USE_VV
 struct _PurpleMediaCandidatePrivate
 {
 	gchar *foundation;
@@ -929,6 +930,13 @@ G_DEFINE_TYPE(PurpleMediaCandidate,
 
 G_DEFINE_TYPE(PurpleMediaCandidate,
 		purple_media_candidate, G_TYPE_OBJECT);
+#else
+GType
+purple_media_candidate_get_type()
+{
+	return G_TYPE_NONE;
+}
+#endif
 
 PurpleMediaCandidate *
 purple_media_candidate_new(const gchar *foundation, guint component_id,
@@ -948,6 +956,7 @@ purple_media_candidate_copy(PurpleMediaC
 static PurpleMediaCandidate *
 purple_media_candidate_copy(PurpleMediaCandidate *candidate)
 {
+#ifdef USE_VV
 	PurpleMediaCandidatePrivate *priv;
 	PurpleMediaCandidate *new_candidate;
 
@@ -967,6 +976,9 @@ purple_media_candidate_copy(PurpleMediaC
 			"password", priv->password,
 			"ttl", priv->ttl, NULL);
 	return new_candidate;
+#else
+	return NULL;
+#endif
 }
 
 #ifdef USE_VV
@@ -1240,6 +1252,7 @@ struct _PurpleMediaCodec
 	GObject parent;
 };
 
+#ifdef USE_VV
 struct _PurpleMediaCodecPrivate
 {
 	gint id;
@@ -1408,6 +1421,13 @@ G_DEFINE_TYPE(PurpleMediaCodec,
 
 G_DEFINE_TYPE(PurpleMediaCodec,
 		purple_media_codec, G_TYPE_OBJECT);
+#else
+GType
+purple_media_codec_get_type()
+{
+	return G_TYPE_NONE;
+}
+#endif
 
 guint
 purple_media_codec_get_id(PurpleMediaCodec *codec)
@@ -1458,6 +1478,7 @@ purple_media_codec_add_optional_paramete
 purple_media_codec_add_optional_parameter(PurpleMediaCodec *codec,
 		const gchar *name, const gchar *value)
 {
+#ifdef USE_VV
 	PurpleMediaCodecPrivate *priv;
 	PurpleKeyValuePair *new_param;
 
@@ -1471,12 +1492,14 @@ purple_media_codec_add_optional_paramete
 	new_param->value = g_strdup(value);
 	priv->optional_params = g_list_append(
 			priv->optional_params, new_param);
+#endif
 }
 
 void
 purple_media_codec_remove_optional_parameter(PurpleMediaCodec *codec,
 		PurpleKeyValuePair *param)
 {
+#ifdef USE_VV
 	PurpleMediaCodecPrivate *priv;
 
 	g_return_if_fail(codec != NULL && param != NULL);
@@ -1489,12 +1512,14 @@ purple_media_codec_remove_optional_param
 
 	priv->optional_params =
 			g_list_remove(priv->optional_params, param);
+#endif
 }
 
 PurpleKeyValuePair *
 purple_media_codec_get_optional_parameter(PurpleMediaCodec *codec,
 		const gchar *name, const gchar *value)
 {
+#ifdef USE_VV
 	PurpleMediaCodecPrivate *priv;
 	GList *iter;
 
@@ -1510,6 +1535,7 @@ purple_media_codec_get_optional_paramete
 				!g_ascii_strcasecmp(param->value, value)))
 			return param;
 	}
+#endif
 
 	return NULL;
 }
@@ -1530,6 +1556,7 @@ purple_media_codec_copy(PurpleMediaCodec
 static PurpleMediaCodec *
 purple_media_codec_copy(PurpleMediaCodec *codec)
 {
+#ifdef USE_VV
 	PurpleMediaCodecPrivate *priv;
 	PurpleMediaCodec *new_codec;
 	GList *iter;
@@ -1551,6 +1578,9 @@ purple_media_codec_copy(PurpleMediaCodec
 	}
 
 	return new_codec;
+#else
+	return NULL;
+#endif
 }
 
 #ifdef USE_VV
============================================================
--- libpurple/mediamanager.c	08f2901451e6efec56a3c0d1bb2d5b36a5b9b19d
+++ libpurple/mediamanager.c	c88c26079b495e11ede51095e95ccc228146f09a
@@ -67,7 +67,6 @@ struct _PurpleMediaOutputWindow
 	gulong window_id;
 	GstElement *sink;
 };
-#endif
 
 struct _PurpleMediaManagerPrivate
 {
@@ -100,10 +99,12 @@ static guint purple_media_manager_signal
 	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 @@ purple_media_manager_get_type()
 		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 @@ purple_media_manager_finalize (GObject *
 	}
 	parent_class->finalize(media);
 }
+#endif
 
 PurpleMediaManager *
 purple_media_manager_get()
@@ -837,7 +842,7 @@ purple_media_manager_get_ui_caps(PurpleM
 			PURPLE_MEDIA_CAPS_NONE);
 	return manager->priv->ui_caps;
 #else
-	return PURPLE_CAPS_NONE;
+	return PURPLE_MEDIA_CAPS_NONE;
 #endif
 }
 
@@ -909,6 +914,7 @@ struct _PurpleMediaElementInfo
 	GObject parent;
 };
 
+#ifdef USE_VV
 struct _PurpleMediaElementInfoPrivate
 {
 	gchar *id;
@@ -1048,6 +1054,13 @@ G_DEFINE_TYPE(PurpleMediaElementInfo,
 
 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)