Ensure to always call gtk/gdk functions while holding the gdk lock

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
svn path=/trunk/; revision=2550

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 333b1257c93b5310835ec5b1b151a35b620f4428..a565be90aaabfa2ca8980caf55fa85e053f99196 100644 (file)
--- 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);
 
 
   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);
 
   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);
 
   empathy_call_window_status_message (self, str);
   g_free (str);
 

+  gdk_threads_leave ();
+

   switch (media_type)
     {
       case TP_MEDIA_STREAM_TYPE_AUDIO:
   switch (media_type)
     {
       case TP_MEDIA_STREAM_TYPE_AUDIO:

diff --git a/src/empathy.c b/src/empathy.c
index 0c1197a1762edabd306fe1a2ff1e8e2399b18704..46b2fdb60b8efb8adf4e0705e5dd296b657fdd29 100644 (file)
--- 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);
 
        g_signal_connect (G_OBJECT (call_factory), "new-call-handler",
                G_CALLBACK (new_call_handler_cb), NULL);
 

+       gdk_threads_enter ();

        gtk_main ();
        gtk_main ();

+       gdk_threads_leave ();

 
        empathy_idle_set_state (idle, MC_PRESENCE_OFFLINE);
 
 
        empathy_idle_set_state (idle, MC_PRESENCE_OFFLINE);