Merge call branch from Elliot Fairweather with cleanups from Xavier Claessens.

svn path=/trunk/; revision=632

3 files changed, 26 insertions, 56 deletions

diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 116248f70..8d8f7c7ea 100644
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -158,9 +158,10 @@
   (c-name "EmpathyTpCallStatus")
   (gtype-id "EMPATHY_TYPE_TP_CALL_STATUS")
   (values
-    '("preparing" "EMPATHY_TP_CALL_STATUS_PREPARING")
-    '("ringing" "EMPATHY_TP_CALL_STATUS_RINGING")
-    '("running" "EMPATHY_TP_CALL_STATUS_RUNNING")
+    '("readying" "EMPATHY_TP_CALL_STATUS_READYING")
+    '("pending" "EMPATHY_TP_CALL_STATUS_PENDING")
+    '("accepted" "EMPATHY_TP_CALL_STATUS_ACCEPTED")
+    '("closed" "EMPATHY_TP_CALL_STATUS_CLOSED")
   )
 )
 
@@ -1333,87 +1334,54 @@
   (is-constructor-of "EmpathyTpCall")
   (return-type "EmpathyTpCall*")
   (parameters
-    '("McAccount*" "account")
-    '("TpChan*" "tp_chan")
+    '("TpConn*" "connection")
+    '("TpChan*" "channel")
   )
 )
 
-(define-method is_incoming
-  (of-object "EmpathyTpCall")
-  (c-name "empathy_tp_call_is_incoming")
-  (return-type "gboolean")
-)
-
-(define-method get_status
+(define-method accept_incoming_call
   (of-object "EmpathyTpCall")
-  (c-name "empathy_tp_call_get_status")
-  (return-type "EmpathyTpCallStatus")
-)
-
-(define-method get_contact
-  (of-object "EmpathyTpCall")
-  (c-name "empathy_tp_call_get_contact")
-  (return-type "EmpathyContact*")
-)
-
-(define-method accept
-  (of-object "EmpathyTpCall")
-  (c-name "empathy_tp_call_accept")
-  (return-type "none")
-)
-
-(define-method invite
-  (of-object "EmpathyTpCall")
-  (c-name "empathy_tp_call_invite")
+  (c-name "empathy_tp_call_accept_incoming_call")
   (return-type "none")
-  (parameters
-    '("EmpathyContact*" "contact")
-  )
 )
 
-(define-method request_streams
+(define-method close_channel
   (of-object "EmpathyTpCall")
-  (c-name "empathy_tp_call_request_streams")
+  (c-name "empathy_tp_call_close_channel")
   (return-type "none")
-  (parameters
-    '("gboolean" "audio")
-    '("gboolean" "video")
-  )
 )
 
-(define-method send_video
+(define-method request_video_stream_direction
   (of-object "EmpathyTpCall")
-  (c-name "empathy_tp_call_send_video")
+  (c-name "empathy_tp_call_request_video_stream_direction")
   (return-type "none")
   (parameters
-    '("gboolean" "send")
+    '("gboolean" "is_sending")
   )
 )
 
-(define-method add_preview_window
-  (of-object "EmpathyTpCall")
-  (c-name "empathy_tp_call_add_preview_window")
+(define-function empathy_tp_call_add_preview_video
+  (c-name "empathy_tp_call_add_preview_video")
   (return-type "none")
   (parameters
-    '("guint" "socket_id")
+    '("guint" "preview_video_socket_id")
   )
 )
 
-(define-method remove_preview_window
-  (of-object "EmpathyTpCall")
-  (c-name "empathy_tp_call_remove_preview_window")
+(define-function empathy_tp_call_remove_preview_video
+  (c-name "empathy_tp_call_remove_preview_video")
   (return-type "none")
   (parameters
-    '("guint" "socket_id")
+    '("guint" "preview_video_socket_id")
   )
 )
 
-(define-method set_output_window
+(define-method add_output_video
   (of-object "EmpathyTpCall")
-  (c-name "empathy_tp_call_set_output_window")
+  (c-name "empathy_tp_call_add_output_video")
   (return-type "none")
   (parameters
-    '("guint" "socket_id")
+    '("guint" "output_video_socket_id")
   )
 )
 
diff --git a/python/pyempathy/pyempathy.override b/python/pyempathy/pyempathy.override
index 7425972ea..7a7e6820d 100644
--- a/python/pyempathy/pyempathy.override
+++ b/python/pyempathy/pyempathy.override
@@ -17,6 +17,7 @@ headers
 #include "empathy-message.h"
 #include "empathy-status-presets.h"
 #include "empathy-time.h"
+#include "empathy-tp-call.h"
 #include "empathy-tp-chat.h"
 #include "empathy-tp-chatroom.h"
 #include "empathy-tp-contact-factory.h"
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index 8b7929e3d..0d5a3e5ca 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -443,8 +443,9 @@
 
 ;; From empathy-call-window.h
 
-(define-function empathy_call_window_show
-  (c-name "empathy_call_window_show")
+(define-function empathy_call_window_new
+  (c-name "empathy_call_window_new")
+  (is-constructor-of "EmpathyCallWindow")
   (return-type "GtkWidget*")
   (parameters
     '("EmpathyTpCall*" "call")