cpw.maiku.media_refactor: 1f4c2359: Remove references to FsSession in Purple...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: 1f4c2359022747b140aef8e53cf96a1b1d092367
Ancestor: 6950b1b5f122f628a32eec0d596a3bc6c6dee817
Author: maiku at pidgin.im
Date: 2009-10-27T20:47:30
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/1f4c2359022747b140aef8e53cf96a1b1d092367

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

ChangeLog: 

Remove references to FsSession in PurpleMedia.

-------------- next part --------------
============================================================
--- libpurple/media/backend-fs2.c	64e5faa556d6c20ef6a11f3010c8826c7e7ae7b7
+++ libpurple/media/backend-fs2.c	32960548146f318e667bc6e5769eafe59c29fc39
@@ -1927,14 +1927,6 @@ purple_media_backend_fs2_get_conference(
 	return priv->conference;
 }
 
-FsSession *
-purple_media_backend_fs2_get_session(PurpleMediaBackendFs2 *self,
-		const gchar *sess_id)
-{
-	PurpleMediaBackendFs2Session *session = _get_session(self, sess_id);
-	return session != NULL? session->session : NULL;
-}
-
 FsStream *
 purple_media_backend_fs2_get_stream(PurpleMediaBackendFs2 *self,
 		const gchar *sess_id, const gchar *who)
============================================================
--- libpurple/media/backend-fs2.h	1a83d3b3eccb6b04cb95851f1b02d88ab9b43fc1
+++ libpurple/media/backend-fs2.h	e6d4f6d05cc17c3716c14a0776ebfc42a7a2449a
@@ -62,9 +62,6 @@ FsConference *purple_media_backend_fs2_g
 #include <gst/farsight/fs-conference-iface.h>
 FsConference *purple_media_backend_fs2_get_conference(
 		PurpleMediaBackendFs2 *self);
-FsSession *purple_media_backend_fs2_get_session(
-		PurpleMediaBackendFs2 *self,
-		const gchar *sess_id);
 FsStream *purple_media_backend_fs2_get_stream(
 		PurpleMediaBackendFs2 *self,
 		const gchar *sess_id, const gchar *who);
============================================================
--- libpurple/media/media.c	5ecd941350f045d4f437ad08a60cf078f8a58785
+++ libpurple/media/media.c	ff0e04399f0109df562dc9fc60c9330284b93e24
@@ -73,8 +73,6 @@ struct _PurpleMediaSession
 {
 	gchar *id;
 	PurpleMedia *media;
-	FsSession *session;
-
 	PurpleMediaSessionType type;
 	gboolean initiator;
 };
@@ -897,9 +895,6 @@ purple_media_add_stream(PurpleMedia *med
 
 	if (!session) {
 		session = g_new0(PurpleMediaSession, 1);
-		session->session = purple_media_backend_fs2_get_session(
-				PURPLE_MEDIA_BACKEND_FS2(media->priv->backend),
-				sess_id);
 		session->id = g_strdup(sess_id);
 		session->media = media;
 		session->type = type;