Mercurial > pidgin

changeset 29178:a7cad99144f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the backend interface's set_remote_codecs function return gboolean. This is to match PurpleMedia's set_remote_codecs returning gboolean.
author maiku@pidgin.im
date Mon, 26 Oct 2009 22:59:13 +0000
parents f0966e90ec44
children a39696686dd6
files libpurple/media/backend-fs2.c libpurple/media/backend-iface.c libpurple/media/backend-iface.h
diffstat 3 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/media/backend-fs2.c	Mon Oct 26 22:50:23 2009 +0000
+++ b/libpurple/media/backend-fs2.c	Mon Oct 26 22:59:13 2009 +0000
@@ -75,7 +75,7 @@
 static GList *purple_media_backend_fs2_get_local_candidates(
 		PurpleMediaBackend *self,
 		const gchar *sess_id, const gchar *participant);
-static void purple_media_backend_fs2_set_remote_codecs(
+static gboolean purple_media_backend_fs2_set_remote_codecs(
 		PurpleMediaBackend *self,
 		const gchar *sess_id, const gchar *participant,
 		GList *codecs);
@@ -1430,11 +1430,12 @@
 	return candidates;
 }
 
-static void
+static gboolean
 purple_media_backend_fs2_set_remote_codecs(PurpleMediaBackend *self,
 		const gchar *sess_id, const gchar *participant,
 		GList *codecs)
 {
+	return FALSE;
 }
 
 static void
--- a/libpurple/media/backend-iface.c	Mon Oct 26 22:50:23 2009 +0000
+++ b/libpurple/media/backend-iface.c	Mon Oct 26 22:59:13 2009 +0000
@@ -166,14 +166,14 @@
 			sess_id, participant);
 }
 
-void
+gboolean
 purple_media_backend_set_remote_codecs(PurpleMediaBackend *self,
 		const gchar *sess_id, const gchar *participant,
 		GList *codecs)
 {
-	g_return_if_fail(PURPLE_IS_MEDIA_BACKEND(self));
-	PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->set_remote_codecs(self,
-			sess_id, participant, codecs);
+	g_return_val_if_fail(PURPLE_IS_MEDIA_BACKEND(self), FALSE);
+	return PURPLE_MEDIA_BACKEND_GET_INTERFACE(self)->set_remote_codecs(
+			self, sess_id, participant, codecs);
 }
 
 void
--- a/libpurple/media/backend-iface.h	Mon Oct 26 22:50:23 2009 +0000
+++ b/libpurple/media/backend-iface.h	Mon Oct 26 22:59:13 2009 +0000
@@ -58,7 +58,7 @@
 		const gchar *sess_id);
 	GList *(*get_local_candidates) (PurpleMediaBackend *self,
 		const gchar *sess_id, const gchar *participant);
-	void (*set_remote_codecs) (PurpleMediaBackend *self,
+	gboolean (*set_remote_codecs) (PurpleMediaBackend *self,
 		const gchar *sess_id, const gchar *participant,
 		GList *codecs);
 	void (*set_send_codec) (PurpleMediaBackend *self,
@@ -79,7 +79,7 @@
 		const gchar *sess_id);
 GList *purple_media_backend_get_local_candidates(PurpleMediaBackend *self,
 		const gchar *sess_id, const gchar *participant);
-void purple_media_backend_set_remote_codecs(PurpleMediaBackend *self,
+gboolean purple_media_backend_set_remote_codecs(PurpleMediaBackend *self,
 		const gchar *sess_id, const gchar *participant,
 		GList *codecs);
 void purple_media_backend_set_send_codec(PurpleMediaBackend *self,