cpw.maiku.media_refactor: c2b8b126: Make the backend interface's set_remote_...

maiku at pidgin.im maiku at pidgin.im
Mon Oct 26 22:46:18 EDT 2009


-----------------------------------------------------------------
Revision: c2b8b126ffcbdd61c424e9ae7c4699b9584846b4
Ancestor: 80a79eeb954ad710b7090fa8d0f6ce4afa3db9d3
Author: maiku at pidgin.im
Date: 2009-10-26T22:59:13
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/c2b8b126ffcbdd61c424e9ae7c4699b9584846b4

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

ChangeLog: 

Make the backend interface's set_remote_codecs function return gboolean.

This is to match PurpleMedia's set_remote_codecs returning gboolean.

-------------- next part --------------
============================================================
--- libpurple/media/backend-fs2.c	1b270d5b9e4f6c51cfd32b7d61438930c0583da7
+++ libpurple/media/backend-fs2.c	d1ba4749187bf014825776e6b2a156bfb22ce7f5
@@ -75,7 +75,7 @@ static GList *purple_media_backend_fs2_g
 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 @@ purple_media_backend_fs2_get_local_candi
 	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
============================================================
--- libpurple/media/backend-iface.c	e88203dee268e21a7d5081dc427a5450faf06c58
+++ libpurple/media/backend-iface.c	f4986b3f24596a44a14617a411371657c09547ec
@@ -166,14 +166,14 @@ purple_media_backend_get_local_candidate
 			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
============================================================
--- libpurple/media/backend-iface.h	8203f36157fe3f761d8843976e47dfa8dce54bb8
+++ libpurple/media/backend-iface.h	2c848daf4686df1aa5e882115d5116e3ca64e70b
@@ -58,7 +58,7 @@ struct _PurpleMediaBackendIface
 		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 @@ GList *purple_media_backend_get_local_ca
 		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,


More information about the Commits mailing list