Merge back from master

[empathy.git] / python / pyempathy / pyempathy.defs

diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 4ea33958822abd5078b9c274b49d044f56c98e9d..b8f0b40aa6bb42c89adc2218157baedcf19c5a6e 100644 (file)
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -206,6 +206,18 @@
   )
 )
 
+(define-flags ContactListFlags
+  (in-module "Empathy")
+  (c-name "EmpathyContactListFlags")
+  (gtype-id "EMPATHY_TYPE_CONTACT_LIST_FLAGS")
+  (values
+    '("add" "EMPATHY_CONTACT_LIST_CAN_ADD")
+    '("remove" "EMPATHY_CONTACT_LIST_CAN_REMOVE")
+    '("alias" "EMPATHY_CONTACT_LIST_CAN_ALIAS")
+    '("group" "EMPATHY_CONTACT_LIST_CAN_GROUP")
+  )
+)
+
 (define-flags DebugFlags
   (in-module "Empathy")
   (c-name "EmpathyDebugFlags")
@@ -220,6 +232,8 @@
     '("ft" "EMPATHY_DEBUG_FT")
     '("location" "EMPATHY_DEBUG_LOCATION")
     '("other" "EMPATHY_DEBUG_OTHER")
+    '("share-desktop" "EMPATHY_DEBUG_SHARE_DESKTOP")
+    '("connectivity" "EMPATHY_DEBUG_CONNECTIVITY")
   )
 )
 
@@ -259,6 +273,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 +291,12 @@
   (return-type "EmpathyAccountManager*")
 )
 
+(define-method is_ready
+  (of-object "EmpathyAccountManager")
+  (c-name "empathy_account_manager_is_ready")
+  (return-type "gboolean")
+)
+
 (define-method get_connected_accounts
   (of-object "EmpathyAccountManager")
   (c-name "empathy_account_manager_get_connected_accounts")
@@ -287,27 +309,27 @@
   (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")
   (return-type "int")
 )
 
+(define-method get_account_for_connection
+  (of-object "EmpathyAccountManager")
+  (c-name "empathy_account_manager_get_account_for_connection")
+  (return-type "EmpathyAccount*")
+  (parameters
+    '("TpConnection*" "connection")
+  )
+)
+
 (define-method get_account
   (of-object "EmpathyAccountManager")
   (c-name "empathy_account_manager_get_account")
-  (return-type "McAccount*")
+  (return-type "EmpathyAccount*")
   (parameters
-    '("TpConnection*" "connection")
+    '("const-gchar*" "unique_name")
   )
 )
 
@@ -317,19 +339,65 @@
   (return-type "GList*")
 )
 
-(define-method get_connection
+(define-method dup_connections
   (of-object "EmpathyAccountManager")
-  (c-name "empathy_account_manager_get_connection")
-  (return-type "TpConnection*")
+  (c-name "empathy_account_manager_dup_connections")
+  (return-type "GList*")
+)
+
+(define-method remove
+  (of-object "EmpathyAccountManager")
+  (c-name "empathy_account_manager_remove")
+  (return-type "none")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
-(define-method dup_connections
+(define-method request_global_presence
   (of-object "EmpathyAccountManager")
-  (c-name "empathy_account_manager_dup_connections")
-  (return-type "GList*")
+  (c-name "empathy_account_manager_request_global_presence")
+  (return-type "none")
+  (parameters
+    '("TpConnectionPresenceType" "type")
+    '("const-gchar*" "status")
+    '("const-gchar*" "message")
+  )
+)
+
+(define-method get_global_presence
+  (of-object "EmpathyAccountManager")
+  (c-name "empathy_account_manager_get_global_presence")
+  (return-type "TpConnectionPresenceType")
+  (parameters
+    '("gchar**" "status")
+    '("gchar**" "message")
+  )
+)
+
+(define-method create_account_async
+  (of-object "EmpathyAccountManager")
+  (c-name "empathy_account_manager_create_account_async")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "connection_manager")
+    '("const-gchar*" "protocol")
+    '("const-gchar*" "display_name")
+    '("GHashTable*" "parameters")
+    '("GHashTable*" "properties")
+    '("GAsyncReadyCallback" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method create_account_finish
+  (of-object "EmpathyAccountManager")
+  (c-name "empathy_account_manager_create_account_finish")
+  (return-type "EmpathyAccount*")
+  (parameters
+    '("GAsyncResult*" "result")
+    '("GError**" "error")
+  )
 )
 
 
@@ -346,7 +414,7 @@
   (is-constructor-of "EmpathyChatroom")
   (return-type "EmpathyChatroom*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -354,7 +422,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 +432,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 +440,7 @@
   (c-name "empathy_chatroom_set_account")
   (return-type "none")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -560,7 +628,7 @@
   (c-name "empathy_chatroom_manager_find")
   (return-type "EmpathyChatroom*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "room")
   )
 )
@@ -570,7 +638,7 @@
   (c-name "empathy_chatroom_manager_get_chatrooms")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -579,7 +647,7 @@
   (c-name "empathy_chatroom_manager_get_count")
   (return-type "guint")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -681,6 +749,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 +793,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 +854,7 @@
 (define-method get_account
   (of-object "EmpathyContact")
   (c-name "empathy_contact_get_account")
-  (return-type "McAccount*")
+  (return-type "EmpathyAccount*")
 )
 
 (define-method get_connection
@@ -876,6 +956,18 @@
   (return-type "gboolean")
 )
 
+(define-method can_voip_audio
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_can_voip_audio")
+  (return-type "gboolean")
+)
+
+(define-method can_voip_video
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_can_voip_video")
+  (return-type "gboolean")
+)
+
 (define-method can_send_files
   (of-object "EmpathyContact")
   (c-name "empathy_contact_can_send_files")
@@ -931,6 +1023,7 @@
     '("gsize" "len")
     '("gchar*" "format")
     '("gchar*" "token")
+    '("gchar*" "filename")
   )
 )
 
@@ -971,6 +1064,15 @@
   )
 )
 
+(define-function contact_equal
+  (c-name "empathy_contact_equal")
+  (return-type "gboolean")
+  (parameters
+    '("gconstpointer" "contact1")
+    '("gconstpointer" "contact2")
+  )
+)
+
 
 
 ;; From empathy-contact-groups.h
@@ -1098,6 +1200,12 @@
   (return-type "EmpathyContactMonitor*")
 )
 
+(define-method get_flags
+  (of-object "EmpathyContactList")
+  (c-name "empathy_contact_list_get_flags")
+  (return-type "EmpathyContactListFlags")
+)
+
 
 
 ;; From empathy-contact-manager.h
@@ -1107,6 +1215,11 @@
   (return-type "GType")
 )
 
+(define-function contact_manager_initialized
+  (c-name "empathy_contact_manager_initialized")
+  (return-type "gboolean")
+)
+
 (define-function contact_manager_dup_singleton
   (c-name "empathy_contact_manager_dup_singleton")
   (return-type "EmpathyContactManager*")
@@ -1121,10 +1234,10 @@
   )
 )
 
-(define-method can_add
+(define-method get_flags_for_connection
   (of-object "EmpathyContactManager")
-  (c-name "empathy_contact_manager_can_add")
-  (return-type "gboolean")
+  (c-name "empathy_contact_manager_get_flags_for_connection")
+  (return-type "EmpathyContactListFlags")
   (parameters
     '("TpConnection*" "connection")
   )
@@ -1178,6 +1291,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")
@@ -1623,21 +1741,6 @@
   )
 )
 
-(define-method get_use_nm
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_get_use_nm")
-  (return-type "gboolean")
-)
-
-(define-method set_use_nm
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_set_use_nm")
-  (return-type "none")
-  (parameters
-    '("gboolean" "use_nm")
-  )
-)
-
 
 
 ;; From empathy-irc-network.h
@@ -1793,7 +1896,7 @@
   (c-name "empathy_log_manager_exists")
   (return-type "gboolean")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1804,7 +1907,7 @@
   (c-name "empathy_log_manager_get_dates")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1815,7 +1918,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")
@@ -1827,7 +1930,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")
@@ -1841,7 +1944,7 @@
   (c-name "empathy_log_manager_get_chats")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -1907,7 +2010,7 @@
   (c-name "empathy_log_store_exists")
   (return-type "gboolean")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1930,7 +2033,7 @@
   (c-name "empathy_log_store_get_dates")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1941,7 +2044,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")
@@ -1953,7 +2056,7 @@
   (c-name "empathy_log_store_get_last_messages")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
     '("const-gchar*" "chat_id")
     '("gboolean" "chatroom")
   )
@@ -1964,7 +2067,7 @@
   (c-name "empathy_log_store_get_chats")
   (return-type "GList*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -1993,7 +2096,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")
@@ -2104,6 +2207,21 @@
   )
 )
 
+(define-method is_backlog
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_is_backlog")
+  (return-type "gboolean")
+)
+
+(define-method set_is_backlog
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_set_is_backlog")
+  (return-type "none")
+  (parameters
+    '("gboolean" "is_backlog")
+  )
+)
+
 (define-method should_highlight
   (of-object "EmpathyMessage")
   (c-name "empathy_message_should_highlight")
@@ -2215,6 +2333,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
@@ -2337,6 +2463,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
@@ -2660,7 +2798,7 @@
   (is-constructor-of "EmpathyTpRoomlist")
   (return-type "EmpathyTpRoomlist*")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyAccount*" "account")
   )
 )
 
@@ -2798,28 +2936,6 @@
   )
 )
 
-(define-function account_hash
-  (c-name "empathy_account_hash")
-  (return-type "guint")
-  (parameters
-    '("gconstpointer" "key")
-  )
-)
-
-(define-function account_equal
-  (c-name "empathy_account_equal")
-  (return-type "gboolean")
-  (parameters
-    '("gconstpointer" "a")
-    '("gconstpointer" "b")
-  )
-)
-
-(define-function mission_control_dup_singleton
-  (c-name "empathy_mission_control_dup_singleton")
-  (return-type "MissionControl*")
-)
-
 (define-function presence_get_default_message
   (c-name "empathy_presence_get_default_message")
   (return-type "const-gchar*")
@@ -2884,4 +3000,17 @@
   )
 )
 
+(define-function protocol_icon_name
+  (c-name "empathy_protocol_icon_name")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "protocol")
+  )
+)
+
+(define-function type_dbus_ao
+  (c-name "empathy_type_dbus_ao")
+  (return-type "GType")
+)
+