From 74974f48ea36df853098259d25727317b1048ffd Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Tue, 3 Mar 2009 17:34:03 +0000 Subject: [PATCH] Ensure to always call gtk/gdk functions while holding the gdk lock Signed-off-by: Sjoerd Simons svn path=/trunk/; revision=2550 --- src/empathy-call-window.c | 4 ++++ src/empathy.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 333b1257..a565be90 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -564,6 +564,8 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, g_object_get (priv->handler, "tp-call", &call, NULL); + gdk_threads_enter (); + if (empathy_tp_call_has_dtmf (call)) gtk_widget_set_sensitive (priv->dtmf_panel, TRUE); @@ -574,6 +576,8 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler, empathy_call_window_status_message (self, str); g_free (str); + gdk_threads_leave (); + switch (media_type) { case TP_MEDIA_STREAM_TYPE_AUDIO: diff --git a/src/empathy.c b/src/empathy.c index 0c1197a1..46b2fdb6 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -555,7 +555,9 @@ main (int argc, char *argv[]) g_signal_connect (G_OBJECT (call_factory), "new-call-handler", G_CALLBACK (new_call_handler_cb), NULL); + gdk_threads_enter (); gtk_main (); + gdk_threads_leave (); empathy_idle_set_state (idle, MC_PRESENCE_OFFLINE); -- 2.39.2