Merge back from master

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

diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 6b6f7dfd32fe9dc08ce73ee267029c3ca61e19f5..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")
   )
 )
 
@@ -277,13 +291,10 @@
   (return-type "EmpathyAccountManager*")
 )
 
-(define-method create
+(define-method is_ready
   (of-object "EmpathyAccountManager")
-  (c-name "empathy_account_manager_create")
-  (return-type "EmpathyAccount*")
-  (parameters
-    '("McProfile*" "profile")
-  )
+  (c-name "empathy_account_manager_is_ready")
+  (return-type "gboolean")
 )
 
 (define-method get_connected_accounts
@@ -304,18 +315,18 @@
   (return-type "int")
 )
 
-(define-method get_account
+(define-method get_account_for_connection
   (of-object "EmpathyAccountManager")
-  (c-name "empathy_account_manager_get_account")
+  (c-name "empathy_account_manager_get_account_for_connection")
   (return-type "EmpathyAccount*")
   (parameters
     '("TpConnection*" "connection")
   )
 )
 
-(define-method lookup
+(define-method get_account
   (of-object "EmpathyAccountManager")
-  (c-name "empathy_account_manager_lookup")
+  (c-name "empathy_account_manager_get_account")
   (return-type "EmpathyAccount*")
   (parameters
     '("const-gchar*" "unique_name")
@@ -343,6 +354,52 @@
   )
 )
 
+(define-method request_global_presence
+  (of-object "EmpathyAccountManager")
+  (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")
+  )
+)
+
 
 
 ;; From empathy-chatroom.h
@@ -899,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")
@@ -1131,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
@@ -1140,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*")
@@ -1154,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")
   )
@@ -1661,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
@@ -2142,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")
@@ -2856,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*")
@@ -2942,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")
+)
+