include telepathy-glib.h

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

diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 4ff8ebe517ca8174ccaf7c35c05fcc78f8f544fd..45469e7b6f82ad9c95dda0e8c260612889b16ad8 100644 (file)
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -18,18 +18,15 @@
  * 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/simple-handler.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.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 "empathy-call-factory.h"
@@ -103,10 +100,12 @@ empathy_call_factory_init (EmpathyCallFactory *obj)
         NULL));
 
   tp_base_client_add_handler_capabilities_varargs (client,
-    "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp",
-    "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p",
-    "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264",
-    NULL);
+      "org.freedesktop.Telepathy.Channel.Type.Call1/audio",
+      "org.freedesktop.Telepathy.Channel.Type.Call1/video",
+      "org.freedesktop.Telepathy.Channel.Type.Call1/ice",
+      "org.freedesktop.Telepathy.Channel.Type.Call1/gtalk-p2p",
+      "org.freedesktop.Telepathy.Channel.Type.Call1/video/h264",
+      NULL);
 }
 
 static GObject *
@@ -265,7 +264,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);