empathy r670 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Feb 26 13:31:26 2008
New Revision: 670
URL: http://svn.gnome.org/viewvc/empathy?rev=670&view=rev

Log:
Avoid calling Close() on the media channel if it's already closed.


Modified:
   trunk/libempathy/empathy-tp-call.c

Modified: trunk/libempathy/empathy-tp-call.c
==============================================================================
--- trunk/libempathy/empathy-tp-call.c	(original)
+++ trunk/libempathy/empathy-tp-call.c	Tue Feb 26 13:31:26 2008
@@ -833,6 +833,9 @@
   EmpathyTpCallPriv *priv = GET_PRIV (call);
   GError *error = NULL;
 
+  if (priv->status == EMPATHY_TP_CALL_STATUS_CLOSED)
+      return;
+
   empathy_debug (DEBUG_DOMAIN, "Closing channel");
 
   if (!tp_chan_close (DBUS_G_PROXY (priv->channel), &error))
@@ -841,6 +844,8 @@
           error ? error->message : "No error given");
       g_clear_error (&error);
     }
+  else
+        priv->status = EMPATHY_TP_CALL_STATUS_CLOSED;
 }
 
 void