Better implemented empathy_tp_call_is_receiving_video and empathy_tp_call_is_sending_video.

Removed the "video-stream-changed" from EmpathyCallHandler
Corrected gtk-doc in EmpathyCallHandler.
empathy_call_window_stup_video_preview now checks the status of the
video_tee and the video_preview.
empathy_call_window_sink_added_cb does not automatically starts the
preview.

2 files changed, 5 insertions, 29 deletions

diff --git a/libempathy/empathy-call-handler.c b/libempathy/empathy-call-handler.c
index e5203f5fb..bbc1f9a88 100644
--- a/libempathy/empathy-call-handler.c
+++ b/libempathy/empathy-call-handler.c
@@ -43,7 +43,6 @@ enum {
   SINK_PAD_ADDED,
   REQUEST_RESOURCE,
   CLOSED,
-  VIDEO_STREAM_CHANGED,
   LAST_SIGNAL
 };
 
@@ -72,13 +71,6 @@ typedef struct {
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCallHandler)
 
 static void
-empathy_call_handler_call_video_stream_cb (EmpathyTpCall *call,
-    GParamSpec *property, EmpathyCallHandler *self)
-{
-  g_signal_emit (G_OBJECT (self), signals[VIDEO_STREAM_CHANGED], 0);
-}
-
-static void
 empathy_call_handler_dispose (GObject *object)
 {
   EmpathyCallHandlerPriv *priv = GET_PRIV (object);
@@ -101,8 +93,6 @@ empathy_call_handler_dispose (GObject *object)
   if (priv->call != NULL)
     {
       empathy_tp_call_close (priv->call);
-      g_signal_handlers_disconnect_by_func (priv->call,
-          empathy_call_handler_call_video_stream_cb, object);
       g_object_unref (priv->call);
     }
 
@@ -272,13 +262,6 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass)
       g_cclosure_marshal_VOID__VOID,
       G_TYPE_NONE,
       0);
-
-  signals[VIDEO_STREAM_CHANGED] =
-    g_signal_new ("video-stream-changed", G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-      g_cclosure_marshal_VOID__VOID,
-      G_TYPE_NONE,
-      0);
 }
 
 /**
@@ -531,9 +514,6 @@ empathy_call_handler_request_cb (EmpathyDispatchOperation *operation,
 
   g_object_ref (priv->call);
 
-  g_signal_connect (priv->call, "notify::video-stream",
-      G_CALLBACK (empathy_call_handler_call_video_stream_cb), self);
-
   empathy_call_handler_start_tpfs (self);
 
   empathy_tp_call_to (priv->call, priv->contact,
@@ -556,8 +536,6 @@ empathy_call_handler_start_call (EmpathyCallHandler *handler)
   if (priv->call != NULL)
     {
       empathy_call_handler_start_tpfs (handler);
-      g_signal_connect (priv->call, "notify::video-stream",
-          G_CALLBACK (empathy_call_handler_call_video_stream_cb), handler);
       empathy_tp_call_accept_incoming_call (priv->call);
       return;
     }
@@ -623,10 +601,10 @@ empathy_call_handler_stop_call (EmpathyCallHandler *handler)
  * empathy_call_handler_has_initial_video:
  * @handler: an #EmpathyCallHandler
  *
- * Determines if the call managed by this #EmpathyCallHandler was created as
- * a video conversation.
+ * Return %TRUE if the call managed by this #EmpathyCallHandler was
+ * created with video enabled
  *
- * Return value: TRUE if the call was created as a video conversation.
+ * Return value: %TRUE if the call was created as a video conversation.
  */
 gboolean
 empathy_call_handler_has_initial_video (EmpathyCallHandler *handler)
diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index bf3fe778c..a672d8a84 100644
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -687,8 +687,7 @@ empathy_tp_call_is_receiving_video (EmpathyTpCall *call)
 
   g_return_val_if_fail (EMPATHY_IS_TP_CALL (call), FALSE);
 
-  return priv->video->direction == TP_MEDIA_STREAM_DIRECTION_RECEIVE ||
-            priv->video->direction == TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL;
+  return priv->video->direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE;
 }
 
 /**
@@ -706,6 +705,5 @@ empathy_tp_call_is_sending_video (EmpathyTpCall *call)
 
   g_return_val_if_fail (EMPATHY_IS_TP_CALL (call), FALSE);
 
-  return priv->video->direction == TP_MEDIA_STREAM_DIRECTION_SEND ||
-            priv->video->direction == TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL;
+  return priv->video->direction & TP_MEDIA_STREAM_DIRECTION_SEND;
 }