diff options
| author | Andre Moreira Magalhaes (andrunko) <andrunko@andrunko.cbg.collabora.co.uk> | 2009-09-23 11:03:14 -0300 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andrunko@andrunko.cbg.collabora.co.uk> | 2009-09-23 11:03:16 -0300 |
| commit | b759628b433af376b489cd6b65db66305ac486eb (patch) | |
| tree | 1b3333eba832f5af02ca6b8ed1bfec2353ed22b1 | |
| parent | fb36d8bd7075ecfc02f53add9b1cdb2894dfdc40 (diff) | |
| parent | b1a3aeb9168a1e15375e46c5904cb5a948011a0d (diff) | |
| download | telepathy-glib-b759628b433af376b489cd6b65db66305ac486eb.tar.gz | |
Merge branch 'trivia'
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | examples/cm/callable/media-stream.c | 2 | ||||
| -rw-r--r-- | examples/cm/contactlist/contact-list-manager.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/examples/cm/callable/media-stream.c b/examples/cm/callable/media-stream.c index 3290029d1..4c19e108b 100644 --- a/examples/cm/callable/media-stream.c +++ b/examples/cm/callable/media-stream.c @@ -452,7 +452,7 @@ example_callable_media_stream_change_direction ( gboolean receiving = ((self->priv->direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE) != 0); gboolean want_to_send = - ((direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE) != 0); + ((direction & TP_MEDIA_STREAM_DIRECTION_SEND) != 0); gboolean want_to_receive = ((direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE) != 0); gboolean pending_remote_send = diff --git a/examples/cm/contactlist/contact-list-manager.c b/examples/cm/contactlist/contact-list-manager.c index 082fc30c2..05a1982f0 100644 --- a/examples/cm/contactlist/contact-list-manager.c +++ b/examples/cm/contactlist/contact-list-manager.c @@ -211,8 +211,12 @@ example_contact_list_manager_close_all (ExampleContactListManager *self) { if (self->priv->lists[i] != NULL) { - g_object_unref (self->priv->lists[i]); + ExampleContactList *list = self->priv->lists[i]; + + /* set self->priv->lists[i] to NULL here so list_closed_cb does + * not try to delete the list again */ self->priv->lists[i] = NULL; + g_object_unref (list); } } |