empathy r2550 - trunk/src

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Mar  3 17:34:03 2009
New Revision: 2550
URL: http://svn.gnome.org/viewvc/empathy?rev=2550&view=rev

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

Signed-off-by: Sjoerd Simons <sjoerd simons collabora co uk>

Modified:
   trunk/src/empathy-call-window.c
   trunk/src/empathy.c

Modified: trunk/src/empathy-call-window.c
==============================================================================
--- trunk/src/empathy-call-window.c	(original)
+++ trunk/src/empathy-call-window.c	Tue Mar  3 17:34:03 2009
@@ -564,6 +564,8 @@
 
   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_status_message (self, str);
   g_free (str);
 
+  gdk_threads_leave ();
+
   switch (media_type)
     {
       case TP_MEDIA_STREAM_TYPE_AUDIO:

Modified: trunk/src/empathy.c
==============================================================================
--- trunk/src/empathy.c	(original)
+++ trunk/src/empathy.c	Tue Mar  3 17:34:03 2009
@@ -555,7 +555,9 @@
 	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);