Update python bindings

svn path=/trunk/; revision=1433

3 files changed, 1835 insertions, 1828 deletions

diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 8de52c000..8f5cc0f8b 100644
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -150,35 +150,6 @@
 
 ;; Enumerations and flags ...
 
-(define-flags DebugFlags
-  (in-module "Empathy")
-  (c-name "EmpathyDebugFlags")
-  (gtype-id "EMPATHY_TYPE_DEBUG_FLAGS")
-  (values
-    '("tp" "EMPATHY_DEBUG_TP")
-    '("chat" "EMPATHY_DEBUG_CHAT")
-    '("contact" "EMPATHY_DEBUG_CONTACT")
-    '("account" "EMPATHY_DEBUG_ACCOUNT")
-    '("irc" "EMPATHY_DEBUG_IRC")
-    '("dispatcher" "EMPATHY_DEBUG_DISPATCHER")
-    '("other" "EMPATHY_DEBUG_OTHER")
-  )
-)
-
-(define-enum RegExType
-  (in-module "Empathy")
-  (c-name "EmpathyRegExType")
-  (gtype-id "EMPATHY_TYPE_REG_EX_TYPE")
-  (values
-    '("as-is" "EMPATHY_REGEX_AS_IS")
-    '("browser" "EMPATHY_REGEX_BROWSER")
-    '("apt" "EMPATHY_REGEX_APT")
-    '("email" "EMPATHY_REGEX_EMAIL")
-    '("other" "EMPATHY_REGEX_OTHER")
-    '("all" "EMPATHY_REGEX_ALL")
-  )
-)
-
 (define-flags Capabilities
   (in-module "Empathy")
   (c-name "EmpathyCapabilities")
@@ -204,6 +175,21 @@
   )
 )
 
+(define-flags DebugFlags
+  (in-module "Empathy")
+  (c-name "EmpathyDebugFlags")
+  (gtype-id "EMPATHY_TYPE_DEBUG_FLAGS")
+  (values
+    '("tp" "EMPATHY_DEBUG_TP")
+    '("chat" "EMPATHY_DEBUG_CHAT")
+    '("contact" "EMPATHY_DEBUG_CONTACT")
+    '("account" "EMPATHY_DEBUG_ACCOUNT")
+    '("irc" "EMPATHY_DEBUG_IRC")
+    '("dispatcher" "EMPATHY_DEBUG_DISPATCHER")
+    '("other" "EMPATHY_DEBUG_OTHER")
+  )
+)
+
 (define-enum TpCallStatus
   (in-module "Empathy")
   (c-name "EmpathyTpCallStatus")
@@ -216,482 +202,114 @@
   )
 )
 
-
-;; From empathy-time.h
-
-(define-function time_get_current
-  (c-name "empathy_time_get_current")
-  (return-type "time_t")
-)
-
-(define-function time_get_local_time
-  (c-name "empathy_time_get_local_time")
-  (return-type "time_t")
-  (parameters
-    '("struct-tm*" "tm")
-  )
-)
-
-(define-function time_parse
-  (c-name "empathy_time_parse")
-  (return-type "time_t")
-  (parameters
-    '("const-gchar*" "str")
-  )
-)
-
-(define-function time_to_string_utc
-  (c-name "empathy_time_to_string_utc")
-  (return-type "gchar*")
-  (parameters
-    '("time_t" "t")
-    '("const-gchar*" "format")
-  )
-)
-
-(define-function time_to_string_local
-  (c-name "empathy_time_to_string_local")
-  (return-type "gchar*")
-  (parameters
-    '("time_t" "t")
-    '("const-gchar*" "format")
-  )
-)
-
-
-
-;; From empathy-status-presets.h
-
-(define-function status_presets_get_all
-  (c-name "empathy_status_presets_get_all")
-  (return-type "none")
-)
-
-(define-function status_presets_get
-  (c-name "empathy_status_presets_get")
-  (return-type "GList*")
-  (parameters
-    '("McPresence" "state")
-    '("gint" "max_number")
-  )
-)
-
-(define-function status_presets_set_last
-  (c-name "empathy_status_presets_set_last")
-  (return-type "none")
-  (parameters
-    '("McPresence" "state")
-    '("const-gchar*" "status")
-  )
-)
-
-(define-function status_presets_remove
-  (c-name "empathy_status_presets_remove")
-  (return-type "none")
-  (parameters
-    '("McPresence" "state")
-    '("const-gchar*" "status")
-  )
-)
-
-(define-function status_presets_reset
-  (c-name "empathy_status_presets_reset")
-  (return-type "none")
-)
-
-(define-function status_presets_get_default_state
-  (c-name "empathy_status_presets_get_default_state")
-  (return-type "McPresence")
-)
-
-(define-function status_presets_get_default_status
-  (c-name "empathy_status_presets_get_default_status")
-  (return-type "const-gchar*")
-)
-
-(define-function status_presets_set_default
-  (c-name "empathy_status_presets_set_default")
-  (return-type "none")
-  (parameters
-    '("McPresence" "state")
-    '("const-gchar*" "status")
-  )
-)
-
-(define-function status_presets_clear_default
-  (c-name "empathy_status_presets_clear_default")
-  (return-type "none")
-)
-
-
-
-;; From empathy-debug.h
-
-(define-function debug_flag_is_set
-  (c-name "empathy_debug_flag_is_set")
-  (return-type "gboolean")
-  (parameters
-    '("EmpathyDebugFlags" "flag")
-  )
-)
-
-(define-function debug
-  (c-name "empathy_debug")
-  (return-type "none")
-  (parameters
-    '("EmpathyDebugFlags" "flag")
-    '("const-gchar*" "format")
-  )
-  (varargs #t)
-)
-
-(define-function debug_set_flags
-  (c-name "empathy_debug_set_flags")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "flags_string")
-  )
-)
-
-
-
-;; From empathy-utils.h
-
-(define-function substring
-  (c-name "empathy_substring")
-  (return-type "gchar*")
-  (parameters
-    '("const-gchar*" "str")
-    '("gint" "start")
-    '("gint" "end")
-  )
-)
-
-(define-function regex_match
-  (c-name "empathy_regex_match")
-  (return-type "gint")
-  (parameters
-    '("EmpathyRegExType" "type")
-    '("const-gchar*" "msg")
-    '("GArray*" "start")
-    '("GArray*" "end")
-  )
-)
-
-(define-function strcasecmp
-  (c-name "empathy_strcasecmp")
-  (return-type "gint")
-  (parameters
-    '("const-gchar*" "s1")
-    '("const-gchar*" "s2")
-  )
-)
-
-(define-function strncasecmp
-  (c-name "empathy_strncasecmp")
-  (return-type "gint")
-  (parameters
-    '("const-gchar*" "s1")
-    '("const-gchar*" "s2")
-    '("gsize" "n")
-  )
-)
-
-(define-function xml_validate
-  (c-name "empathy_xml_validate")
-  (return-type "gboolean")
-  (parameters
-    '("xmlDoc*" "doc")
-    '("const-gchar*" "dtd_filename")
-  )
-)
-
-(define-function xml_node_get_child
-  (c-name "empathy_xml_node_get_child")
-  (return-type "xmlNodePtr")
-  (parameters
-    '("xmlNodePtr" "node")
-    '("const-gchar*" "child_name")
-  )
-)
-
-(define-function xml_node_get_child_content
-  (c-name "empathy_xml_node_get_child_content")
-  (return-type "xmlChar*")
-  (parameters
-    '("xmlNodePtr" "node")
-    '("const-gchar*" "child_name")
-  )
-)
-
-(define-function xml_node_find_child_prop_value
-  (c-name "empathy_xml_node_find_child_prop_value")
-  (return-type "xmlNodePtr")
-  (parameters
-    '("xmlNodePtr" "node")
-    '("const-gchar*" "prop_name")
-    '("const-gchar*" "prop_value")
-  )
-)
-
-(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_new
-  (c-name "empathy_mission_control_new")
-  (is-constructor-of "EmpathyMissionControl")
-  (return-type "MissionControl*")
-)
-
-(define-function presence_get_default_message
-  (c-name "empathy_presence_get_default_message")
-  (return-type "const-gchar*")
-  (parameters
-    '("McPresence" "presence")
-  )
-)
-
-(define-function presence_to_str
-  (c-name "empathy_presence_to_str")
-  (return-type "const-gchar*")
-  (parameters
-    '("McPresence" "presence")
-  )
-)
-
-(define-function presence_from_str
-  (c-name "empathy_presence_from_str")
-  (return-type "McPresence")
-  (parameters
-    '("const-gchar*" "str")
-  )
-)
-
-(define-function file_lookup
-  (c-name "empathy_file_lookup")
-  (return-type "gchar*")
-  (parameters
-    '("const-gchar*" "filename")
-    '("const-gchar*" "subdir")
-  )
-)
-
-(define-function run_until_ready
-  (c-name "empathy_run_until_ready")
-  (return-type "none")
-  (parameters
-    '("gpointer" "object")
-  )
-)
-
-(define-function run_until_ready_full
-  (c-name "empathy_run_until_ready_full")
-  (return-type "none")
-  (parameters
-    '("gpointer" "object")
-    '("const-gchar*" "signal")
-    '("EmpathyRunUntilReadyFunc" "func")
-    '("gpointer" "user_data")
-    '("GMainLoop**" "loop")
-  )
-)
-
-(define-function channel_get_account
-  (c-name "empathy_channel_get_account")
-  (return-type "McAccount*")
-  (parameters
-    '("TpChannel*" "channel")
-  )
-)
-
-(define-function connect_to_account_status_changed
-  (c-name "empathy_connect_to_account_status_changed")
-  (return-type "gpointer")
-  (parameters
-    '("MissionControl*" "mc")
-    '("GCallback" "handler")
-    '("gpointer" "user_data")
-    '("GClosureNotify" "free_func")
-  )
-)
-
-(define-function disconnect_account_status_changed
-  (c-name "empathy_disconnect_account_status_changed")
-  (return-type "none")
-  (parameters
-    '("gpointer" "token")
-  )
-)
-
-(define-function proxy_equal
-  (c-name "empathy_proxy_equal")
-  (return-type "gboolean")
-  (parameters
-    '("gconstpointer" "a")
-    '("gconstpointer" "b")
-  )
-)
-
-(define-function proxy_hash
-  (c-name "empathy_proxy_hash")
-  (return-type "guint")
-  (parameters
-    '("gconstpointer" "key")
-  )
-)
-
-(define-function connection_request_channel
-  (c-name "empathy_connection_request_channel")
-  (return-type "none")
-  (parameters
-    '("TpConnection*" "proxy")
-    '("gint" "timeout_ms")
-    '("const-gchar*" "channel_type")
-    '("guint" "handle_type")
-    '("const-gchar*" "name")
-    '("gboolean" "suppress_handler")
-    '("empathy_connection_callback_for_request_channel" "callback")
-    '("gpointer" "user_data")
-    '("GDestroyNotify" "destroy")
-    '("GObject*" "weak_object")
+(define-enum RegExType
+  (in-module "Empathy")
+  (c-name "EmpathyRegExType")
+  (gtype-id "EMPATHY_TYPE_REG_EX_TYPE")
+  (values
+    '("as-is" "EMPATHY_REGEX_AS_IS")
+    '("browser" "EMPATHY_REGEX_BROWSER")
+    '("apt" "EMPATHY_REGEX_APT")
+    '("email" "EMPATHY_REGEX_EMAIL")
+    '("other" "EMPATHY_REGEX_OTHER")
+    '("all" "EMPATHY_REGEX_ALL")
   )
 )
 
 
+;; From empathy-chatroom.h
 
-;; From empathy-message.h
-
-(define-function message_get_type
-  (c-name "empathy_message_get_type")
+(define-function chatroom_get_type
+  (c-name "empathy_chatroom_get_type")
   (return-type "GType")
 )
 
-(define-function message_new
-  (c-name "empathy_message_new")
-  (is-constructor-of "EmpathyMessage")
-  (return-type "EmpathyMessage*")
+(define-function chatroom_new
+  (c-name "empathy_chatroom_new")
+  (is-constructor-of "EmpathyChatroom")
+  (return-type "EmpathyChatroom*")
   (parameters
-    '("const-gchar*" "body")
+    '("McAccount*" "account")
   )
 )
 
-(define-method get_tptype
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_get_tptype")
-  (return-type "TpChannelTextMessageType")
-)
-
-(define-method set_tptype
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_set_tptype")
-  (return-type "none")
+(define-function chatroom_new_full
+  (c-name "empathy_chatroom_new_full")
+  (return-type "EmpathyChatroom*")
   (parameters
-    '("TpChannelTextMessageType" "type")
+    '("McAccount*" "account")
+    '("const-gchar*" "room")
+    '("const-gchar*" "name")
+    '("gboolean" "auto_connect")
   )
 )
 
-(define-method get_sender
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_get_sender")
-  (return-type "EmpathyContact*")
+(define-method get_account
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_get_account")
+  (return-type "McAccount*")
 )
 
-(define-method set_sender
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_set_sender")
+(define-method set_account
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_set_account")
   (return-type "none")
   (parameters
-    '("EmpathyContact*" "contact")
+    '("McAccount*" "account")
   )
 )
 
-(define-method get_receiver
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_get_receiver")
-  (return-type "EmpathyContact*")
+(define-method get_room
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_get_room")
+  (return-type "const-gchar*")
 )
 
-(define-method set_receiver
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_set_receiver")
+(define-method set_room
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_set_room")
   (return-type "none")
   (parameters
-    '("EmpathyContact*" "contact")
+    '("const-gchar*" "room")
   )
 )
 
-(define-method get_body
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_get_body")
+(define-method get_name
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_get_name")
   (return-type "const-gchar*")
 )
 
-(define-method set_body
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_set_body")
+(define-method set_name
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_set_name")
   (return-type "none")
   (parameters
-    '("const-gchar*" "body")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method get_timestamp
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_get_timestamp")
-  (return-type "time_t")
+(define-method get_auto_connect
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_get_auto_connect")
+  (return-type "gboolean")
 )
 
-(define-method set_timestamp
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_set_timestamp")
+(define-method set_auto_connect
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_set_auto_connect")
   (return-type "none")
   (parameters
-    '("time_t" "timestamp")
-  )
-)
-
-(define-method get_date_and_time
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_get_date_and_time")
-  (return-type "GDate*")
-  (parameters
-    '("time_t*" "timestamp")
+    '("gboolean" "auto_connect")
   )
 )
 
-(define-method should_highlight
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_should_highlight")
+(define-function chatroom_equal
+  (c-name "empathy_chatroom_equal")
   (return-type "gboolean")
-)
-
-(define-function message_type_from_str
-  (c-name "empathy_message_type_from_str")
-  (return-type "TpChannelTextMessageType")
-  (parameters
-    '("const-gchar*" "type_str")
-  )
-)
-
-(define-function message_type_to_str
-  (c-name "empathy_message_type_to_str")
-  (return-type "const-gchar*")
   (parameters
-    '("TpChannelTextMessageType" "type")
+    '("gconstpointer" "v1")
+    '("gconstpointer" "v2")
   )
 )
 
@@ -764,104 +382,6 @@
 
 
 
-;; From empathy-chatroom.h
-
-(define-function chatroom_get_type
-  (c-name "empathy_chatroom_get_type")
-  (return-type "GType")
-)
-
-(define-function chatroom_new
-  (c-name "empathy_chatroom_new")
-  (is-constructor-of "EmpathyChatroom")
-  (return-type "EmpathyChatroom*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function chatroom_new_full
-  (c-name "empathy_chatroom_new_full")
-  (return-type "EmpathyChatroom*")
-  (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "room")
-    '("const-gchar*" "name")
-    '("gboolean" "auto_connect")
-  )
-)
-
-(define-method get_account
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_get_account")
-  (return-type "McAccount*")
-)
-
-(define-method set_account
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_set_account")
-  (return-type "none")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-method get_room
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_get_room")
-  (return-type "const-gchar*")
-)
-
-(define-method set_room
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_set_room")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "room")
-  )
-)
-
-(define-method get_name
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_get_name")
-  (return-type "const-gchar*")
-)
-
-(define-method set_name
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_set_name")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "name")
-  )
-)
-
-(define-method get_auto_connect
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_get_auto_connect")
-  (return-type "gboolean")
-)
-
-(define-method set_auto_connect
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_set_auto_connect")
-  (return-type "none")
-  (parameters
-    '("gboolean" "auto_connect")
-  )
-)
-
-(define-function chatroom_equal
-  (c-name "empathy_chatroom_equal")
-  (return-type "gboolean")
-  (parameters
-    '("gconstpointer" "v1")
-    '("gconstpointer" "v2")
-  )
-)
-
-
-
 ;; From empathy-contact.h
 
 (define-function contact_get_type
@@ -1136,6 +656,91 @@
 
 
 
+;; From empathy-contact-factory.h
+
+(define-function contact_factory_get_type
+  (c-name "empathy_contact_factory_get_type")
+  (return-type "GType")
+)
+
+(define-function contact_factory_new
+  (c-name "empathy_contact_factory_new")
+  (is-constructor-of "EmpathyContactFactory")
+  (return-type "EmpathyContactFactory*")
+)
+
+(define-method get_tp_factory
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_get_tp_factory")
+  (return-type "EmpathyTpContactFactory*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-method get_user
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_get_user")
+  (return-type "EmpathyContact*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-method get_from_id
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_get_from_id")
+  (return-type "EmpathyContact*")
+  (parameters
+    '("McAccount*" "account")
+    '("const-gchar*" "id")
+  )
+)
+
+(define-method get_from_handle
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_get_from_handle")
+  (return-type "EmpathyContact*")
+  (parameters
+    '("McAccount*" "account")
+    '("guint" "handle")
+  )
+)
+
+(define-method get_from_handles
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_get_from_handles")
+  (return-type "GList*")
+  (parameters
+    '("McAccount*" "account")
+    '("const-GArray*" "handles")
+  )
+)
+
+(define-method set_alias
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_set_alias")
+  (return-type "none")
+  (parameters
+    '("EmpathyContact*" "contact")
+    '("const-gchar*" "alias")
+  )
+)
+
+(define-method set_avatar
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_set_avatar")
+  (return-type "none")
+  (parameters
+    '("McAccount*" "account")
+    '("const-gchar*" "data")
+    '("gsize" "size")
+    '("const-gchar*" "mime_type")
+  )
+)
+
+
+
 ;; From empathy-contact-groups.h
 
 (define-function contact_groups_get_all
@@ -1281,457 +886,695 @@
 
 
 
-;; From empathy-contact-factory.h
+;; From empathy-debug.h
 
-(define-function contact_factory_get_type
-  (c-name "empathy_contact_factory_get_type")
+(define-function debug_flag_is_set
+  (c-name "empathy_debug_flag_is_set")
+  (return-type "gboolean")
+  (parameters
+    '("EmpathyDebugFlags" "flag")
+  )
+)
+
+(define-function debug
+  (c-name "empathy_debug")
+  (return-type "none")
+  (parameters
+    '("EmpathyDebugFlags" "flag")
+    '("const-gchar*" "format")
+  )
+  (varargs #t)
+)
+
+(define-function debug_set_flags
+  (c-name "empathy_debug_set_flags")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "flags_string")
+  )
+)
+
+
+
+;; From empathy-dispatcher.h
+
+(define-function dispatcher_get_type
+  (c-name "empathy_dispatcher_get_type")
   (return-type "GType")
 )
 
-(define-function contact_factory_new
-  (c-name "empathy_contact_factory_new")
-  (is-constructor-of "EmpathyContactFactory")
-  (return-type "EmpathyContactFactory*")
+(define-function dispatcher_new
+  (c-name "empathy_dispatcher_new")
+  (is-constructor-of "EmpathyDispatcher")
+  (return-type "EmpathyDispatcher*")
 )
 
-(define-method get_tp_factory
-  (of-object "EmpathyContactFactory")
-  (c-name "empathy_contact_factory_get_tp_factory")
-  (return-type "EmpathyTpContactFactory*")
+(define-method channel_process
+  (of-object "EmpathyDispatcher")
+  (c-name "empathy_dispatcher_channel_process")
+  (return-type "none")
   (parameters
-    '("McAccount*" "account")
+    '("TpChannel*" "channel")
   )
 )
 
-(define-method get_user
-  (of-object "EmpathyContactFactory")
-  (c-name "empathy_contact_factory_get_user")
-  (return-type "EmpathyContact*")
+(define-function dispatcher_tube_get_type
+  (c-name "empathy_dispatcher_tube_get_type")
+  (return-type "GType")
+)
+
+(define-method ref
+  (of-object "EmpathyDispatcherTube")
+  (c-name "empathy_dispatcher_tube_ref")
+  (return-type "EmpathyDispatcherTube*")
+)
+
+(define-method unref
+  (of-object "EmpathyDispatcherTube")
+  (c-name "empathy_dispatcher_tube_unref")
+  (return-type "none")
+)
+
+(define-method tube_process
+  (of-object "EmpathyDispatcher")
+  (c-name "empathy_dispatcher_tube_process")
+  (return-type "none")
   (parameters
-    '("McAccount*" "account")
+    '("EmpathyDispatcherTube*" "tube")
   )
 )
 
-(define-method get_from_id
-  (of-object "EmpathyContactFactory")
-  (c-name "empathy_contact_factory_get_from_id")
-  (return-type "EmpathyContact*")
+(define-function dispatcher_call_with_contact
+  (c-name "empathy_dispatcher_call_with_contact")
+  (return-type "none")
   (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "id")
+    '("EmpathyContact*" "contact")
   )
 )
 
-(define-method get_from_handle
-  (of-object "EmpathyContactFactory")
-  (c-name "empathy_contact_factory_get_from_handle")
-  (return-type "EmpathyContact*")
+(define-function dispatcher_call_with_contact_id
+  (c-name "empathy_dispatcher_call_with_contact_id")
+  (return-type "none")
   (parameters
     '("McAccount*" "account")
-    '("guint" "handle")
+    '("const-gchar*" "contact_id")
   )
 )
 
-(define-method get_from_handles
-  (of-object "EmpathyContactFactory")
-  (c-name "empathy_contact_factory_get_from_handles")
-  (return-type "GList*")
+(define-function dispatcher_chat_with_contact_id
+  (c-name "empathy_dispatcher_chat_with_contact_id")
+  (return-type "none")
   (parameters
     '("McAccount*" "account")
-    '("const-GArray*" "handles")
+    '("const-gchar*" "contact_id")
   )
 )
 
-(define-method set_alias
-  (of-object "EmpathyContactFactory")
-  (c-name "empathy_contact_factory_set_alias")
+(define-function dispatcher_chat_with_contact
+  (c-name "empathy_dispatcher_chat_with_contact")
   (return-type "none")
   (parameters
     '("EmpathyContact*" "contact")
-    '("const-gchar*" "alias")
   )
 )
 
-(define-method set_avatar
-  (of-object "EmpathyContactFactory")
-  (c-name "empathy_contact_factory_set_avatar")
+
+
+;; From empathy-idle.h
+
+(define-function idle_get_type
+  (c-name "empathy_idle_get_type")
+  (return-type "GType")
+)
+
+(define-function idle_new
+  (c-name "empathy_idle_new")
+  (is-constructor-of "EmpathyIdle")
+  (return-type "EmpathyIdle*")
+)
+
+(define-method get_state
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_get_state")
+  (return-type "McPresence")
+)
+
+(define-method set_state
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_set_state")
   (return-type "none")
   (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "data")
-    '("gsize" "size")
-    '("const-gchar*" "mime_type")
+    '("McPresence" "state")
   )
 )
 
+(define-method get_status
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_get_status")
+  (return-type "const-gchar*")
+)
 
+(define-method set_status
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_set_status")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "status")
+  )
+)
 
-;; From empathy-tp-contact-factory.h
+(define-method get_flash_state
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_get_flash_state")
+  (return-type "McPresence")
+)
 
-(define-function tp_contact_factory_get_type
-  (c-name "empathy_tp_contact_factory_get_type")
-  (return-type "GType")
+(define-method set_flash_state
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_set_flash_state")
+  (return-type "none")
+  (parameters
+    '("McPresence" "state")
+  )
 )
 
-(define-function tp_contact_factory_new
-  (c-name "empathy_tp_contact_factory_new")
-  (is-constructor-of "EmpathyTpContactFactory")
-  (return-type "EmpathyTpContactFactory*")
+(define-method set_presence
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_set_presence")
+  (return-type "none")
   (parameters
-    '("McAccount*" "account")
+    '("McPresence" "state")
+    '("const-gchar*" "status")
   )
 )
 
-(define-method get_user
-  (of-object "EmpathyTpContactFactory")
-  (c-name "empathy_tp_contact_factory_get_user")
-  (return-type "EmpathyContact*")
+(define-method get_auto_away
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_get_auto_away")
+  (return-type "gboolean")
 )
 
-(define-method get_from_id
-  (of-object "EmpathyTpContactFactory")
-  (c-name "empathy_tp_contact_factory_get_from_id")
-  (return-type "EmpathyContact*")
+(define-method set_auto_away
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_set_auto_away")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "id")
+    '("gboolean" "auto_away")
   )
 )
 
-(define-method get_from_handle
-  (of-object "EmpathyTpContactFactory")
-  (c-name "empathy_tp_contact_factory_get_from_handle")
-  (return-type "EmpathyContact*")
+(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
-    '("guint" "handle")
+    '("gboolean" "use_nm")
   )
 )
 
-(define-method get_from_handles
-  (of-object "EmpathyTpContactFactory")
-  (c-name "empathy_tp_contact_factory_get_from_handles")
-  (return-type "GList*")
+
+
+;; From empathy-irc-network.h
+
+(define-function irc_network_get_type
+  (c-name "empathy_irc_network_get_type")
+  (return-type "GType")
+)
+
+(define-function irc_network_new
+  (c-name "empathy_irc_network_new")
+  (is-constructor-of "EmpathyIrcNetwork")
+  (return-type "EmpathyIrcNetwork*")
   (parameters
-    '("const-GArray*" "handles")
+    '("const-gchar*" "name")
   )
 )
 
-(define-method set_alias
-  (of-object "EmpathyTpContactFactory")
-  (c-name "empathy_tp_contact_factory_set_alias")
+(define-method get_servers
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_get_servers")
+  (return-type "GSList*")
+)
+
+(define-method append_server
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_append_server")
   (return-type "none")
   (parameters
-    '("EmpathyContact*" "contact")
-    '("const-gchar*" "alias")
+    '("EmpathyIrcServer*" "server")
   )
 )
 
-(define-method set_avatar
-  (of-object "EmpathyTpContactFactory")
-  (c-name "empathy_tp_contact_factory_set_avatar")
+(define-method remove_server
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_remove_server")
   (return-type "none")
   (parameters
-    '("const-gchar*" "data")
-    '("gsize" "size")
-    '("const-gchar*" "mime_type")
+    '("EmpathyIrcServer*" "server")
   )
 )
 
-(define-method is_ready
-  (of-object "EmpathyTpContactFactory")
-  (c-name "empathy_tp_contact_factory_is_ready")
-  (return-type "gboolean")
+(define-method set_server_position
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_set_server_position")
+  (return-type "none")
+  (parameters
+    '("EmpathyIrcServer*" "server")
+    '("gint" "pos")
+  )
 )
 
 
 
-;; From empathy-tp-group.h
+;; From empathy-irc-network-manager.h
 
-(define-function tp_group_get_type
-  (c-name "empathy_tp_group_get_type")
+(define-function irc_network_manager_get_type
+  (c-name "empathy_irc_network_manager_get_type")
   (return-type "GType")
 )
 
-(define-function tp_group_new
-  (c-name "empathy_tp_group_new")
-  (is-constructor-of "EmpathyTpGroup")
-  (return-type "EmpathyTpGroup*")
+(define-function irc_network_manager_new
+  (c-name "empathy_irc_network_manager_new")
+  (is-constructor-of "EmpathyIrcNetworkManager")
+  (return-type "EmpathyIrcNetworkManager*")
   (parameters
-    '("TpChannel*" "channel")
+    '("const-gchar*" "global_file")
+    '("const-gchar*" "user_file")
   )
 )
 
-(define-method close
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_close")
+(define-method add
+  (of-object "EmpathyIrcNetworkManager")
+  (c-name "empathy_irc_network_manager_add")
   (return-type "none")
+  (parameters
+    '("EmpathyIrcNetwork*" "network")
+  )
 )
 
-(define-method add_members
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_add_members")
+(define-method remove
+  (of-object "EmpathyIrcNetworkManager")
+  (c-name "empathy_irc_network_manager_remove")
   (return-type "none")
   (parameters
-    '("GList*" "contacts")
-    '("const-gchar*" "message")
+    '("EmpathyIrcNetwork*" "network")
   )
 )
 
-(define-method add_member
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_add_member")
-  (return-type "none")
+(define-method get_networks
+  (of-object "EmpathyIrcNetworkManager")
+  (c-name "empathy_irc_network_manager_get_networks")
+  (return-type "GSList*")
+)
+
+(define-method find_network_by_address
+  (of-object "EmpathyIrcNetworkManager")
+  (c-name "empathy_irc_network_manager_find_network_by_address")
+  (return-type "EmpathyIrcNetwork*")
   (parameters
-    '("EmpathyContact*" "contact")
-    '("const-gchar*" "message")
+    '("const-gchar*" "address")
   )
 )
 
-(define-method remove_members
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_remove_members")
-  (return-type "none")
+
+
+;; From empathy-irc-server.h
+
+(define-function irc_server_get_type
+  (c-name "empathy_irc_server_get_type")
+  (return-type "GType")
+)
+
+(define-function irc_server_new
+  (c-name "empathy_irc_server_new")
+  (is-constructor-of "EmpathyIrcServer")
+  (return-type "EmpathyIrcServer*")
   (parameters
-    '("GList*" "contacts")
-    '("const-gchar*" "message")
+    '("const-gchar*" "address")
+    '("guint" "port")
+    '("gboolean" "ssl")
   )
 )
 
-(define-method remove_member
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_remove_member")
+
+
+;; From empathy-log-manager.h
+
+(define-function log_manager_get_type
+  (c-name "empathy_log_manager_get_type")
+  (return-type "GType")
+)
+
+(define-function log_manager_new
+  (c-name "empathy_log_manager_new")
+  (is-constructor-of "EmpathyLogManager")
+  (return-type "EmpathyLogManager*")
+)
+
+(define-method add_message
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_add_message")
   (return-type "none")
   (parameters
-    '("EmpathyContact*" "contact")
-    '("const-gchar*" "message")
+    '("const-gchar*" "chat_id")
+    '("gboolean" "chatroom")
+    '("EmpathyMessage*" "message")
   )
 )
 
-(define-method get_members
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_get_members")
-  (return-type "GList*")
+(define-method exists
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_exists")
+  (return-type "gboolean")
+  (parameters
+    '("McAccount*" "account")
+    '("const-gchar*" "chat_id")
+    '("gboolean" "chatroom")
+  )
 )
 
-(define-method get_local_pendings
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_get_local_pendings")
+(define-method get_dates
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_get_dates")
   (return-type "GList*")
+  (parameters
+    '("McAccount*" "account")
+    '("const-gchar*" "chat_id")
+    '("gboolean" "chatroom")
+  )
 )
 
-(define-method get_remote_pendings
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_get_remote_pendings")
+(define-method get_messages_for_file
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_get_messages_for_file")
   (return-type "GList*")
+  (parameters
+    '("const-gchar*" "filename")
+  )
 )
 
-(define-method get_name
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_get_name")
-  (return-type "const-gchar*")
+(define-method get_messages_for_date
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_get_messages_for_date")
+  (return-type "GList*")
+  (parameters
+    '("McAccount*" "account")
+    '("const-gchar*" "chat_id")
+    '("gboolean" "chatroom")
+    '("const-gchar*" "date")
+  )
 )
 
-(define-method get_self_contact
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_get_self_contact")
-  (return-type "EmpathyContact*")
+(define-method get_last_messages
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_get_last_messages")
+  (return-type "GList*")
+  (parameters
+    '("McAccount*" "account")
+    '("const-gchar*" "chat_id")
+    '("gboolean" "chatroom")
+  )
 )
 
-(define-method is_member
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_is_member")
-  (return-type "gboolean")
+(define-method get_messages_for_file
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_get_messages_for_file")
+  (return-type "GList*")
   (parameters
-    '("EmpathyContact*" "contact")
+    '("const-gchar*" "filename")
   )
 )
 
-(define-method is_ready
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_is_ready")
-  (return-type "gboolean")
+(define-method get_chats
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_get_chats")
+  (return-type "GList*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
-(define-method get_invitation
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_get_invitation")
-  (return-type "EmpathyPendingInfo*")
+(define-method search_new
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_search_new")
+  (return-type "GList*")
   (parameters
-    '("EmpathyContact**" "remote_contact")
+    '("const-gchar*" "text")
   )
 )
 
-(define-function pending_info_new
-  (c-name "empathy_pending_info_new")
-  (is-constructor-of "EmpathyPendingInfo")
-  (return-type "EmpathyPendingInfo*")
+(define-function log_manager_search_free
+  (c-name "empathy_log_manager_search_free")
+  (return-type "none")
   (parameters
-    '("EmpathyContact*" "member")
-    '("EmpathyContact*" "actor")
-    '("const-gchar*" "message")
+    '("GList*" "hits")
   )
 )
 
-(define-method free
-  (of-object "EmpathyPendingInfo")
-  (c-name "empathy_pending_info_free")
-  (return-type "none")
+(define-function log_manager_get_date_readable
+  (c-name "empathy_log_manager_get_date_readable")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "date")
+  )
 )
 
 
 
-;; From empathy-tp-contact-list.h
+;; From empathy-message.h
 
-(define-function tp_contact_list_get_type
-  (c-name "empathy_tp_contact_list_get_type")
+(define-function message_get_type
+  (c-name "empathy_message_get_type")
   (return-type "GType")
 )
 
-(define-function tp_contact_list_new
-  (c-name "empathy_tp_contact_list_new")
-  (is-constructor-of "EmpathyTpContactList")
-  (return-type "EmpathyTpContactList*")
+(define-function message_new
+  (c-name "empathy_message_new")
+  (is-constructor-of "EmpathyMessage")
+  (return-type "EmpathyMessage*")
   (parameters
-    '("McAccount*" "account")
+    '("const-gchar*" "body")
   )
 )
 
-(define-method get_account
-  (of-object "EmpathyTpContactList")
-  (c-name "empathy_tp_contact_list_get_account")
-  (return-type "McAccount*")
+(define-method get_tptype
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_tptype")
+  (return-type "TpChannelTextMessageType")
 )
 
+(define-method set_tptype
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_set_tptype")
+  (return-type "none")
+  (parameters
+    '("TpChannelTextMessageType" "type")
+  )
+)
 
+(define-method get_sender
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_sender")
+  (return-type "EmpathyContact*")
+)
 
-;; From empathy-tp-chat.h
+(define-method set_sender
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_set_sender")
+  (return-type "none")
+  (parameters
+    '("EmpathyContact*" "contact")
+  )
+)
 
-(define-function tp_chat_get_type
-  (c-name "empathy_tp_chat_get_type")
-  (return-type "GType")
+(define-method get_receiver
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_receiver")
+  (return-type "EmpathyContact*")
 )
 
-(define-function tp_chat_new
-  (c-name "empathy_tp_chat_new")
-  (is-constructor-of "EmpathyTpChat")
-  (return-type "EmpathyTpChat*")
+(define-method set_receiver
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_set_receiver")
+  (return-type "none")
   (parameters
-    '("TpChannel*" "channel")
+    '("EmpathyContact*" "contact")
   )
 )
 
-(define-method get_id
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_get_id")
+(define-method get_body
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_body")
   (return-type "const-gchar*")
 )
 
-(define-method get_remote_contact
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_get_remote_contact")
-  (return-type "EmpathyContact*")
+(define-method set_body
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_set_body")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "body")
+  )
 )
 
-(define-method get_account
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_get_account")
-  (return-type "McAccount*")
+(define-method get_timestamp
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_timestamp")
+  (return-type "time_t")
 )
 
-(define-method get_channel
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_get_channel")
-  (return-type "TpChannel*")
+(define-method set_timestamp
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_set_timestamp")
+  (return-type "none")
+  (parameters
+    '("time_t" "timestamp")
+  )
 )
 
-(define-method is_ready
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_is_ready")
+(define-method get_date_and_time
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_date_and_time")
+  (return-type "GDate*")
+  (parameters
+    '("time_t*" "timestamp")
+  )
+)
+
+(define-method should_highlight
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_should_highlight")
   (return-type "gboolean")
 )
 
-(define-method get_members_count
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_get_members_count")
-  (return-type "guint")
+(define-function message_type_from_str
+  (c-name "empathy_message_type_from_str")
+  (return-type "TpChannelTextMessageType")
+  (parameters
+    '("const-gchar*" "type_str")
+  )
 )
 
-(define-method set_acknowledge
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_set_acknowledge")
-  (return-type "none")
+(define-function message_type_to_str
+  (c-name "empathy_message_type_to_str")
+  (return-type "const-gchar*")
   (parameters
-    '("gboolean" "acknowledge")
+    '("TpChannelTextMessageType" "type")
   )
 )
 
-(define-method emit_pendings
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_emit_pendings")
+
+
+;; From empathy-status-presets.h
+
+(define-function status_presets_get_all
+  (c-name "empathy_status_presets_get_all")
   (return-type "none")
 )
 
-(define-method send
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_send")
+(define-function status_presets_get
+  (c-name "empathy_status_presets_get")
+  (return-type "GList*")
+  (parameters
+    '("McPresence" "state")
+    '("gint" "max_number")
+  )
+)
+
+(define-function status_presets_set_last
+  (c-name "empathy_status_presets_set_last")
   (return-type "none")
   (parameters
-    '("EmpathyMessage*" "message")
+    '("McPresence" "state")
+    '("const-gchar*" "status")
   )
 )
 
-(define-method set_state
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_set_state")
+(define-function status_presets_remove
+  (c-name "empathy_status_presets_remove")
   (return-type "none")
   (parameters
-    '("TpChannelChatState" "state")
+    '("McPresence" "state")
+    '("const-gchar*" "status")
   )
 )
 
-(define-method set_property
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_set_property")
+(define-function status_presets_reset
+  (c-name "empathy_status_presets_reset")
+  (return-type "none")
+)
+
+(define-function status_presets_get_default_state
+  (c-name "empathy_status_presets_get_default_state")
+  (return-type "McPresence")
+)
+
+(define-function status_presets_get_default_status
+  (c-name "empathy_status_presets_get_default_status")
+  (return-type "const-gchar*")
+)
+
+(define-function status_presets_set_default
+  (c-name "empathy_status_presets_set_default")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("const-GValue*" "value")
+    '("McPresence" "state")
+    '("const-gchar*" "status")
   )
 )
 
+(define-function status_presets_clear_default
+  (c-name "empathy_status_presets_clear_default")
+  (return-type "none")
+)
 
 
-;; From empathy-tp-roomlist.h
 
-(define-function tp_roomlist_get_type
-  (c-name "empathy_tp_roomlist_get_type")
-  (return-type "GType")
+;; From empathy-time.h
+
+(define-function time_get_current
+  (c-name "empathy_time_get_current")
+  (return-type "time_t")
 )
 
-(define-function tp_roomlist_new
-  (c-name "empathy_tp_roomlist_new")
-  (is-constructor-of "EmpathyTpRoomlist")
-  (return-type "EmpathyTpRoomlist*")
+(define-function time_get_local_time
+  (c-name "empathy_time_get_local_time")
+  (return-type "time_t")
   (parameters
-    '("McAccount*" "account")
+    '("struct-tm*" "tm")
   )
 )
 
-(define-method is_listing
-  (of-object "EmpathyTpRoomlist")
-  (c-name "empathy_tp_roomlist_is_listing")
-  (return-type "gboolean")
+(define-function time_parse
+  (c-name "empathy_time_parse")
+  (return-type "time_t")
+  (parameters
+    '("const-gchar*" "str")
+  )
 )
 
-(define-method start
-  (of-object "EmpathyTpRoomlist")
-  (c-name "empathy_tp_roomlist_start")
-  (return-type "none")
+(define-function time_to_string_utc
+  (c-name "empathy_time_to_string_utc")
+  (return-type "gchar*")
+  (parameters
+    '("time_t" "t")
+    '("const-gchar*" "format")
+  )
 )
 
-(define-method stop
-  (of-object "EmpathyTpRoomlist")
-  (c-name "empathy_tp_roomlist_stop")
-  (return-type "none")
+(define-function time_to_string_local
+  (c-name "empathy_time_to_string_local")
+  (return-type "gchar*")
+  (parameters
+    '("time_t" "t")
+    '("const-gchar*" "format")
+  )
 )
 
 
@@ -1844,398 +1687,421 @@
 
 
 
-;; From empathy-tp-tube.h
+;; From empathy-tp-chat.h
 
-(define-function tp_tube_get_type
-  (c-name "empathy_tp_tube_get_type")
+(define-function tp_chat_get_type
+  (c-name "empathy_tp_chat_get_type")
   (return-type "GType")
 )
 
-(define-function tp_tube_new
-  (c-name "empathy_tp_tube_new")
-  (is-constructor-of "EmpathyTpTube")
-  (return-type "EmpathyTpTube*")
+(define-function tp_chat_new
+  (c-name "empathy_tp_chat_new")
+  (is-constructor-of "EmpathyTpChat")
+  (return-type "EmpathyTpChat*")
   (parameters
     '("TpChannel*" "channel")
-    '("guint" "tube_id")
   )
 )
 
-(define-function tp_tube_new_stream_tube
-  (c-name "empathy_tp_tube_new_stream_tube")
-  (return-type "EmpathyTpTube*")
+(define-method get_id
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_get_id")
+  (return-type "const-gchar*")
+)
+
+(define-method get_remote_contact
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_get_remote_contact")
+  (return-type "EmpathyContact*")
+)
+
+(define-method get_account
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_get_account")
+  (return-type "McAccount*")
+)
+
+(define-method get_channel
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_get_channel")
+  (return-type "TpChannel*")
+)
+
+(define-method is_ready
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_is_ready")
+  (return-type "gboolean")
+)
+
+(define-method get_members_count
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_get_members_count")
+  (return-type "guint")
+)
+
+(define-method set_acknowledge
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_set_acknowledge")
+  (return-type "none")
   (parameters
-    '("EmpathyContact*" "contact")
-    '("TpSocketAddressType" "type")
-    '("const-gchar*" "hostname")
-    '("guint" "port")
-    '("const-gchar*" "service")
+    '("gboolean" "acknowledge")
   )
 )
 
-(define-method accept_stream_tube
-  (of-object "EmpathyTpTube")
-  (c-name "empathy_tp_tube_accept_stream_tube")
+(define-method emit_pendings
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_emit_pendings")
+  (return-type "none")
+)
+
+(define-method send
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_send")
   (return-type "none")
   (parameters
-    '("TpSocketAddressType" "type")
+    '("EmpathyMessage*" "message")
   )
 )
 
-(define-method get_socket
-  (of-object "EmpathyTpTube")
-  (c-name "empathy_tp_tube_get_socket")
+(define-method set_state
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_set_state")
   (return-type "none")
   (parameters
-    '("gchar**" "hostname")
-    '("guint*" "port")
+    '("TpChannelChatState" "state")
   )
 )
 
+(define-method set_property
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_set_property")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+    '("const-GValue*" "value")
+  )
+)
 
 
-;; From empathy-idle.h
 
-(define-function idle_get_type
-  (c-name "empathy_idle_get_type")
+;; From empathy-tp-contact-factory.h
+
+(define-function tp_contact_factory_get_type
+  (c-name "empathy_tp_contact_factory_get_type")
   (return-type "GType")
 )
 
-(define-function idle_new
-  (c-name "empathy_idle_new")
-  (is-constructor-of "EmpathyIdle")
-  (return-type "EmpathyIdle*")
+(define-function tp_contact_factory_new
+  (c-name "empathy_tp_contact_factory_new")
+  (is-constructor-of "EmpathyTpContactFactory")
+  (return-type "EmpathyTpContactFactory*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
-(define-method get_state
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_get_state")
-  (return-type "McPresence")
+(define-method get_user
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_get_user")
+  (return-type "EmpathyContact*")
 )
 
-(define-method set_state
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_set_state")
-  (return-type "none")
+(define-method get_from_id
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_get_from_id")
+  (return-type "EmpathyContact*")
   (parameters
-    '("McPresence" "state")
+    '("const-gchar*" "id")
   )
 )
 
-(define-method get_status
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_get_status")
-  (return-type "const-gchar*")
-)
-
-(define-method set_status
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_set_status")
-  (return-type "none")
+(define-method get_from_handle
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_get_from_handle")
+  (return-type "EmpathyContact*")
   (parameters
-    '("const-gchar*" "status")
+    '("guint" "handle")
   )
 )
 
-(define-method get_flash_state
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_get_flash_state")
-  (return-type "McPresence")
+(define-method get_from_handles
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_get_from_handles")
+  (return-type "GList*")
+  (parameters
+    '("const-GArray*" "handles")
+  )
 )
 
-(define-method set_flash_state
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_set_flash_state")
+(define-method set_alias
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_set_alias")
   (return-type "none")
   (parameters
-    '("McPresence" "state")
+    '("EmpathyContact*" "contact")
+    '("const-gchar*" "alias")
   )
 )
 
-(define-method set_presence
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_set_presence")
+(define-method set_avatar
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_set_avatar")
   (return-type "none")
   (parameters
-    '("McPresence" "state")
-    '("const-gchar*" "status")
+    '("const-gchar*" "data")
+    '("gsize" "size")
+    '("const-gchar*" "mime_type")
   )
 )
 
-(define-method get_auto_away
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_get_auto_away")
+(define-method is_ready
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_is_ready")
   (return-type "gboolean")
 )
 
-(define-method set_auto_away
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_set_auto_away")
-  (return-type "none")
-  (parameters
-    '("gboolean" "auto_away")
-  )
-)
 
-(define-method get_use_nm
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_get_use_nm")
-  (return-type "gboolean")
+
+;; From empathy-tp-contact-list.h
+
+(define-function tp_contact_list_get_type
+  (c-name "empathy_tp_contact_list_get_type")
+  (return-type "GType")
 )
 
-(define-method set_use_nm
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_set_use_nm")
-  (return-type "none")
+(define-function tp_contact_list_new
+  (c-name "empathy_tp_contact_list_new")
+  (is-constructor-of "EmpathyTpContactList")
+  (return-type "EmpathyTpContactList*")
   (parameters
-    '("gboolean" "use_nm")
+    '("McAccount*" "account")
   )
 )
 
+(define-method get_account
+  (of-object "EmpathyTpContactList")
+  (c-name "empathy_tp_contact_list_get_account")
+  (return-type "McAccount*")
+)
 
 
-;; From empathy-log-manager.h
 
-(define-function log_manager_get_type
-  (c-name "empathy_log_manager_get_type")
+;; From empathy-tp-group.h
+
+(define-function tp_group_get_type
+  (c-name "empathy_tp_group_get_type")
   (return-type "GType")
 )
 
-(define-function log_manager_new
-  (c-name "empathy_log_manager_new")
-  (is-constructor-of "EmpathyLogManager")
-  (return-type "EmpathyLogManager*")
+(define-function tp_group_new
+  (c-name "empathy_tp_group_new")
+  (is-constructor-of "EmpathyTpGroup")
+  (return-type "EmpathyTpGroup*")
+  (parameters
+    '("TpChannel*" "channel")
+  )
 )
 
-(define-method add_message
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_add_message")
+(define-method close
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_close")
   (return-type "none")
-  (parameters
-    '("const-gchar*" "chat_id")
-    '("gboolean" "chatroom")
-    '("EmpathyMessage*" "message")
-  )
 )
 
-(define-method exists
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_exists")
-  (return-type "gboolean")
+(define-method add_members
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_add_members")
+  (return-type "none")
   (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "chat_id")
-    '("gboolean" "chatroom")
+    '("GList*" "contacts")
+    '("const-gchar*" "message")
   )
 )
 
-(define-method get_dates
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_get_dates")
-  (return-type "GList*")
+(define-method add_member
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_add_member")
+  (return-type "none")
   (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "chat_id")
-    '("gboolean" "chatroom")
+    '("EmpathyContact*" "contact")
+    '("const-gchar*" "message")
   )
 )
 
-(define-method get_messages_for_file
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_get_messages_for_file")
-  (return-type "GList*")
+(define-method remove_members
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_remove_members")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
+    '("GList*" "contacts")
+    '("const-gchar*" "message")
   )
 )
 
-(define-method get_messages_for_date
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_get_messages_for_date")
-  (return-type "GList*")
+(define-method remove_member
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_remove_member")
+  (return-type "none")
   (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "chat_id")
-    '("gboolean" "chatroom")
-    '("const-gchar*" "date")
+    '("EmpathyContact*" "contact")
+    '("const-gchar*" "message")
   )
 )
 
-(define-method get_last_messages
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_get_last_messages")
+(define-method get_members
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_members")
   (return-type "GList*")
-  (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "chat_id")
-    '("gboolean" "chatroom")
-  )
 )
 
-(define-method get_messages_for_file
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_get_messages_for_file")
+(define-method get_local_pendings
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_local_pendings")
   (return-type "GList*")
-  (parameters
-    '("const-gchar*" "filename")
-  )
 )
 
-(define-method get_chats
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_get_chats")
+(define-method get_remote_pendings
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_remote_pendings")
   (return-type "GList*")
-  (parameters
-    '("McAccount*" "account")
-  )
 )
 
-(define-method search_new
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_search_new")
-  (return-type "GList*")
+(define-method get_name
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_name")
+  (return-type "const-gchar*")
+)
+
+(define-method get_self_contact
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_self_contact")
+  (return-type "EmpathyContact*")
+)
+
+(define-method is_member
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_is_member")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "text")
+    '("EmpathyContact*" "contact")
   )
 )
 
-(define-function log_manager_search_free
-  (c-name "empathy_log_manager_search_free")
-  (return-type "none")
+(define-method is_ready
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_is_ready")
+  (return-type "gboolean")
+)
+
+(define-method get_invitation
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_invitation")
+  (return-type "EmpathyPendingInfo*")
   (parameters
-    '("GList*" "hits")
+    '("EmpathyContact**" "remote_contact")
   )
 )
 
-(define-function log_manager_get_date_readable
-  (c-name "empathy_log_manager_get_date_readable")
-  (return-type "gchar*")
+(define-function pending_info_new
+  (c-name "empathy_pending_info_new")
+  (is-constructor-of "EmpathyPendingInfo")
+  (return-type "EmpathyPendingInfo*")
   (parameters
-    '("const-gchar*" "date")
+    '("EmpathyContact*" "member")
+    '("EmpathyContact*" "actor")
+    '("const-gchar*" "message")
   )
 )
 
+(define-method free
+  (of-object "EmpathyPendingInfo")
+  (c-name "empathy_pending_info_free")
+  (return-type "none")
+)
 
 
-;; From empathy-irc-network-manager.h
 
-(define-function irc_network_manager_get_type
-  (c-name "empathy_irc_network_manager_get_type")
+;; From empathy-tp-roomlist.h
+
+(define-function tp_roomlist_get_type
+  (c-name "empathy_tp_roomlist_get_type")
   (return-type "GType")
 )
 
-(define-function irc_network_manager_new
-  (c-name "empathy_irc_network_manager_new")
-  (is-constructor-of "EmpathyIrcNetworkManager")
-  (return-type "EmpathyIrcNetworkManager*")
+(define-function tp_roomlist_new
+  (c-name "empathy_tp_roomlist_new")
+  (is-constructor-of "EmpathyTpRoomlist")
+  (return-type "EmpathyTpRoomlist*")
   (parameters
-    '("const-gchar*" "global_file")
-    '("const-gchar*" "user_file")
+    '("McAccount*" "account")
   )
 )
 
-(define-method add
-  (of-object "EmpathyIrcNetworkManager")
-  (c-name "empathy_irc_network_manager_add")
-  (return-type "none")
-  (parameters
-    '("EmpathyIrcNetwork*" "network")
-  )
+(define-method is_listing
+  (of-object "EmpathyTpRoomlist")
+  (c-name "empathy_tp_roomlist_is_listing")
+  (return-type "gboolean")
 )
 
-(define-method remove
-  (of-object "EmpathyIrcNetworkManager")
-  (c-name "empathy_irc_network_manager_remove")
+(define-method start
+  (of-object "EmpathyTpRoomlist")
+  (c-name "empathy_tp_roomlist_start")
   (return-type "none")
-  (parameters
-    '("EmpathyIrcNetwork*" "network")
-  )
-)
-
-(define-method get_networks
-  (of-object "EmpathyIrcNetworkManager")
-  (c-name "empathy_irc_network_manager_get_networks")
-  (return-type "GSList*")
 )
 
-(define-method find_network_by_address
-  (of-object "EmpathyIrcNetworkManager")
-  (c-name "empathy_irc_network_manager_find_network_by_address")
-  (return-type "EmpathyIrcNetwork*")
-  (parameters
-    '("const-gchar*" "address")
-  )
+(define-method stop
+  (of-object "EmpathyTpRoomlist")
+  (c-name "empathy_tp_roomlist_stop")
+  (return-type "none")
 )
 
 
 
-;; From empathy-irc-network.h
+;; From empathy-tp-tube.h
 
-(define-function irc_network_get_type
-  (c-name "empathy_irc_network_get_type")
+(define-function tp_tube_get_type
+  (c-name "empathy_tp_tube_get_type")
   (return-type "GType")
 )
 
-(define-function irc_network_new
-  (c-name "empathy_irc_network_new")
-  (is-constructor-of "EmpathyIrcNetwork")
-  (return-type "EmpathyIrcNetwork*")
+(define-function tp_tube_new
+  (c-name "empathy_tp_tube_new")
+  (is-constructor-of "EmpathyTpTube")
+  (return-type "EmpathyTpTube*")
   (parameters
-    '("const-gchar*" "name")
+    '("TpChannel*" "channel")
+    '("guint" "tube_id")
   )
 )
 
-(define-method get_servers
-  (of-object "EmpathyIrcNetwork")
-  (c-name "empathy_irc_network_get_servers")
-  (return-type "GSList*")
-)
-
-(define-method append_server
-  (of-object "EmpathyIrcNetwork")
-  (c-name "empathy_irc_network_append_server")
-  (return-type "none")
+(define-function tp_tube_new_stream_tube
+  (c-name "empathy_tp_tube_new_stream_tube")
+  (return-type "EmpathyTpTube*")
   (parameters
-    '("EmpathyIrcServer*" "server")
+    '("EmpathyContact*" "contact")
+    '("TpSocketAddressType" "type")
+    '("const-gchar*" "hostname")
+    '("guint" "port")
+    '("const-gchar*" "service")
   )
 )
 
-(define-method remove_server
-  (of-object "EmpathyIrcNetwork")
-  (c-name "empathy_irc_network_remove_server")
+(define-method accept_stream_tube
+  (of-object "EmpathyTpTube")
+  (c-name "empathy_tp_tube_accept_stream_tube")
   (return-type "none")
   (parameters
-    '("EmpathyIrcServer*" "server")
+    '("TpSocketAddressType" "type")
   )
 )
 
-(define-method set_server_position
-  (of-object "EmpathyIrcNetwork")
-  (c-name "empathy_irc_network_set_server_position")
+(define-method get_socket
+  (of-object "EmpathyTpTube")
+  (c-name "empathy_tp_tube_get_socket")
   (return-type "none")
   (parameters
-    '("EmpathyIrcServer*" "server")
-    '("gint" "pos")
-  )
-)
-
-
-
-;; From empathy-irc-server.h
-
-(define-function irc_server_get_type
-  (c-name "empathy_irc_server_get_type")
-  (return-type "GType")
-)
-
-(define-function irc_server_new
-  (c-name "empathy_irc_server_new")
-  (is-constructor-of "EmpathyIrcServer")
-  (return-type "EmpathyIrcServer*")
-  (parameters
-    '("const-gchar*" "address")
-    '("guint" "port")
-    '("gboolean" "ssl")
+    '("gchar**" "hostname")
+    '("guint*" "port")
   )
 )
 
@@ -2278,85 +2144,219 @@
 
 
 
-;; From empathy-dispatcher.h
+;; From empathy-utils.h
 
-(define-function dispatcher_get_type
-  (c-name "empathy_dispatcher_get_type")
-  (return-type "GType")
+(define-function substring
+  (c-name "empathy_substring")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "str")
+    '("gint" "start")
+    '("gint" "end")
+  )
 )
 
-(define-function dispatcher_new
-  (c-name "empathy_dispatcher_new")
-  (is-constructor-of "EmpathyDispatcher")
-  (return-type "EmpathyDispatcher*")
+(define-function regex_match
+  (c-name "empathy_regex_match")
+  (return-type "gint")
+  (parameters
+    '("EmpathyRegExType" "type")
+    '("const-gchar*" "msg")
+    '("GArray*" "start")
+    '("GArray*" "end")
+  )
 )
 
-(define-method channel_process
-  (of-object "EmpathyDispatcher")
-  (c-name "empathy_dispatcher_channel_process")
-  (return-type "none")
+(define-function strcasecmp
+  (c-name "empathy_strcasecmp")
+  (return-type "gint")
   (parameters
-    '("TpChannel*" "channel")
+    '("const-gchar*" "s1")
+    '("const-gchar*" "s2")
   )
 )
 
-(define-function dispatcher_tube_get_type
-  (c-name "empathy_dispatcher_tube_get_type")
-  (return-type "GType")
+(define-function strncasecmp
+  (c-name "empathy_strncasecmp")
+  (return-type "gint")
+  (parameters
+    '("const-gchar*" "s1")
+    '("const-gchar*" "s2")
+    '("gsize" "n")
+  )
 )
 
-(define-method ref
-  (of-object "EmpathyDispatcherTube")
-  (c-name "empathy_dispatcher_tube_ref")
-  (return-type "EmpathyDispatcherTube*")
+(define-function xml_validate
+  (c-name "empathy_xml_validate")
+  (return-type "gboolean")
+  (parameters
+    '("xmlDoc*" "doc")
+    '("const-gchar*" "dtd_filename")
+  )
 )
 
-(define-method unref
-  (of-object "EmpathyDispatcherTube")
-  (c-name "empathy_dispatcher_tube_unref")
-  (return-type "none")
+(define-function xml_node_get_child
+  (c-name "empathy_xml_node_get_child")
+  (return-type "xmlNodePtr")
+  (parameters
+    '("xmlNodePtr" "node")
+    '("const-gchar*" "child_name")
+  )
 )
 
-(define-method tube_process
-  (of-object "EmpathyDispatcher")
-  (c-name "empathy_dispatcher_tube_process")
-  (return-type "none")
+(define-function xml_node_get_child_content
+  (c-name "empathy_xml_node_get_child_content")
+  (return-type "xmlChar*")
   (parameters
-    '("EmpathyDispatcherTube*" "tube")
+    '("xmlNodePtr" "node")
+    '("const-gchar*" "child_name")
   )
 )
 
-(define-function dispatcher_call_with_contact
-  (c-name "empathy_dispatcher_call_with_contact")
+(define-function xml_node_find_child_prop_value
+  (c-name "empathy_xml_node_find_child_prop_value")
+  (return-type "xmlNodePtr")
+  (parameters
+    '("xmlNodePtr" "node")
+    '("const-gchar*" "prop_name")
+    '("const-gchar*" "prop_value")
+  )
+)
+
+(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_new
+  (c-name "empathy_mission_control_new")
+  (is-constructor-of "EmpathyMissionControl")
+  (return-type "MissionControl*")
+)
+
+(define-function presence_get_default_message
+  (c-name "empathy_presence_get_default_message")
+  (return-type "const-gchar*")
+  (parameters
+    '("McPresence" "presence")
+  )
+)
+
+(define-function presence_to_str
+  (c-name "empathy_presence_to_str")
+  (return-type "const-gchar*")
+  (parameters
+    '("McPresence" "presence")
+  )
+)
+
+(define-function presence_from_str
+  (c-name "empathy_presence_from_str")
+  (return-type "McPresence")
+  (parameters
+    '("const-gchar*" "str")
+  )
+)
+
+(define-function file_lookup
+  (c-name "empathy_file_lookup")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "filename")
+    '("const-gchar*" "subdir")
+  )
+)
+
+(define-function run_until_ready
+  (c-name "empathy_run_until_ready")
   (return-type "none")
   (parameters
-    '("EmpathyContact*" "contact")
+    '("gpointer" "object")
   )
 )
 
-(define-function dispatcher_call_with_contact_id
-  (c-name "empathy_dispatcher_call_with_contact_id")
+(define-function run_until_ready_full
+  (c-name "empathy_run_until_ready_full")
   (return-type "none")
   (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "contact_id")
+    '("gpointer" "object")
+    '("const-gchar*" "signal")
+    '("EmpathyRunUntilReadyFunc" "func")
+    '("gpointer" "user_data")
+    '("GMainLoop**" "loop")
   )
 )
 
-(define-function dispatcher_chat_with_contact_id
-  (c-name "empathy_dispatcher_chat_with_contact_id")
+(define-function channel_get_account
+  (c-name "empathy_channel_get_account")
+  (return-type "McAccount*")
+  (parameters
+    '("TpChannel*" "channel")
+  )
+)
+
+(define-function connect_to_account_status_changed
+  (c-name "empathy_connect_to_account_status_changed")
+  (return-type "gpointer")
+  (parameters
+    '("MissionControl*" "mc")
+    '("GCallback" "handler")
+    '("gpointer" "user_data")
+    '("GClosureNotify" "free_func")
+  )
+)
+
+(define-function disconnect_account_status_changed
+  (c-name "empathy_disconnect_account_status_changed")
   (return-type "none")
   (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "contact_id")
+    '("gpointer" "token")
   )
 )
 
-(define-function dispatcher_chat_with_contact
-  (c-name "empathy_dispatcher_chat_with_contact")
+(define-function proxy_equal
+  (c-name "empathy_proxy_equal")
+  (return-type "gboolean")
+  (parameters
+    '("gconstpointer" "a")
+    '("gconstpointer" "b")
+  )
+)
+
+(define-function proxy_hash
+  (c-name "empathy_proxy_hash")
+  (return-type "guint")
+  (parameters
+    '("gconstpointer" "key")
+  )
+)
+
+(define-function connection_request_channel
+  (c-name "empathy_connection_request_channel")
   (return-type "none")
   (parameters
-    '("EmpathyContact*" "contact")
+    '("TpConnection*" "proxy")
+    '("gint" "timeout_ms")
+    '("const-gchar*" "channel_type")
+    '("guint" "handle_type")
+    '("const-gchar*" "name")
+    '("gboolean" "suppress_handler")
+    '("empathy_connection_callback_for_request_channel" "callback")
+    '("gpointer" "user_data")
+    '("GDestroyNotify" "destroy")
+    '("GObject*" "weak_object")
   )
 )
 
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index e9103a495..2065e4823 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -169,20 +169,6 @@
   )
 )
 
-(define-flags ContactWidgetFlags
-  (in-module "Empathy")
-  (c-name "EmpathyContactWidgetFlags")
-  (gtype-id "EMPATHY_TYPE_CONTACT_WIDGET_FLAGS")
-  (values
-    '("none" "EMPATHY_CONTACT_WIDGET_EDIT_NONE")
-    '("alias" "EMPATHY_CONTACT_WIDGET_EDIT_ALIAS")
-    '("avatar" "EMPATHY_CONTACT_WIDGET_EDIT_AVATAR")
-    '("account" "EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT")
-    '("id" "EMPATHY_CONTACT_WIDGET_EDIT_ID")
-    '("groups" "EMPATHY_CONTACT_WIDGET_EDIT_GROUPS")
-  )
-)
-
 (define-flags ContactFeatureFlags
   (in-module "Empathy")
   (c-name "EmpathyContactFeatureFlags")
@@ -198,9 +184,20 @@
   )
 )
 
-
-;; From empathy-images.h
-
+(define-flags ContactWidgetFlags
+  (in-module "Empathy")
+  (c-name "EmpathyContactWidgetFlags")
+  (gtype-id "EMPATHY_TYPE_CONTACT_WIDGET_FLAGS")
+  (values
+    '("edit-none" "EMPATHY_CONTACT_WIDGET_EDIT_NONE")
+    '("edit-alias" "EMPATHY_CONTACT_WIDGET_EDIT_ALIAS")
+    '("edit-avatar" "EMPATHY_CONTACT_WIDGET_EDIT_AVATAR")
+    '("edit-account" "EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT")
+    '("edit-id" "EMPATHY_CONTACT_WIDGET_EDIT_ID")
+    '("edit-groups" "EMPATHY_CONTACT_WIDGET_EDIT_GROUPS")
+    '("for-tooltip" "EMPATHY_CONTACT_WIDGET_FOR_TOOLTIP")
+  )
+)
 
 
 ;; From empathy-account-chooser.h
@@ -267,6 +264,234 @@
 
 
 
+;; From empathy-account-widget.h
+
+(define-function account_widget_handle_params
+  (c-name "empathy_account_widget_handle_params")
+  (return-type "none")
+  (parameters
+    '("McAccount*" "account")
+    '("GladeXML*" "glade")
+    '("const-gchar*" "first_widget_name")
+  )
+  (varargs #t)
+)
+
+(define-function account_widget_add_forget_button
+  (c-name "empathy_account_widget_add_forget_button")
+  (return-type "none")
+  (parameters
+    '("McAccount*" "account")
+    '("GladeXML*" "glade")
+    '("const-gchar*" "button")
+    '("const-gchar*" "entry")
+  )
+)
+
+(define-function account_widget_generic_new
+  (c-name "empathy_account_widget_generic_new")
+  (is-constructor-of "EmpathyAccountWidgetGeneric")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-function account_widget_salut_new
+  (c-name "empathy_account_widget_salut_new")
+  (is-constructor-of "EmpathyAccountWidgetSalut")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-function account_widget_msn_new
+  (c-name "empathy_account_widget_msn_new")
+  (is-constructor-of "EmpathyAccountWidgetMsn")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-function account_widget_jabber_new
+  (c-name "empathy_account_widget_jabber_new")
+  (is-constructor-of "EmpathyAccountWidgetJabber")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-function account_widget_icq_new
+  (c-name "empathy_account_widget_icq_new")
+  (is-constructor-of "EmpathyAccountWidgetIcq")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-function account_widget_aim_new
+  (c-name "empathy_account_widget_aim_new")
+  (is-constructor-of "EmpathyAccountWidgetAim")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-function account_widget_yahoo_new
+  (c-name "empathy_account_widget_yahoo_new")
+  (is-constructor-of "EmpathyAccountWidgetYahoo")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-function account_widget_groupwise_new
+  (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
+  (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
+  (c-name "empathy_account_widget_sip_new")
+  (is-constructor-of "EmpathyAccountWidgetSip")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+
+
+;; From empathy-avatar-chooser.h
+
+(define-function avatar_chooser_get_type
+  (c-name "empathy_avatar_chooser_get_type")
+  (return-type "GType")
+)
+
+(define-function avatar_chooser_new
+  (c-name "empathy_avatar_chooser_new")
+  (is-constructor-of "EmpathyAvatarChooser")
+  (return-type "GtkWidget*")
+)
+
+(define-method set
+  (of-object "EmpathyAvatarChooser")
+  (c-name "empathy_avatar_chooser_set")
+  (return-type "none")
+  (parameters
+    '("EmpathyAvatar*" "avatar")
+  )
+)
+
+(define-method get_image_data
+  (of-object "EmpathyAvatarChooser")
+  (c-name "empathy_avatar_chooser_get_image_data")
+  (return-type "none")
+  (parameters
+    '("const-gchar**" "data")
+    '("gsize*" "data_size")
+    '("const-gchar**" "mime_type")
+  )
+)
+
+
+
+;; From empathy-avatar-image.h
+
+(define-function avatar_image_get_type
+  (c-name "empathy_avatar_image_get_type")
+  (return-type "GType")
+)
+
+(define-function avatar_image_new
+  (c-name "empathy_avatar_image_new")
+  (is-constructor-of "EmpathyAvatarImage")
+  (return-type "GtkWidget*")
+)
+
+(define-method set
+  (of-object "EmpathyAvatarImage")
+  (c-name "empathy_avatar_image_set")
+  (return-type "none")
+  (parameters
+    '("EmpathyAvatar*" "avatar")
+  )
+)
+
+
+
+;; From empathy-cell-renderer-activatable.h
+
+(define-function cell_renderer_activatable_get_type
+  (c-name "empathy_cell_renderer_activatable_get_type")
+  (return-type "GType")
+)
+
+(define-function cell_renderer_activatable_new
+  (c-name "empathy_cell_renderer_activatable_new")
+  (is-constructor-of "EmpathyCellRendererActivatable")
+  (return-type "GtkCellRenderer*")
+)
+
+
+
+;; From empathy-cell-renderer-expander.h
+
+(define-function cell_renderer_expander_get_type
+  (c-name "empathy_cell_renderer_expander_get_type")
+  (return-type "GType")
+)
+
+(define-function cell_renderer_expander_new
+  (c-name "empathy_cell_renderer_expander_new")
+  (is-constructor-of "EmpathyCellRendererExpander")
+  (return-type "GtkCellRenderer*")
+)
+
+
+
+;; From empathy-cell-renderer-text.h
+
+(define-function cell_renderer_text_get_type
+  (c-name "empathy_cell_renderer_text_get_type")
+  (return-type "GType")
+)
+
+(define-function cell_renderer_text_new
+  (c-name "empathy_cell_renderer_text_new")
+  (is-constructor-of "EmpathyCellRendererText")
+  (return-type "GtkCellRenderer*")
+)
+
+
+
 ;; From empathy-chat.h
 
 (define-function chat_get_type
@@ -381,32 +606,10 @@
   )
 )
 
-
-
-;; From empathy-irc-network-dialog.h
-
-(define-method dialog_show
-  (of-object "EmpathyIrcNetwork")
-  (c-name "empathy_irc_network_dialog_show")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkWidget*" "parent")
-  )
-)
-
-
-
-;; From empathy-spell-dialog.h
-
-(define-function spell_dialog_show
-  (c-name "empathy_spell_dialog_show")
-  (return-type "none")
-  (parameters
-    '("EmpathyChat*" "chat")
-    '("GtkTextIter*" "start")
-    '("GtkTextIter*" "end")
-    '("const-gchar*" "word")
-  )
+(define-method is_room
+  (of-object "EmpathyChat")
+  (c-name "empathy_chat_is_room")
+  (return-type "gboolean")
 )
 
 
@@ -594,128 +797,6 @@
 
 
 
-;; From empathy-log-window.h
-
-(define-function log_window_show
-  (c-name "empathy_log_window_show")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "chat_id")
-    '("gboolean" "chatroom")
-    '("GtkWindow*" "parent")
-  )
-)
-
-
-
-;; From empathy-theme-boxes.h
-
-(define-function theme_boxes_get_type
-  (c-name "empathy_theme_boxes_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From empathy-account-widget.h
-
-(define-function account_widget_handle_params
-  (c-name "empathy_account_widget_handle_params")
-  (return-type "none")
-  (parameters
-    '("McAccount*" "account")
-    '("GladeXML*" "glade")
-    '("const-gchar*" "first_widget_name")
-  )
-  (varargs #t)
-)
-
-(define-function account_widget_add_forget_button
-  (c-name "empathy_account_widget_add_forget_button")
-  (return-type "none")
-  (parameters
-    '("McAccount*" "account")
-    '("GladeXML*" "glade")
-    '("const-gchar*" "button")
-    '("const-gchar*" "entry")
-  )
-)
-
-(define-function account_widget_generic_new
-  (c-name "empathy_account_widget_generic_new")
-  (is-constructor-of "EmpathyAccountWidgetGeneric")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function account_widget_salut_new
-  (c-name "empathy_account_widget_salut_new")
-  (is-constructor-of "EmpathyAccountWidgetSalut")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function account_widget_msn_new
-  (c-name "empathy_account_widget_msn_new")
-  (is-constructor-of "EmpathyAccountWidgetMsn")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function account_widget_jabber_new
-  (c-name "empathy_account_widget_jabber_new")
-  (is-constructor-of "EmpathyAccountWidgetJabber")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function account_widget_icq_new
-  (c-name "empathy_account_widget_icq_new")
-  (is-constructor-of "EmpathyAccountWidgetIcq")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function account_widget_aim_new
-  (c-name "empathy_account_widget_aim_new")
-  (is-constructor-of "EmpathyAccountWidgetAim")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function account_widget_yahoo_new
-  (c-name "empathy_account_widget_yahoo_new")
-  (is-constructor-of "EmpathyAccountWidgetYahoo")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function account_widget_groupwise_new
-  (c-name "empathy_account_widget_groupwise_new")
-  (is-constructor-of "EmpathyAccountWidgetGroupwise")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-
-
 ;; From empathy-conf.h
 
 (define-function conf_get_type
@@ -835,128 +916,6 @@
 
 
 
-;; From empathy-theme.h
-
-(define-function theme_get_type
-  (c-name "empathy_theme_get_type")
-  (return-type "GType")
-)
-
-(define-method update_view
-  (of-object "EmpathyTheme")
-  (c-name "empathy_theme_update_view")
-  (return-type "none")
-  (parameters
-    '("EmpathyChatView*" "view")
-  )
-)
-
-(define-method append_message
-  (of-object "EmpathyTheme")
-  (c-name "empathy_theme_append_message")
-  (return-type "none")
-  (parameters
-    '("EmpathyChatView*" "view")
-    '("EmpathyMessage*" "msg")
-  )
-)
-
-(define-method append_text
-  (of-object "EmpathyTheme")
-  (c-name "empathy_theme_append_text")
-  (return-type "none")
-  (parameters
-    '("EmpathyChatView*" "view")
-    '("const-gchar*" "body")
-    '("const-gchar*" "tag")
-    '("const-gchar*" "link_tag")
-  )
-)
-
-(define-method append_spacing
-  (of-object "EmpathyTheme")
-  (c-name "empathy_theme_append_spacing")
-  (return-type "none")
-  (parameters
-    '("EmpathyChatView*" "view")
-  )
-)
-
-(define-method append_event
-  (of-object "EmpathyTheme")
-  (c-name "empathy_theme_append_event")
-  (return-type "none")
-  (parameters
-    '("EmpathyChatView*" "view")
-    '("const-gchar*" "str")
-  )
-)
-
-(define-method append_timestamp
-  (of-object "EmpathyTheme")
-  (c-name "empathy_theme_append_timestamp")
-  (return-type "none")
-  (parameters
-    '("EmpathyChatView*" "view")
-    '("EmpathyMessage*" "message")
-    '("gboolean" "show_date")
-    '("gboolean" "show_time")
-  )
-)
-
-(define-method maybe_append_date_and_time
-  (of-object "EmpathyTheme")
-  (c-name "empathy_theme_maybe_append_date_and_time")
-  (return-type "none")
-  (parameters
-    '("EmpathyChatView*" "view")
-    '("EmpathyMessage*" "message")
-  )
-)
-
-(define-method get_show_avatars
-  (of-object "EmpathyTheme")
-  (c-name "empathy_theme_get_show_avatars")
-  (return-type "gboolean")
-)
-
-(define-method set_show_avatars
-  (of-object "EmpathyTheme")
-  (c-name "empathy_theme_set_show_avatars")
-  (return-type "none")
-  (parameters
-    '("gboolean" "show")
-  )
-)
-
-
-
-;; From empathy-account-widget-irc.h
-
-(define-function account_widget_irc_new
-  (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
-  (c-name "empathy_account_widget_sip_new")
-  (is-constructor-of "EmpathyAccountWidgetSip")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-
-
 ;; From empathy-contact-dialogs.h
 
 (define-function subscription_dialog_show
@@ -989,62 +948,6 @@
 
 
 
-;; From empathy-new-message-dialog.h
-
-(define-function new_message_dialog_show
-  (c-name "empathy_new_message_dialog_show")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkWindow*" "parent")
-  )
-)
-
-
-
-;; From empathy-theme-irc.h
-
-(define-function theme_irc_get_type
-  (c-name "empathy_theme_irc_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From empathy-avatar-chooser.h
-
-(define-function avatar_chooser_get_type
-  (c-name "empathy_avatar_chooser_get_type")
-  (return-type "GType")
-)
-
-(define-function avatar_chooser_new
-  (c-name "empathy_avatar_chooser_new")
-  (is-constructor-of "EmpathyAvatarChooser")
-  (return-type "GtkWidget*")
-)
-
-(define-method set
-  (of-object "EmpathyAvatarChooser")
-  (c-name "empathy_avatar_chooser_set")
-  (return-type "none")
-  (parameters
-    '("EmpathyAvatar*" "avatar")
-  )
-)
-
-(define-method get_image_data
-  (of-object "EmpathyAvatarChooser")
-  (c-name "empathy_avatar_chooser_get_image_data")
-  (return-type "none")
-  (parameters
-    '("const-gchar**" "data")
-    '("gsize*" "data_size")
-    '("const-gchar**" "mime_type")
-  )
-)
-
-
-
 ;; From empathy-contact-list-store.h
 
 (define-function contact_list_store_get_type
@@ -1176,6 +1079,205 @@
 
 
 
+;; From empathy-contact-list-view.h
+
+(define-function contact_list_view_get_type
+  (c-name "empathy_contact_list_view_get_type")
+  (return-type "GType")
+)
+
+(define-function contact_list_view_new
+  (c-name "empathy_contact_list_view_new")
+  (is-constructor-of "EmpathyContactListView")
+  (return-type "EmpathyContactListView*")
+  (parameters
+    '("EmpathyContactListStore*" "store")
+    '("EmpathyContactListFeatureFlags" "list_features")
+    '("EmpathyContactFeatureFlags" "contact_features")
+  )
+)
+
+(define-method get_selected
+  (of-object "EmpathyContactListView")
+  (c-name "empathy_contact_list_view_get_selected")
+  (return-type "EmpathyContact*")
+)
+
+(define-method get_selected_group
+  (of-object "EmpathyContactListView")
+  (c-name "empathy_contact_list_view_get_selected_group")
+  (return-type "gchar*")
+)
+
+(define-method get_contact_menu
+  (of-object "EmpathyContactListView")
+  (c-name "empathy_contact_list_view_get_contact_menu")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_group_menu
+  (of-object "EmpathyContactListView")
+  (c-name "empathy_contact_list_view_get_group_menu")
+  (return-type "GtkWidget*")
+)
+
+
+
+;; From empathy-contact-menu.h
+
+(define-method menu_new
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_menu_new")
+  (return-type "GtkWidget*")
+  (parameters
+    '("EmpathyContactFeatureFlags" "features")
+  )
+)
+
+(define-method chat_menu_item_new
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_chat_menu_item_new")
+  (return-type "GtkWidget*")
+)
+
+(define-method call_menu_item_new
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_call_menu_item_new")
+  (return-type "GtkWidget*")
+)
+
+(define-method log_menu_item_new
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_log_menu_item_new")
+  (return-type "GtkWidget*")
+)
+
+(define-method info_menu_item_new
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_info_menu_item_new")
+  (return-type "GtkWidget*")
+)
+
+(define-method edit_menu_item_new
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_edit_menu_item_new")
+  (return-type "GtkWidget*")
+)
+
+
+
+;; From empathy-contact-widget.h
+
+(define-method widget_new
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_widget_new")
+  (return-type "GtkWidget*")
+  (parameters
+    '("EmpathyContactWidgetFlags" "flags")
+  )
+)
+
+(define-function contact_widget_get_contact
+  (c-name "empathy_contact_widget_get_contact")
+  (return-type "EmpathyContact*")
+  (parameters
+    '("GtkWidget*" "widget")
+  )
+)
+
+(define-function contact_widget_set_contact
+  (c-name "empathy_contact_widget_set_contact")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("EmpathyContact*" "contact")
+  )
+)
+
+(define-function contact_widget_set_account_filter
+  (c-name "empathy_contact_widget_set_account_filter")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("EmpathyAccountChooserFilterFunc" "filter")
+    '("gpointer" "user_data")
+  )
+)
+
+
+
+;; From empathy-geometry.h
+
+(define-function geometry_save
+  (c-name "empathy_geometry_save")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "w")
+    '("gint" "h")
+  )
+)
+
+(define-function geometry_load
+  (c-name "empathy_geometry_load")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+    '("gint*" "x")
+    '("gint*" "y")
+    '("gint*" "w")
+    '("gint*" "h")
+  )
+)
+
+
+
+;; From empathy-images.h
+
+
+
+;; From empathy-irc-network-dialog.h
+
+(define-method dialog_show
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_dialog_show")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GtkWidget*" "parent")
+  )
+)
+
+
+
+;; From empathy-log-window.h
+
+(define-function log_window_show
+  (c-name "empathy_log_window_show")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+    '("const-gchar*" "chat_id")
+    '("gboolean" "chatroom")
+    '("GtkWindow*" "parent")
+  )
+)
+
+
+
+;; From empathy-new-message-dialog.h
+
+(define-function new_message_dialog_show
+  (c-name "empathy_new_message_dialog_show")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GtkWindow*" "parent")
+  )
+)
+
+
+
 ;; From empathy-presence-chooser.h
 
 (define-function presence_chooser_get_type
@@ -1196,108 +1298,313 @@
 
 
 
-;; From empathy-theme-manager.h
+;; From empathy-profile-chooser.h
 
-(define-function theme_manager_get_type
-  (c-name "empathy_theme_manager_get_type")
+(define-function profile_chooser_new
+  (c-name "empathy_profile_chooser_new")
+  (is-constructor-of "EmpathyProfileChooser")
+  (return-type "GtkWidget*")
+)
+
+(define-function profile_chooser_get_selected
+  (c-name "empathy_profile_chooser_get_selected")
+  (return-type "McProfile*")
+  (parameters
+    '("GtkWidget*" "widget")
+  )
+)
+
+(define-function profile_chooser_n_profiles
+  (c-name "empathy_profile_chooser_n_profiles")
+  (return-type "gint")
+  (parameters
+    '("GtkWidget*" "widget")
+  )
+)
+
+
+
+;; From empathy-smiley-manager.h
+
+(define-function smiley_manager_get_type
+  (c-name "empathy_smiley_manager_get_type")
   (return-type "GType")
 )
 
-(define-function theme_manager_get
-  (c-name "empathy_theme_manager_get")
-  (return-type "EmpathyThemeManager*")
+(define-function smiley_manager_new
+  (c-name "empathy_smiley_manager_new")
+  (is-constructor-of "EmpathySmileyManager")
+  (return-type "EmpathySmileyManager*")
 )
 
-(define-function theme_manager_get_themes
-  (c-name "empathy_theme_manager_get_themes")
-  (return-type "const-gchar**")
+(define-method load
+  (of-object "EmpathySmileyManager")
+  (c-name "empathy_smiley_manager_load")
+  (return-type "none")
 )
 
-(define-method apply
-  (of-object "EmpathyThemeManager")
-  (c-name "empathy_theme_manager_apply")
+(define-method add
+  (of-object "EmpathySmileyManager")
+  (c-name "empathy_smiley_manager_add")
   (return-type "none")
   (parameters
-    '("EmpathyChatView*" "view")
-    '("const-gchar*" "theme")
+    '("const-gchar*" "icon_name")
+    '("const-gchar*" "first_str")
   )
+  (varargs #t)
 )
 
-(define-method apply_saved
-  (of-object "EmpathyThemeManager")
-  (c-name "empathy_theme_manager_apply_saved")
+(define-method add_from_pixbuf
+  (of-object "EmpathySmileyManager")
+  (c-name "empathy_smiley_manager_add_from_pixbuf")
   (return-type "none")
   (parameters
-    '("EmpathyChatView*" "view")
+    '("GdkPixbuf*" "smiley")
+    '("const-gchar*" "first_str")
   )
+  (varargs #t)
 )
 
+(define-method get_all
+  (of-object "EmpathySmileyManager")
+  (c-name "empathy_smiley_manager_get_all")
+  (return-type "GSList*")
+)
 
+(define-method parse
+  (of-object "EmpathySmileyManager")
+  (c-name "empathy_smiley_manager_parse")
+  (return-type "GSList*")
+  (parameters
+    '("const-gchar*" "text")
+  )
+)
 
-;; From empathy-avatar-image.h
+(define-method free
+  (of-object "EmpathySmiley")
+  (c-name "empathy_smiley_free")
+  (return-type "none")
+)
 
-(define-function avatar_image_get_type
-  (c-name "empathy_avatar_image_get_type")
-  (return-type "GType")
+
+
+;; From empathy-spell.h
+
+(define-function spell_supported
+  (c-name "empathy_spell_supported")
+  (return-type "gboolean")
 )
 
-(define-function avatar_image_new
-  (c-name "empathy_avatar_image_new")
-  (is-constructor-of "EmpathyAvatarImage")
-  (return-type "GtkWidget*")
+(define-function spell_get_language_name
+  (c-name "empathy_spell_get_language_name")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "code")
+  )
 )
 
-(define-method set
-  (of-object "EmpathyAvatarImage")
-  (c-name "empathy_avatar_image_set")
+(define-function spell_get_language_codes
+  (c-name "empathy_spell_get_language_codes")
+  (return-type "GList*")
+)
+
+(define-function spell_free_language_codes
+  (c-name "empathy_spell_free_language_codes")
   (return-type "none")
   (parameters
-    '("EmpathyAvatar*" "avatar")
+    '("GList*" "codes")
   )
 )
 
+(define-function spell_check
+  (c-name "empathy_spell_check")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "word")
+  )
+)
 
+(define-function spell_get_suggestions
+  (c-name "empathy_spell_get_suggestions")
+  (return-type "GList*")
+  (parameters
+    '("const-gchar*" "word")
+  )
+)
 
-;; From empathy-contact-list-view.h
+(define-function spell_free_suggestions
+  (c-name "empathy_spell_free_suggestions")
+  (return-type "none")
+  (parameters
+    '("GList*" "suggestions")
+  )
+)
 
-(define-function contact_list_view_get_type
-  (c-name "empathy_contact_list_view_get_type")
+
+
+;; From empathy-spell-dialog.h
+
+(define-function spell_dialog_show
+  (c-name "empathy_spell_dialog_show")
+  (return-type "none")
+  (parameters
+    '("EmpathyChat*" "chat")
+    '("GtkTextIter*" "start")
+    '("GtkTextIter*" "end")
+    '("const-gchar*" "word")
+  )
+)
+
+
+
+;; From empathy-theme-boxes.h
+
+(define-function theme_boxes_get_type
+  (c-name "empathy_theme_boxes_get_type")
   (return-type "GType")
 )
 
-(define-function contact_list_view_new
-  (c-name "empathy_contact_list_view_new")
-  (is-constructor-of "EmpathyContactListView")
-  (return-type "EmpathyContactListView*")
+
+
+;; From empathy-theme.h
+
+(define-function theme_get_type
+  (c-name "empathy_theme_get_type")
+  (return-type "GType")
+)
+
+(define-method update_view
+  (of-object "EmpathyTheme")
+  (c-name "empathy_theme_update_view")
+  (return-type "none")
   (parameters
-    '("EmpathyContactListStore*" "store")
-    '("EmpathyContactListFeatureFlags" "list_features")
-    '("EmpathyContactFeatureFlags" "contact_features")
+    '("EmpathyChatView*" "view")
   )
 )
 
-(define-method get_selected
-  (of-object "EmpathyContactListView")
-  (c-name "empathy_contact_list_view_get_selected")
-  (return-type "EmpathyContact*")
+(define-method append_message
+  (of-object "EmpathyTheme")
+  (c-name "empathy_theme_append_message")
+  (return-type "none")
+  (parameters
+    '("EmpathyChatView*" "view")
+    '("EmpathyMessage*" "msg")
+  )
 )
 
-(define-method get_selected_group
-  (of-object "EmpathyContactListView")
-  (c-name "empathy_contact_list_view_get_selected_group")
-  (return-type "gchar*")
+(define-method append_text
+  (of-object "EmpathyTheme")
+  (c-name "empathy_theme_append_text")
+  (return-type "none")
+  (parameters
+    '("EmpathyChatView*" "view")
+    '("const-gchar*" "body")
+    '("const-gchar*" "tag")
+    '("const-gchar*" "link_tag")
+  )
 )
 
-(define-method get_contact_menu
-  (of-object "EmpathyContactListView")
-  (c-name "empathy_contact_list_view_get_contact_menu")
-  (return-type "GtkWidget*")
+(define-method append_spacing
+  (of-object "EmpathyTheme")
+  (c-name "empathy_theme_append_spacing")
+  (return-type "none")
+  (parameters
+    '("EmpathyChatView*" "view")
+  )
 )
 
-(define-method get_group_menu
-  (of-object "EmpathyContactListView")
-  (c-name "empathy_contact_list_view_get_group_menu")
-  (return-type "GtkWidget*")
+(define-method append_event
+  (of-object "EmpathyTheme")
+  (c-name "empathy_theme_append_event")
+  (return-type "none")
+  (parameters
+    '("EmpathyChatView*" "view")
+    '("const-gchar*" "str")
+  )
+)
+
+(define-method append_timestamp
+  (of-object "EmpathyTheme")
+  (c-name "empathy_theme_append_timestamp")
+  (return-type "none")
+  (parameters
+    '("EmpathyChatView*" "view")
+    '("EmpathyMessage*" "message")
+    '("gboolean" "show_date")
+    '("gboolean" "show_time")
+  )
+)
+
+(define-method maybe_append_date_and_time
+  (of-object "EmpathyTheme")
+  (c-name "empathy_theme_maybe_append_date_and_time")
+  (return-type "none")
+  (parameters
+    '("EmpathyChatView*" "view")
+    '("EmpathyMessage*" "message")
+  )
+)
+
+(define-method get_show_avatars
+  (of-object "EmpathyTheme")
+  (c-name "empathy_theme_get_show_avatars")
+  (return-type "gboolean")
+)
+
+(define-method set_show_avatars
+  (of-object "EmpathyTheme")
+  (c-name "empathy_theme_set_show_avatars")
+  (return-type "none")
+  (parameters
+    '("gboolean" "show")
+  )
+)
+
+
+
+;; From empathy-theme-irc.h
+
+(define-function theme_irc_get_type
+  (c-name "empathy_theme_irc_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From empathy-theme-manager.h
+
+(define-function theme_manager_get_type
+  (c-name "empathy_theme_manager_get_type")
+  (return-type "GType")
+)
+
+(define-function theme_manager_get
+  (c-name "empathy_theme_manager_get")
+  (return-type "EmpathyThemeManager*")
+)
+
+(define-function theme_manager_get_themes
+  (c-name "empathy_theme_manager_get_themes")
+  (return-type "const-gchar**")
+)
+
+(define-method apply
+  (of-object "EmpathyThemeManager")
+  (c-name "empathy_theme_manager_apply")
+  (return-type "none")
+  (parameters
+    '("EmpathyChatView*" "view")
+    '("const-gchar*" "theme")
+  )
+)
+
+(define-method apply_saved
+  (of-object "EmpathyThemeManager")
+  (c-name "empathy_theme_manager_apply_saved")
+  (return-type "none")
+  (parameters
+    '("EmpathyChatView*" "view")
+  )
 )
 
 
@@ -1520,303 +1827,3 @@
 )
 
 
-
-;; From empathy-cell-renderer-activatable.h
-
-(define-function cell_renderer_activatable_get_type
-  (c-name "empathy_cell_renderer_activatable_get_type")
-  (return-type "GType")
-)
-
-(define-function cell_renderer_activatable_new
-  (c-name "empathy_cell_renderer_activatable_new")
-  (is-constructor-of "EmpathyCellRendererActivatable")
-  (return-type "GtkCellRenderer*")
-)
-
-
-
-;; From empathy-contact-widget.h
-
-(define-method widget_new
-  (of-object "EmpathyContact")
-  (c-name "empathy_contact_widget_new")
-  (return-type "GtkWidget*")
-  (parameters
-    '("EmpathyContactWidgetFlags" "flags")
-  )
-)
-
-(define-function contact_widget_get_contact
-  (c-name "empathy_contact_widget_get_contact")
-  (return-type "EmpathyContact*")
-  (parameters
-    '("GtkWidget*" "widget")
-  )
-)
-
-(define-function contact_widget_set_contact
-  (c-name "empathy_contact_widget_set_contact")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("EmpathyContact*" "contact")
-  )
-)
-
-(define-function contact_widget_set_account_filter
-  (c-name "empathy_contact_widget_set_account_filter")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("EmpathyAccountChooserFilterFunc" "filter")
-    '("gpointer" "user_data")
-  )
-)
-
-
-
-;; From empathy-profile-chooser.h
-
-(define-function profile_chooser_new
-  (c-name "empathy_profile_chooser_new")
-  (is-constructor-of "EmpathyProfileChooser")
-  (return-type "GtkWidget*")
-)
-
-(define-function profile_chooser_get_selected
-  (c-name "empathy_profile_chooser_get_selected")
-  (return-type "McProfile*")
-  (parameters
-    '("GtkWidget*" "widget")
-  )
-)
-
-(define-function profile_chooser_n_profiles
-  (c-name "empathy_profile_chooser_n_profiles")
-  (return-type "gint")
-  (parameters
-    '("GtkWidget*" "widget")
-  )
-)
-
-
-
-;; From empathy-cell-renderer-expander.h
-
-(define-function cell_renderer_expander_get_type
-  (c-name "empathy_cell_renderer_expander_get_type")
-  (return-type "GType")
-)
-
-(define-function cell_renderer_expander_new
-  (c-name "empathy_cell_renderer_expander_new")
-  (is-constructor-of "EmpathyCellRendererExpander")
-  (return-type "GtkCellRenderer*")
-)
-
-
-
-;; From empathy-geometry.h
-
-(define-function geometry_save
-  (c-name "empathy_geometry_save")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "name")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "w")
-    '("gint" "h")
-  )
-)
-
-(define-function geometry_load
-  (c-name "empathy_geometry_load")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "name")
-    '("gint*" "x")
-    '("gint*" "y")
-    '("gint*" "w")
-    '("gint*" "h")
-  )
-)
-
-
-
-;; From empathy-smiley-manager.h
-
-(define-function smiley_manager_get_type
-  (c-name "empathy_smiley_manager_get_type")
-  (return-type "GType")
-)
-
-(define-function smiley_manager_new
-  (c-name "empathy_smiley_manager_new")
-  (is-constructor-of "EmpathySmileyManager")
-  (return-type "EmpathySmileyManager*")
-)
-
-(define-method load
-  (of-object "EmpathySmileyManager")
-  (c-name "empathy_smiley_manager_load")
-  (return-type "none")
-)
-
-(define-method add
-  (of-object "EmpathySmileyManager")
-  (c-name "empathy_smiley_manager_add")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "icon_name")
-    '("const-gchar*" "first_str")
-  )
-  (varargs #t)
-)
-
-(define-method add_from_pixbuf
-  (of-object "EmpathySmileyManager")
-  (c-name "empathy_smiley_manager_add_from_pixbuf")
-  (return-type "none")
-  (parameters
-    '("GdkPixbuf*" "smiley")
-    '("const-gchar*" "first_str")
-  )
-  (varargs #t)
-)
-
-(define-method get_all
-  (of-object "EmpathySmileyManager")
-  (c-name "empathy_smiley_manager_get_all")
-  (return-type "GSList*")
-)
-
-(define-method parse
-  (of-object "EmpathySmileyManager")
-  (c-name "empathy_smiley_manager_parse")
-  (return-type "GSList*")
-  (parameters
-    '("const-gchar*" "text")
-  )
-)
-
-(define-method free
-  (of-object "EmpathySmiley")
-  (c-name "empathy_smiley_free")
-  (return-type "none")
-)
-
-
-
-;; From empathy-cell-renderer-text.h
-
-(define-function cell_renderer_text_get_type
-  (c-name "empathy_cell_renderer_text_get_type")
-  (return-type "GType")
-)
-
-(define-function cell_renderer_text_new
-  (c-name "empathy_cell_renderer_text_new")
-  (is-constructor-of "EmpathyCellRendererText")
-  (return-type "GtkCellRenderer*")
-)
-
-
-
-;; From empathy-spell.h
-
-(define-function spell_supported
-  (c-name "empathy_spell_supported")
-  (return-type "gboolean")
-)
-
-(define-function spell_get_language_name
-  (c-name "empathy_spell_get_language_name")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "code")
-  )
-)
-
-(define-function spell_get_language_codes
-  (c-name "empathy_spell_get_language_codes")
-  (return-type "GList*")
-)
-
-(define-function spell_free_language_codes
-  (c-name "empathy_spell_free_language_codes")
-  (return-type "none")
-  (parameters
-    '("GList*" "codes")
-  )
-)
-
-(define-function spell_check
-  (c-name "empathy_spell_check")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "word")
-  )
-)
-
-(define-function spell_get_suggestions
-  (c-name "empathy_spell_get_suggestions")
-  (return-type "GList*")
-  (parameters
-    '("const-gchar*" "word")
-  )
-)
-
-(define-function spell_free_suggestions
-  (c-name "empathy_spell_free_suggestions")
-  (return-type "none")
-  (parameters
-    '("GList*" "suggestions")
-  )
-)
-
-
-
-;; From empathy-contact-menu.h
-
-(define-method menu_new
-  (of-object "EmpathyContact")
-  (c-name "empathy_contact_menu_new")
-  (return-type "GtkWidget*")
-  (parameters
-    '("EmpathyContactFeatureFlags" "features")
-  )
-)
-
-(define-method chat_menu_item_new
-  (of-object "EmpathyContact")
-  (c-name "empathy_contact_chat_menu_item_new")
-  (return-type "GtkWidget*")
-)
-
-(define-method call_menu_item_new
-  (of-object "EmpathyContact")
-  (c-name "empathy_contact_call_menu_item_new")
-  (return-type "GtkWidget*")
-)
-
-(define-method log_menu_item_new
-  (of-object "EmpathyContact")
-  (c-name "empathy_contact_log_menu_item_new")
-  (return-type "GtkWidget*")
-)
-
-(define-method info_menu_item_new
-  (of-object "EmpathyContact")
-  (c-name "empathy_contact_info_menu_item_new")
-  (return-type "GtkWidget*")
-)
-
-(define-method edit_menu_item_new
-  (of-object "EmpathyContact")
-  (c-name "empathy_contact_edit_menu_item_new")
-  (return-type "GtkWidget*")
-)
-
-
diff --git a/python/update-binding.sh b/python/update-binding.sh
index 8ab351bec..e00c7ce6a 100755
--- a/python/update-binding.sh
+++ b/python/update-binding.sh
@@ -3,72 +3,72 @@
 
 # Update the list of headers from Makefile.am
 cd ../libempathy
-python /usr/share/pygtk/2.0/codegen/h2def.py	\
+python /usr/share/pygobject/2.0/codegen/h2def.py	\
         -m empathy				\
-	empathy-time.h				\
-	empathy-status-presets.h		\
-	empathy-debug.h				\
-	empathy-utils.h				\
-	empathy-message.h			\
-	empathy-chatroom-manager.h		\
 	empathy-chatroom.h			\
+	empathy-chatroom-manager.h		\
 	empathy-contact.h			\
+	empathy-contact-factory.h		\
 	empathy-contact-groups.h		\
 	empathy-contact-list.h			\
 	empathy-contact-manager.h		\
-	empathy-contact-factory.h		\
+	empathy-debug.h				\
+	empathy-dispatcher.h			\
+	empathy-idle.h				\
+	empathy-irc-network.h			\
+	empathy-irc-network-manager.h		\
+	empathy-irc-server.h			\
+	empathy-log-manager.h			\
+	empathy-message.h			\
+	empathy-status-presets.h		\
+	empathy-time.h				\
+	empathy-tp-call.h			\
+	empathy-tp-chat.h			\
 	empathy-tp-contact-factory.h		\
-	empathy-tp-group.h			\
 	empathy-tp-contact-list.h		\
-	empathy-tp-chat.h			\
+	empathy-tp-group.h			\
 	empathy-tp-roomlist.h			\
-	empathy-tp-call.h			\
 	empathy-tp-tube.h			\
-	empathy-idle.h				\
-	empathy-log-manager.h			\
-	empathy-irc-network-manager.h		\
-	empathy-irc-network.h			\
-	empathy-irc-server.h			\
 	empathy-tube-handler.h			\
-	empathy-dispatcher.h			\
+	empathy-utils.h				\
  > ../python/pyempathy/pyempathy.defs
 
 # Update the list of headers from Makefile.am
 cd ../libempathy-gtk
-python /usr/share/pygtk/2.0/codegen/h2def.py	\
+python /usr/share/pygobject/2.0/codegen/h2def.py	\
 	-m empathy				\
-	empathy-images.h			\
 	empathy-account-chooser.h		\
-	empathy-chat.h				\
-	empathy-irc-network-dialog.h		\
-	empathy-spell-dialog.h			\
-	empathy-chat-view.h			\
-	empathy-log-window.h			\
-	empathy-theme-boxes.h			\
 	empathy-account-widget.h		\
-	empathy-conf.h				\
-	empathy-theme.h				\
 	empathy-account-widget-irc.h		\
 	empathy-account-widget-sip.h		\
-	empathy-contact-dialogs.h		\
-	empathy-new-message-dialog.h		\
-	empathy-theme-irc.h			\
 	empathy-avatar-chooser.h		\
-	empathy-contact-list-store.h		\
-	empathy-presence-chooser.h		\
-	empathy-theme-manager.h			\
 	empathy-avatar-image.h			\
-	empathy-contact-list-view.h		\
-	empathy-ui-utils.h			\
 	empathy-cell-renderer-activatable.h	\
-	empathy-contact-widget.h		\
-	empathy-profile-chooser.h		\
 	empathy-cell-renderer-expander.h	\
+	empathy-cell-renderer-text.h		\
+	empathy-chat.h				\
+	empathy-chat-view.h			\
+	empathy-conf.h				\
+	empathy-contact-dialogs.h		\
+	empathy-contact-list-store.h		\
+	empathy-contact-list-view.h		\
+	empathy-contact-menu.h			\
+	empathy-contact-widget.h		\
 	empathy-geometry.h			\
+	empathy-images.h			\
+	empathy-irc-network-dialog.h		\
+	empathy-log-window.h			\
+	empathy-new-message-dialog.h		\
+	empathy-presence-chooser.h		\
+	empathy-profile-chooser.h		\
 	empathy-smiley-manager.h		\
-	empathy-cell-renderer-text.h		\
 	empathy-spell.h				\
-	empathy-contact-menu.h			\
+	empathy-spell-dialog.h			\
+	empathy-theme-boxes.h			\
+	empathy-theme.h				\
+	empathy-theme-irc.h			\
+	empathy-theme-manager.h			\
+	empathy-ui-utils.h			\
  > ../python/pyempathygtk/pyempathygtk.defs
 
 # Keep original version