[farsight2/master] msnsession: Conference must always set before get_property
Olivier Crête
olivier.crete at collabora.co.uk
Wed Aug 12 11:28:26 PDT 2009
---
gst/fsmsnconference/fs-msn-session.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/gst/fsmsnconference/fs-msn-session.c b/gst/fsmsnconference/fs-msn-session.c
index 167156e..5cb8c1c 100644
--- a/gst/fsmsnconference/fs-msn-session.c
+++ b/gst/fsmsnconference/fs-msn-session.c
@@ -277,7 +277,7 @@ fs_msn_session_get_property (GObject *object,
FsMsnSession *self = FS_MSN_SESSION (object);
FsMsnConference *conference = fs_msn_session_get_conference (self, NULL);
- if (!conference && !(pspec->flags & G_PARAM_CONSTRUCT_ONLY))
+ if (!conference)
return;
switch (prop_id)
@@ -327,8 +327,7 @@ fs_msn_session_get_property (GObject *object,
break;
}
- if (conference)
- gst_object_unref (conference);
+ gst_object_unref (conference);
}
static void
--
1.5.6.5
More information about the farsight-commits
mailing list