Update the python bindings

2 files changed, 137 insertions, 101 deletions

diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index ed19c7a96..6b6f7dfd3 100644
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -259,6 +259,8 @@
     '("tp-error" "EMPATHY_FT_ERROR_TP_ERROR")
     '("socket" "EMPATHY_FT_ERROR_SOCKET")
     '("not-supported" "EMPATHY_FT_ERROR_NOT_SUPPORTED")
+    '("invalid-source-file" "EMPATHY_FT_ERROR_INVALID_SOURCE_FILE")
+    '("empty-source-file" "EMPATHY_FT_ERROR_EMPTY_SOURCE_FILE")
   )
 )
 
@@ -275,6 +277,15 @@
   (return-type "EmpathyAccountManager*")
 )
 
+(define-method create
+  (of-object "EmpathyAccountManager")
+  (c-name "empathy_account_manager_create")
+  (return-type "EmpathyAccount*")
+  (parameters
+    '("McProfile*" "profile")
+  )
+)
+
 (define-method get_connected_accounts
   (of-object "EmpathyAccountManager")
   (c-name "empathy_account_manager_get_connected_accounts")
@@ -287,15 +298,6 @@
   (return-type "int")
 )
 
-(define-method is_account_just_connected
-  (of-object "EmpathyAccountManager")
-  (c-name "empathy_account_manager_is_account_just_connected")
-  (return-type "gboolean")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
 (define-method get_count
   (of-object "EmpathyAccountManager")
   (c-name "empathy_account_manager_get_count")
@@ -305,25 +307,25 @@
 (define-method get_account
   (of-object "EmpathyAccountManager")
   (c-name "empathy_account_manager_get_account")
-  (return-type "McAccount*")
+  (return-type "EmpathyAccount*")
   (parameters
     '("TpConnection*" "connection")
   )
 )
 
-(define-method dup_accounts
+(define-method lookup
   (of-object "EmpathyAccountManager")
-  (c-name "empathy_account_manager_dup_accounts")
-  (return-type "GList*")
+  (c-name "empathy_account_manager_lookup")
+  (return-type "EmpathyAccount*")
+  (parameters
+    '("const-gchar*" "unique_name")
+  )
 )
 
-(define-method get_connection
+(define-method dup_accounts
   (of-object "EmpathyAccountManager")
-  (c-name "empathy_account_manager_get_connection")
-  (return-type "TpConnection*")
-  (parameters
-    '("McAccount*" "account")
-  )
+  (c-name "empathy_account_manager_dup_accounts")
+  (return-type "GList*")
 )
 
 (define-method dup_connections
@@ -332,6 +334,15 @@
   (return-type "GList*")
 )
 
+(define-method remove
+  (of-object "EmpathyAccountManager")
+  (c-name "empathy_account_manager_remove")
+  (return-type "none")
+  (parameters
+    '("EmpathyAccount*" "account")
+  )
+)
+
 
 
 ;; From empathy-chatroom.h
@@ -346,7 +357,7 @@
   (is-constructor-of "EmpathyChatroom")
   (return-type "EmpathyChatroom*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -354,7 +365,7 @@
   (c-name "empathy_chatroom_new_full")
   (return-type "EmpathyChatroom*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "room")
     '("const-gchar*" "name")
     '("gboolean" "auto_connect")
@@ -364,7 +375,7 @@
 (define-method get_account
   (of-object "EmpathyChatroom")
   (c-name "empathy_chatroom_get_account")
-  (return-type "McAccount*")
+  (return-type "EmpathyAccount*")
 )
 
 (define-method set_account
@@ -372,7 +383,7 @@
   (c-name "empathy_chatroom_set_account")
   (return-type "none")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -560,7 +571,7 @@
   (c-name "empathy_chatroom_manager_find")
   (return-type "EmpathyChatroom*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "room")
   )
 )
@@ -570,7 +581,7 @@
   (c-name "empathy_chatroom_manager_get_chatrooms")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -579,7 +590,7 @@
   (c-name "empathy_chatroom_manager_get_count")
   (return-type "guint")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -681,6 +692,18 @@
   (return-type "none")
 )
 
+(define-method stop_call
+  (of-object "EmpathyCallHandler")
+  (c-name "empathy_call_handler_stop_call")
+  (return-type "none")
+)
+
+(define-method has_initial_video
+  (of-object "EmpathyCallHandler")
+  (c-name "empathy_call_handler_has_initial_video")
+  (return-type "gboolean")
+)
+
 (define-method bus_message
   (of-object "EmpathyCallHandler")
   (c-name "empathy_call_handler_bus_message")
@@ -713,7 +736,7 @@
   (c-name "empathy_contact_new_for_log")
   (return-type "EmpathyContact*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "id")
     '("const-gchar*" "name")
     '("gboolean" "is_user")
@@ -774,7 +797,7 @@
 (define-method get_account
   (of-object "EmpathyContact")
   (c-name "empathy_contact_get_account")
-  (return-type "McAccount*")
+  (return-type "EmpathyAccount*")
 )
 
 (define-method get_connection
@@ -972,6 +995,15 @@
   )
 )
 
+(define-function contact_equal
+  (c-name "empathy_contact_equal")
+  (return-type "gboolean")
+  (parameters
+    '("gconstpointer" "contact1")
+    '("gconstpointer" "contact2")
+  )
+)
+
 
 
 ;; From empathy-contact-groups.h
@@ -1179,6 +1211,11 @@
   (varargs #t)
 )
 
+(define-function debug_free
+  (c-name "empathy_debug_free")
+  (return-type "none")
+)
+
 (define-function debug_set_flags
   (c-name "empathy_debug_set_flags")
   (return-type "none")
@@ -1794,7 +1831,7 @@
   (c-name "empathy_log_manager_exists")
   (return-type "gboolean")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1805,7 +1842,7 @@
   (c-name "empathy_log_manager_get_dates")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1816,7 +1853,7 @@
   (c-name "empathy_log_manager_get_messages_for_date")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
     '("const-gchar*" "date")
@@ -1828,7 +1865,7 @@
   (c-name "empathy_log_manager_get_filtered_messages")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
     '("guint" "num_messages")
@@ -1842,7 +1879,7 @@
   (c-name "empathy_log_manager_get_chats")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -1908,7 +1945,7 @@
   (c-name "empathy_log_store_exists")
   (return-type "gboolean")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1931,7 +1968,7 @@
   (c-name "empathy_log_store_get_dates")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1942,7 +1979,7 @@
   (c-name "empathy_log_store_get_messages_for_date")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
     '("const-gchar*" "date")
@@ -1954,7 +1991,7 @@
   (c-name "empathy_log_store_get_last_messages")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1965,7 +2002,7 @@
   (c-name "empathy_log_store_get_chats")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -1994,7 +2031,7 @@
   (c-name "empathy_log_store_get_filtered_messages")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
     '("guint" "num_messages")
@@ -2216,6 +2253,14 @@
   (return-type "none")
 )
 
+(define-function status_presets_is_valid
+  (c-name "empathy_status_presets_is_valid")
+  (return-type "gboolean")
+  (parameters
+    '("TpConnectionPresenceType" "state")
+  )
+)
+
 
 
 ;; From empathy-time.h
@@ -2338,6 +2383,18 @@
   (return-type "gboolean")
 )
 
+(define-method is_receiving_video
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_is_receiving_video")
+  (return-type "gboolean")
+)
+
+(define-method is_sending_video
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_is_sending_video")
+  (return-type "gboolean")
+)
+
 
 
 ;; From empathy-tp-chat.h
@@ -2661,7 +2718,7 @@
   (is-constructor-of "EmpathyTpRoomlist")
   (return-type "EmpathyTpRoomlist*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index cf85c7853..377eea43a 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -290,7 +290,7 @@
 (define-method dup_account
   (of-object "EmpathyAccountChooser")
   (c-name "empathy_account_chooser_dup_account")
-  (return-type "McAccount*")
+  (return-type "EmpathyAccount*")
 )
 
 (define-method get_connection
@@ -304,7 +304,7 @@
   (c-name "empathy_account_chooser_set_account")
   (return-type "gboolean")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -333,11 +333,11 @@
   )
 )
 
-(define-function account_chooser_filter_is_connected
+(define-method chooser_filter_is_connected
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_chooser_filter_is_connected")
   (return-type "gboolean")
   (parameters
-    '("McAccount*" "account")
     '("gpointer" "user_data")
   )
 )
@@ -346,22 +346,22 @@
 
 ;; From empathy-account-widget.h
 
-(define-function account_widget_handle_params
+(define-method widget_handle_params
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_widget_handle_params")
   (return-type "none")
   (parameters
-    '("McAccount*" "account")
     '("GtkBuilder*" "gui")
     '("const-gchar*" "first_widget")
   )
   (varargs #t)
 )
 
-(define-function account_widget_add_forget_button
+(define-method widget_add_forget_button
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_widget_add_forget_button")
   (return-type "none")
   (parameters
-    '("McAccount*" "account")
     '("GtkBuilder*" "gui")
     '("const-gchar*" "button")
     '("const-gchar*" "entry")
@@ -377,102 +377,72 @@
   )
 )
 
-(define-function account_widget_generic_new
+(define-method widget_generic_new
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_widget_generic_new")
-  (is-constructor-of "EmpathyAccountWidgetGeneric")
   (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
 )
 
-(define-function account_widget_salut_new
+(define-method widget_salut_new
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_widget_salut_new")
-  (is-constructor-of "EmpathyAccountWidgetSalut")
   (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
 )
 
-(define-function account_widget_msn_new
+(define-method widget_msn_new
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_widget_msn_new")
-  (is-constructor-of "EmpathyAccountWidgetMsn")
   (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
 )
 
-(define-function account_widget_jabber_new
+(define-method widget_jabber_new
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_widget_jabber_new")
-  (is-constructor-of "EmpathyAccountWidgetJabber")
   (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
 )
 
-(define-function account_widget_icq_new
+(define-method widget_icq_new
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_widget_icq_new")
-  (is-constructor-of "EmpathyAccountWidgetIcq")
   (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
 )
 
-(define-function account_widget_aim_new
+(define-method widget_aim_new
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_widget_aim_new")
-  (is-constructor-of "EmpathyAccountWidgetAim")
   (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
 )
 
-(define-function account_widget_yahoo_new
+(define-method widget_yahoo_new
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_widget_yahoo_new")
-  (is-constructor-of "EmpathyAccountWidgetYahoo")
   (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
 )
 
-(define-function account_widget_groupwise_new
+(define-method widget_groupwise_new
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_widget_groupwise_new")
-  (is-constructor-of "EmpathyAccountWidgetGroupwise")
   (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
 )
 
 
 
 ;; From empathy-account-widget-irc.h
 
-(define-function account_widget_irc_new
+(define-method widget_irc_new
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_widget_irc_new")
-  (is-constructor-of "EmpathyAccountWidgetIrc")
   (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
 )
 
 
 
 ;; From empathy-account-widget-sip.h
 
-(define-function account_widget_sip_new
+(define-method widget_sip_new
+  (of-object "EmpathyAccount")
   (c-name "empathy_account_widget_sip_new")
-  (is-constructor-of "EmpathyAccountWidgetSip")
   (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
 )
 
 
@@ -615,7 +585,7 @@
 (define-method get_account
   (of-object "EmpathyChat")
   (c-name "empathy_chat_get_account")
-  (return-type "McAccount*")
+  (return-type "EmpathyAccount*")
 )
 
 (define-method get_id
@@ -695,6 +665,15 @@
   (return-type "gboolean")
 )
 
+(define-method set_show_contacts
+  (of-object "EmpathyChat")
+  (c-name "empathy_chat_set_show_contacts")
+  (return-type "none")
+  (parameters
+    '("gboolean" "show")
+  )
+)
+
 
 
 ;; From empathy-chat-text-view.h
@@ -1521,7 +1500,7 @@
   (c-name "empathy_log_window_show")
   (return-type "GtkWidget*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
     '("GtkWindow*" "parent")
@@ -1807,7 +1786,7 @@
   (c-name "empathy_icon_name_from_account")
   (return-type "const-gchar*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )