empathy r822 - trunk/libempathy
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r822 - trunk/libempathy
- Date: Sat, 22 Mar 2008 19:25:33 +0000 (GMT)
Author: xclaesse
Date: Sat Mar 22 19:25:33 2008
New Revision: 822
URL: http://svn.gnome.org/viewvc/empathy?rev=822&view=rev
Log:
Disconnect invalidated signal from stream-engine when media channel is closed. Fixes bug #523766.
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 Sat Mar 22 19:25:33 2008
@@ -226,6 +226,18 @@
}
static void
+tp_call_invalidated_cb (TpProxy *stream_engine,
+ GQuark domain,
+ gint code,
+ gchar *message,
+ EmpathyTpCall *call)
+{
+ empathy_debug (DEBUG_DOMAIN, "Stream engine proxy invalidated: %s",
+ message);
+ empathy_tp_call_close_channel (call);
+}
+
+static void
tp_call_channel_closed_cb (TpChan *channel,
EmpathyTpCall *call)
{
@@ -251,6 +263,14 @@
G_CALLBACK (tp_call_stream_added_cb), call);
dbus_g_proxy_disconnect_signal (streamed_iface, "StreamRemoved",
G_CALLBACK (tp_call_stream_removed_cb), call);
+
+ if (priv->stream_engine)
+ {
+ g_signal_handlers_disconnect_by_func (priv->stream_engine,
+ tp_call_invalidated_cb, call);
+ g_object_unref (priv->stream_engine);
+ priv->stream_engine = NULL;
+ }
}
static void
@@ -499,18 +519,6 @@
}
static void
-tp_call_invalidated_cb (TpProxy *stream_engine,
- GQuark domain,
- gint code,
- gchar *message,
- EmpathyTpCall *call)
-{
- empathy_debug (DEBUG_DOMAIN, "Stream engine proxy invalidated: %s",
- message);
- empathy_tp_call_close_channel (call);
-}
-
-static void
tp_call_watch_name_owner_cb (TpDBusDaemon *daemon,
const gchar *name,
const gchar *new_owner,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]