[empathy] Ensure we call the empathy_sound_stop from the main thread
- From: Sjoerd Simons <sjoerds src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy] Ensure we call the empathy_sound_stop from the main thread
- Date: Wed, 26 Aug 2009 16:06:43 +0000 (UTC)
commit 2d3e3cdf6e8cf6753b9fb1167399c68f90b55c75
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date: Wed Aug 26 16:57:16 2009 +0100
Ensure we call the empathy_sound_stop from the main thread
The canberra gtk context is stored in thread-local storage, so we need to
ensure that we start and stop the sounds from the same thread.
src/empathy-call-window.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index f7ba242..fed71b9 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -1403,6 +1403,8 @@ empathy_call_window_connected (gpointer user_data)
EmpathyTpCall *call;
gboolean can_send_video;
+ empathy_sound_stop (EMPATHY_SOUND_PHONE_OUTGOING);
+
can_send_video = priv->video_input != NULL && priv->contact != NULL &&
empathy_contact_can_voip_video (priv->contact);
@@ -1471,7 +1473,6 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler,
g_timer_start (priv->timer);
priv->timer_id = g_idle_add (empathy_call_window_connected, self);
priv->call_state = CONNECTED;
- empathy_sound_stop (EMPATHY_SOUND_PHONE_OUTGOING);
}
switch (media_type)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]