Merge back from master

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

diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 488f5b3ac8246a4cd3d17549bf309cf706d9904b..b8f0b40aa6bb42c89adc2218157baedcf19c5a6e 100644 (file)
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -291,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
@@ -318,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")
@@ -357,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
@@ -2893,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*")
@@ -2979,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")
+)
+