Merge branch 'gnome-3-8'

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

diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h
index 8ad1da7208df00c91d8734d181896b528d55bf9e..5050d801e4c04df5c5bef8a58d784d6cc57fcca4 100644 (file)
--- a/src/empathy-call-handler.h
+++ b/src/empathy-call-handler.h
@@ -21,19 +21,16 @@
 #ifndef __EMPATHY_CALL_HANDLER_H__
 #define __EMPATHY_CALL_HANDLER_H__
 
-#include <glib-object.h>
+#include <farstream/fs-conference.h>
+#include <telepathy-glib/telepathy-glib.h>
 
-#include <gst/gst.h>
-#include <gst/farsight/fs-conference-iface.h>
-
-#include <telepathy-yell/telepathy-yell.h>
-
-#include <libempathy/empathy-contact.h>
+#include "empathy-contact.h"
 
 G_BEGIN_DECLS
 
 typedef struct _EmpathyCallHandler EmpathyCallHandler;
 typedef struct _EmpathyCallHandlerClass EmpathyCallHandlerClass;
+typedef struct _EmpathyCallHandlerPriv EmpathyCallHandlerPriv;
 
 struct _EmpathyCallHandlerClass {
     GObjectClass parent_class;
@@ -41,7 +38,7 @@ struct _EmpathyCallHandlerClass {
 
 struct _EmpathyCallHandler {
     GObject parent;
-    gpointer priv;
+    EmpathyCallHandlerPriv *priv;
 };
 
 GType empathy_call_handler_get_type (void);
@@ -67,7 +64,8 @@ EmpathyCallHandler * empathy_call_handler_new_for_contact (
   EmpathyContact *contact);
 
 EmpathyCallHandler * empathy_call_handler_new_for_channel (
-  TpyCallChannel *call);
+  TpCallChannel *call,
+  EmpathyContact *contact);
 
 void empathy_call_handler_start_call (EmpathyCallHandler *handler,
     gint64 timestamp);
@@ -102,6 +100,8 @@ FsCandidate * empathy_call_handler_get_video_remote_candidate (
 FsCandidate * empathy_call_handler_get_video_local_candidate (
     EmpathyCallHandler *self);
 
+EmpathyContact * empathy_call_handler_get_contact (EmpathyCallHandler *self);
+
 G_END_DECLS
 
 #endif /* #ifndef __EMPATHY_CALL_HANDLER_H__*/