From 3c325292c4321da02ee0bc44a047202905767cc2 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Mon, 21 Feb 2011 15:27:33 +0000 Subject: Don't use tpy_call_channel_is_receiving_video Rely on src-pad-added to show the remote user's video. --- src/empathy-call-window.c | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) (limited to 'src') diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 01c7dd4e0..7d7b43c68 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -273,9 +273,6 @@ static void empathy_call_window_restart_call (EmpathyCallWindow *window); static void empathy_call_window_status_message (EmpathyCallWindow *window, gchar *message); -static void empathy_call_window_update_avatars_visibility (TpyCallChannel *call, - EmpathyCallWindow *window); - static gboolean empathy_call_window_bus_message (GstBus *bus, GstMessage *message, gpointer user_data); @@ -1660,14 +1657,6 @@ empathy_call_window_class_init ( PROP_CALL_HANDLER, param_spec); } -static void -empathy_call_window_video_stream_changed_cb (TpyCallChannel *call, - GParamSpec *property, EmpathyCallWindow *self) -{ - DEBUG ("video stream changed"); - empathy_call_window_update_avatars_visibility (call, self); -} - void empathy_call_window_dispose (GObject *object) { @@ -2443,10 +2432,6 @@ empathy_call_window_connected (gpointer user_data) g_object_get (priv->handler, "call-channel", &call, NULL); - tp_g_signal_connect_object (call, "notify::video-stream", - G_CALLBACK (empathy_call_window_video_stream_changed_cb), - self, 0); - if (tpy_call_channel_has_dtmf (call)) gtk_widget_set_sensitive (priv->dtmf_panel, TRUE); @@ -2467,7 +2452,8 @@ empathy_call_window_connected (gpointer user_data) gtk_widget_set_sensitive (priv->mic_button, TRUE); - empathy_call_window_update_avatars_visibility (call, self); + gtk_widget_hide (priv->video_output); + gtk_widget_show (priv->remote_user_avatar_widget); g_object_unref (call); @@ -2768,24 +2754,6 @@ empathy_call_window_bus_message (GstBus *bus, GstMessage *message, return TRUE; } -static void -empathy_call_window_update_avatars_visibility (TpyCallChannel *call, - EmpathyCallWindow *window) -{ - EmpathyCallWindowPriv *priv = GET_PRIV (window); - - if (tpy_call_channel_is_receiving_video (call)) - { - gtk_widget_hide (priv->remote_user_avatar_widget); - gtk_widget_show (priv->video_output); - } - else - { - gtk_widget_hide (priv->video_output); - gtk_widget_show (priv->remote_user_avatar_widget); - } -} - static void call_handler_notify_call_cb (EmpathyCallHandler *handler, GParamSpec *spec, -- cgit v1.2.3