[farsight2/master] msn: make session mutex not recursive

[Olivier Crête]

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

diff --git a/gst/fsmsnconference/fs-msn-session.c b/gst/fsmsnconference/fs-msn-session.c
index 280f9b8..7a832a3 100644
--- a/gst/fsmsnconference/fs-msn-session.c
+++ b/gst/fsmsnconference/fs-msn-session.c
@@ -194,7 +194,7 @@ fs_msn_session_init (FsMsnSession *self)
   self->priv->construction_error = NULL;
   self->priv->session_id = g_random_int_range (9000, 9999);
 
-  g_static_rec_mutex_init (&self->mutex);
+  g_static_mutex_init (&self->mutex);
 
   self->priv->media_type = FS_MEDIA_TYPE_LAST + 1;
 }
@@ -241,7 +241,7 @@ fs_msn_session_finalize (GObject *object)
 {
   FsMsnSession *self = FS_MSN_SESSION (object);
 
-  g_static_rec_mutex_free (&self->mutex);
+  g_static_mutex_free (&self->mutex);
 
   parent_class->finalize (object);
 }
diff --git a/gst/fsmsnconference/fs-msn-session.h b/gst/fsmsnconference/fs-msn-session.h
index ae7d743..acf4a4c 100644
--- a/gst/fsmsnconference/fs-msn-session.h
+++ b/gst/fsmsnconference/fs-msn-session.h
@@ -68,15 +68,15 @@ struct _FsMsnSession
 
   /*< private >*/
 
-  GStaticRecMutex mutex; /* Should only be accessed using the macros */
+  GStaticMutex mutex; /* Should only be accessed using the macros */
 
   FsMsnSessionPrivate *priv;
 };
 
 #define FS_MSN_SESSION_LOCK(session) \
-  g_static_rec_mutex_lock (&FS_MSN_SESSION (session)->mutex)
+  g_static_mutex_lock (&FS_MSN_SESSION (session)->mutex)
 #define FS_MSN_SESSION_UNLOCK(session) \
-  g_static_rec_mutex_unlock (&FS_MSN_SESSION (session)->mutex)
+  g_static_mutex_unlock (&FS_MSN_SESSION (session)->mutex)
 
 
 GType fs_msn_session_get_type (void);
-- 
1.5.6.5