add an header bar to the main window

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

diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 95c828d94d43fddcfbd8be4c0171152123eb03b4..3b57761d94c04f7a4dcf34c502c7c8b162503048 100644 (file)
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -19,25 +19,16 @@
  */
 
 #include "config.h"
+#include "empathy-client-factory.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/simple-handler.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-tp-contact-factory.h>
-#include <libempathy/empathy-utils.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "empathy-call-factory.h"
 #include "empathy-call-handler.h"
+#include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, TP_TYPE_BASE_CLIENT)
 
@@ -143,7 +134,7 @@ empathy_call_factory_class_init (EmpathyCallFactoryClass *klass)
       NULL, NULL,
       g_cclosure_marshal_generic,
       G_TYPE_NONE,
-      2, EMPATHY_TYPE_CALL_HANDLER, G_TYPE_BOOLEAN);
+      2, EMPATHY_TYPE_CALL_HANDLER, G_TYPE_UINT64);
 
   signals[INCOMING_CALL] =
     g_signal_new ("incoming-call",
@@ -172,7 +163,7 @@ empathy_call_factory_initialise (void)
   self = EMPATHY_CALL_FACTORY (g_object_new (EMPATHY_TYPE_CALL_FACTORY,
       "account-manager", am,
       "factory", factory,
-      "name", EMPATHY_CALL_BUS_NAME_SUFFIX,
+      "name", EMPATHY_CALL_TP_BUS_NAME_SUFFIX,
       NULL));
 
   g_object_unref (am);
@@ -226,7 +217,7 @@ handle_channels (TpBaseClient *client,
       handler = empathy_call_handler_new_for_channel (call, contact);
 
       g_signal_emit (self, signals[NEW_CALL_HANDLER], 0,
-          handler, FALSE);
+          handler, user_action_time);
 
       g_object_unref (handler);
       g_object_unref (contact);
@@ -268,7 +259,7 @@ approve_channels (TpBaseClient *client,
   EmpathyCallFactory *self = EMPATHY_CALL_FACTORY (client);
   TpCallChannel *channel;
   guint handle;
-  GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "" };
+  GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "" };
   gboolean handled = FALSE;
 
   channel = find_call_channel (channels);