include telepathy-glib.h

[empathy.git] / src / empathy-call-handler.c

diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index 703ed3299b74f0a25981dca1a1689c7fb1e2aae5..3b870be07659d512d71c121467fb852f76471be1 100644 (file)
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -18,18 +18,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <telepathy-farstream/telepathy-farstream.h>
 
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-tp-contact-factory.h>
 
 #include <libempathy-gtk/empathy-call-utils.h>
 
@@ -911,11 +909,22 @@ empathy_call_handler_start_call (EmpathyCallHandler *handler,
     {
       empathy_call_handler_start_tpfs (handler);
 
-      if (tp_call_channel_get_state (priv->call, NULL, NULL, NULL) ==
-          TP_CALL_STATE_INITIALISED)
-        tp_call_channel_accept_async (priv->call, on_call_accepted_cb, NULL);
+      if (tp_channel_get_requested (TP_CHANNEL (priv->call)))
+        {
+          /* accept outgoing channels immediately */
+          tp_call_channel_accept_async (priv->call,
+              on_call_accepted_cb, NULL);
+        }
       else
-        priv->accept_when_initialised = TRUE;
+        {
+          /* accepting incoming channels when they are INITIALISED */
+          if (tp_call_channel_get_state (priv->call, NULL, NULL, NULL) ==
+              TP_CALL_STATE_INITIALISED)
+            tp_call_channel_accept_async (priv->call,
+                on_call_accepted_cb, NULL);
+          else
+            priv->accept_when_initialised = TRUE;
+        }
 
       return;
     }
@@ -1040,3 +1049,9 @@ empathy_call_handler_get_video_local_candidate (
 
   return priv->video_local_candidate;
 }
+
+EmpathyContact *
+empathy_call_handler_get_contact (EmpathyCallHandler *self)
+{
+  return self->priv->contact;
+}