aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-04-20 05:04:12 +0800
committerxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-04-20 05:04:12 +0800
commited1acc72d179e5cc12b46ef78678ecc023c30698 (patch)
tree38c09152ad71d1ad756615b4dc7114fc26387824
parenta28148cf017585cb876780863602788054b23991 (diff)
downloadgsoc2013-empathy-ed1acc72d179e5cc12b46ef78678ecc023c30698.tar
gsoc2013-empathy-ed1acc72d179e5cc12b46ef78678ecc023c30698.tar.gz
gsoc2013-empathy-ed1acc72d179e5cc12b46ef78678ecc023c30698.tar.bz2
gsoc2013-empathy-ed1acc72d179e5cc12b46ef78678ecc023c30698.tar.lz
gsoc2013-empathy-ed1acc72d179e5cc12b46ef78678ecc023c30698.tar.xz
gsoc2013-empathy-ed1acc72d179e5cc12b46ef78678ecc023c30698.tar.zst
gsoc2013-empathy-ed1acc72d179e5cc12b46ef78678ecc023c30698.zip
Replace channel closed signal with invalidated signal
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@977 4ee84921-47dd-4033-b63a-18d7a039a3e4
-rw-r--r--libempathy/empathy-tubes.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/libempathy/empathy-tubes.c b/libempathy/empathy-tubes.c
index 4b72a8da2..215c4f764 100644
--- a/libempathy/empathy-tubes.c
+++ b/libempathy/empathy-tubes.c
@@ -126,16 +126,19 @@ empathy_tubes_tube_state_changed_cb (TpChannel *channel,
static void
-empathy_tubes_channel_closed_cb (TpChannel *channel,
- gpointer data)
+empathy_tubes_channel_invalidated_cb (TpChannel *channel,
+ guint domain,
+ gint code,
+ gchar *message,
+ gpointer data)
{
EmpathyTubes *tubes = EMPATHY_TUBES (data);
EmpathyTubesPriv *priv = GET_PRIV (tubes);
- empathy_debug (DEBUG_DOMAIN, "Channel closed");
+ empathy_debug (DEBUG_DOMAIN, "Channel invalidated");
g_signal_handlers_disconnect_by_func (priv->channel,
- empathy_tubes_channel_closed_cb, tubes);
+ empathy_tubes_channel_invalidated_cb, tubes);
// disconnect tubes interface signals?
}
@@ -152,7 +155,7 @@ empathy_tubes_dispose (GObject *object)
if (priv->channel)
{
g_signal_handlers_disconnect_by_func (priv->channel,
- empathy_tubes_channel_closed_cb, object);
+ empathy_tubes_channel_invalidated_cb, object);
g_object_unref (priv->channel);
priv->channel = NULL;
}
@@ -213,8 +216,8 @@ empathy_tubes_constructor (GType type,
EmpathyTubes *tubes = EMPATHY_TUBES (object);
EmpathyTubesPriv *priv = GET_PRIV (tubes);
- g_signal_connect (priv->channel, "closed",
- G_CALLBACK (empathy_tubes_channel_closed_cb), tubes);
+ g_signal_connect (priv->channel, "invalidated",
+ G_CALLBACK (empathy_tubes_channel_invalidated_cb), tubes);
tp_cli_channel_type_tubes_connect_to_new_tube (priv->channel,
empathy_tubes_new_tube_cb, NULL, NULL, G_OBJECT (tubes), NULL);