aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-08-26 23:57:16 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-08-26 23:57:16 +0800
commit2d3e3cdf6e8cf6753b9fb1167399c68f90b55c75 (patch)
treeace21023bd692e2ee618382089b7392be9d1d5d0
parentcb4361a992c348f7c57ec75afb1c642fba20fb15 (diff)
downloadgsoc2013-empathy-2d3e3cdf6e8cf6753b9fb1167399c68f90b55c75.tar
gsoc2013-empathy-2d3e3cdf6e8cf6753b9fb1167399c68f90b55c75.tar.gz
gsoc2013-empathy-2d3e3cdf6e8cf6753b9fb1167399c68f90b55c75.tar.bz2
gsoc2013-empathy-2d3e3cdf6e8cf6753b9fb1167399c68f90b55c75.tar.lz
gsoc2013-empathy-2d3e3cdf6e8cf6753b9fb1167399c68f90b55c75.tar.xz
gsoc2013-empathy-2d3e3cdf6e8cf6753b9fb1167399c68f90b55c75.tar.zst
gsoc2013-empathy-2d3e3cdf6e8cf6753b9fb1167399c68f90b55c75.zip
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.
-rw-r--r--src/empathy-call-window.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index f7ba24232..fed71b995 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)