aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-02-17 05:24:38 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-02-17 05:24:38 +0800
commitdf9360528982684759437320d4d1277ccee10bba (patch)
treeeabde841108c4cecc0f26b88856355a9500addaf /src
parentd3663278d391680b6bef16f383e0fc7db8d8ac18 (diff)
downloadgsoc2013-empathy-df9360528982684759437320d4d1277ccee10bba.tar
gsoc2013-empathy-df9360528982684759437320d4d1277ccee10bba.tar.gz
gsoc2013-empathy-df9360528982684759437320d4d1277ccee10bba.tar.bz2
gsoc2013-empathy-df9360528982684759437320d4d1277ccee10bba.tar.lz
gsoc2013-empathy-df9360528982684759437320d4d1277ccee10bba.tar.xz
gsoc2013-empathy-df9360528982684759437320d4d1277ccee10bba.tar.zst
gsoc2013-empathy-df9360528982684759437320d4d1277ccee10bba.zip
Signal closed from the call-handler
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> svn path=/trunk/; revision=2478
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index dbeda722e..24d88e646 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -104,11 +104,6 @@ static void empathy_call_window_status_message (EmpathyCallWindow *window,
gchar *message);
static void
-empathy_call_window_session_created_cb (TfChannel *tfchannel,
- FsConference *conference, FsParticipant *participant,
- gpointer user_data);
-
-static void
empathy_call_window_setup_menubar (EmpathyCallWindow *self)
{
EmpathyCallWindowPriv *priv = GET_PRIV (self);
@@ -468,15 +463,6 @@ empathy_call_window_channel_closed_cb (TfChannel *channel, gpointer user_data)
}
static void
-empathy_call_window_session_created_cb (TfChannel *tfchannel,
- FsConference *conference, FsParticipant *participant,
- gpointer user_data)
-{
- g_signal_connect (G_OBJECT (tfchannel), "closed",
- G_CALLBACK (empathy_call_window_channel_closed_cb), user_data);
-}
-
-static void
empathy_call_window_src_added_cb (EmpathyCallHandler *handler,
GstPad *src, guint media_type, gpointer user_data)
{
@@ -552,8 +538,8 @@ empathy_call_window_realized_cb (GtkWidget *widget, EmpathyCallWindow *window)
g_signal_connect (priv->handler, "conference-added",
G_CALLBACK (empathy_call_window_conference_added_cb), window);
- g_signal_connect (priv->handler, "session-created",
- G_CALLBACK (empathy_call_window_session_created_cb), window);
+ g_signal_connect (priv->handler, "closed",
+ G_CALLBACK (empathy_call_window_channel_closed_cb), window);
g_signal_connect (priv->handler, "src-pad-added",
G_CALLBACK (empathy_call_window_src_added_cb), window);
g_signal_connect (priv->handler, "sink-pad-added",