[farsight2/master] msn: Remove session's id prop, its always 1

[Olivier Crête]

---
 gst/fsmsnconference/fs-msn-conference.c |    2 +-
 gst/fsmsnconference/fs-msn-session.c    |    5 +----
 gst/fsmsnconference/fs-msn-session.h    |    3 ---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/gst/fsmsnconference/fs-msn-conference.c b/gst/fsmsnconference/fs-msn-conference.c
index d158bff..6204b5d 100644
--- a/gst/fsmsnconference/fs-msn-conference.c
+++ b/gst/fsmsnconference/fs-msn-conference.c
@@ -232,7 +232,7 @@ fs_msn_conference_new_session (FsBaseConference *conf,
 
   GST_OBJECT_UNLOCK (self);
 
-  new_session = fs_msn_session_new (media_type, self, 1, error);
+  new_session = fs_msn_session_new (media_type, self, error);
 
   if (new_session)
   {
diff --git a/gst/fsmsnconference/fs-msn-session.c b/gst/fsmsnconference/fs-msn-session.c
index 9928de9..280f9b8 100644
--- a/gst/fsmsnconference/fs-msn-session.c
+++ b/gst/fsmsnconference/fs-msn-session.c
@@ -260,7 +260,7 @@ fs_msn_session_get_property (GObject *object,
       g_value_set_enum (value, self->priv->media_type);
       break;
     case PROP_ID:
-      g_value_set_uint (value, self->id);
+      g_value_set_uint (value, 1);
       break;
     case PROP_CONFERENCE:
       g_value_set_object (value, self->priv->conference);
@@ -317,7 +317,6 @@ fs_msn_session_set_property (GObject *object,
       self->priv->media_type = g_value_get_enum (value);
       break;
     case PROP_ID:
-      self->id = g_value_get_uint (value);
       break;
     case PROP_CONFERENCE:
       self->priv->conference = FS_MSN_CONFERENCE (g_value_dup_object (value));
@@ -470,13 +469,11 @@ fs_msn_session_new_stream (FsSession *session,
 FsMsnSession *
 fs_msn_session_new (FsMediaType media_type,
     FsMsnConference *conference,
-    guint id,
     GError **error)
 {
   FsMsnSession *session = g_object_new (FS_TYPE_MSN_SESSION,
       "media-type", media_type,
       "conference", conference,
-      "id", id,
       NULL);
 
   if (!session)
diff --git a/gst/fsmsnconference/fs-msn-session.h b/gst/fsmsnconference/fs-msn-session.h
index 8e48db7..ae7d743 100644
--- a/gst/fsmsnconference/fs-msn-session.h
+++ b/gst/fsmsnconference/fs-msn-session.h
@@ -66,8 +66,6 @@ struct _FsMsnSession
 {
   FsSession parent;
 
-  guint id;
-
   /*< private >*/
 
   GStaticRecMutex mutex; /* Should only be accessed using the macros */
@@ -85,7 +83,6 @@ GType fs_msn_session_get_type (void);
 
 FsMsnSession *fs_msn_session_new (FsMediaType media_type,
     FsMsnConference *conference,
-    guint id,
     GError **error);
 
 void fs_msn_session_new_recv_pad (FsMsnSession *session,
-- 
1.5.6.5