Update python binding and add a script to make it more automatic

git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@799 4ee84921-47dd-4033-b63a-18d7a039a3e4

6 files changed, 1708 insertions, 1890 deletions

diff --git a/python/README b/python/README
deleted file mode 100644
index 9cae95c1f..000000000
--- a/python/README
+++ /dev/null
@@ -1,11 +0,0 @@
-To update python binding:
-1)
-  $ make distclean
-  $ python /usr/share/pygtk/2.0/codegen/h2def.py libempathy/*.h > python/pyempathy/pyempathy.defs
-  $ python /usr/share/pygtk/2.0/codegen/h2def.py libempathy-gtk/*.h > python/pyempathygtk/pyempathygtk.defs
-
-2)
-Apply pyempathy.patch and pyempathygtk.patch
-
-3)
-Manually update headers in pyempathy.override and pyempathygtk.override.
diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 3cdaafcd9..d75155c4c 100644
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -151,15 +151,16 @@
 
 ;; Enumerations and flags ...
 
-(define-flags Capabilities
+(define-enum RegExType
   (in-module "Empathy")
-  (c-name "EmpathyCapabilities")
-  (gtype-id "EMPATHY_TYPE_CAPABILITIES")
+  (c-name "EmpathyRegExType")
+  (gtype-id "EMPATHY_TYPE_REG_EX_TYPE")
   (values
-    '("none" "EMPATHY_CAPABILITIES_NONE")
-    '("audio" "EMPATHY_CAPABILITIES_AUDIO")
-    '("video" "EMPATHY_CAPABILITIES_VIDEO")
-    '("unknown" "EMPATHY_CAPABILITIES_UNKNOWN")
+    '("as-is" "EMPATHY_REGEX_AS_IS")
+    '("browser" "EMPATHY_REGEX_BROWSER")
+    '("email" "EMPATHY_REGEX_EMAIL")
+    '("other" "EMPATHY_REGEX_OTHER")
+    '("all" "EMPATHY_REGEX_ALL")
   )
 )
 
@@ -176,6 +177,31 @@
   )
 )
 
+(define-flags Capabilities
+  (in-module "Empathy")
+  (c-name "EmpathyCapabilities")
+  (gtype-id "EMPATHY_TYPE_CAPABILITIES")
+  (values
+    '("none" "EMPATHY_CAPABILITIES_NONE")
+    '("audio" "EMPATHY_CAPABILITIES_AUDIO")
+    '("video" "EMPATHY_CAPABILITIES_VIDEO")
+    '("unknown" "EMPATHY_CAPABILITIES_UNKNOWN")
+  )
+)
+
+(define-flags ContactReady
+  (in-module "Empathy")
+  (c-name "EmpathyContactReady")
+  (gtype-id "EMPATHY_TYPE_CONTACT_READY")
+  (values
+    '("none" "EMPATHY_CONTACT_READY_NONE")
+    '("id" "EMPATHY_CONTACT_READY_ID")
+    '("handle" "EMPATHY_CONTACT_READY_HANDLE")
+    '("name" "EMPATHY_CONTACT_READY_NAME")
+    '("all" "EMPATHY_CONTACT_READY_ALL")
+  )
+)
+
 (define-enum TpCallStatus
   (in-module "Empathy")
   (c-name "EmpathyTpCallStatus")
@@ -188,19 +214,6 @@
   )
 )
 
-(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")
-    '("email" "EMPATHY_REGEX_EMAIL")
-    '("other" "EMPATHY_REGEX_OTHER")
-    '("all" "EMPATHY_REGEX_ALL")
-  )
-)
-
 
 ;; From empathy-avatar.h
 
@@ -243,122 +256,428 @@
 
 
 
-;; From empathy-chandler.h
+;; From empathy-time.h
 
-(define-function empathy_chandler_get_type
-  (c-name "empathy_chandler_get_type")
-  (return-type "GType")
+(define-function empathy_time_get_current
+  (c-name "empathy_time_get_current")
+  (return-type "time_t")
 )
 
-(define-function empathy_chandler_new
-  (c-name "empathy_chandler_new")
-  (is-constructor-of "EmpathyChandler")
-  (return-type "EmpathyChandler*")
+(define-function empathy_time_get_local_time
+  (c-name "empathy_time_get_local_time")
+  (return-type "time_t")
   (parameters
-    '("const-gchar*" "bus_name")
-    '("const-gchar*" "object_path")
+    '("struct-tm*" "tm")
   )
 )
 
+(define-function empathy_time_parse
+  (c-name "empathy_time_parse")
+  (return-type "time_t")
+  (parameters
+    '("const-gchar*" "str")
+  )
+)
 
+(define-function empathy_time_to_string_utc
+  (c-name "empathy_time_to_string_utc")
+  (return-type "gchar*")
+  (parameters
+    '("time_t" "t")
+    '("const-gchar*" "format")
+  )
+)
 
-;; From empathy-chatroom.h
+(define-function empathy_time_to_string_local
+  (c-name "empathy_time_to_string_local")
+  (return-type "gchar*")
+  (parameters
+    '("time_t" "t")
+    '("const-gchar*" "format")
+  )
+)
 
-(define-function empathy_chatroom_get_type
-  (c-name "empathy_chatroom_get_type")
-  (return-type "GType")
+
+
+;; From empathy-status-presets.h
+
+(define-function empathy_status_presets_get_all
+  (c-name "empathy_status_presets_get_all")
+  (return-type "none")
 )
 
-(define-function empathy_chatroom_new
-  (c-name "empathy_chatroom_new")
-  (is-constructor-of "EmpathyChatroom")
-  (return-type "EmpathyChatroom*")
+(define-function empathy_status_presets_get
+  (c-name "empathy_status_presets_get")
+  (return-type "GList*")
+  (parameters
+    '("McPresence" "state")
+    '("gint" "max_number")
+  )
+)
+
+(define-function empathy_status_presets_set_last
+  (c-name "empathy_status_presets_set_last")
+  (return-type "none")
+  (parameters
+    '("McPresence" "state")
+    '("const-gchar*" "status")
+  )
+)
+
+(define-function empathy_status_presets_remove
+  (c-name "empathy_status_presets_remove")
+  (return-type "none")
+  (parameters
+    '("McPresence" "state")
+    '("const-gchar*" "status")
+  )
+)
+
+(define-function empathy_status_presets_reset
+  (c-name "empathy_status_presets_reset")
+  (return-type "none")
+)
+
+(define-function empathy_status_presets_get_default_state
+  (c-name "empathy_status_presets_get_default_state")
+  (return-type "McPresence")
+)
+
+(define-function empathy_status_presets_get_default_status
+  (c-name "empathy_status_presets_get_default_status")
+  (return-type "const-gchar*")
+)
+
+(define-function empathy_status_presets_set_default
+  (c-name "empathy_status_presets_set_default")
+  (return-type "none")
+  (parameters
+    '("McPresence" "state")
+    '("const-gchar*" "status")
+  )
+)
+
+(define-function empathy_status_presets_clear_default
+  (c-name "empathy_status_presets_clear_default")
+  (return-type "none")
+)
+
+
+
+;; From empathy-debug.h
+
+(define-function empathy_debug_impl
+  (c-name "empathy_debug_impl")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "domain")
+    '("const-gchar*" "msg")
+  )
+  (varargs #t)
+)
+
+(define-function empathy_debug_set_log_file_from_env
+  (c-name "empathy_debug_set_log_file_from_env")
+  (return-type "none")
+)
+
+
+
+;; From empathy-utils.h
+
+(define-function empathy_substring
+  (c-name "empathy_substring")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "str")
+    '("gint" "start")
+    '("gint" "end")
+  )
+)
+
+(define-function empathy_regex_match
+  (c-name "empathy_regex_match")
+  (return-type "gint")
+  (parameters
+    '("EmpathyRegExType" "type")
+    '("const-gchar*" "msg")
+    '("GArray*" "start")
+    '("GArray*" "end")
+  )
+)
+
+(define-function empathy_strcasecmp
+  (c-name "empathy_strcasecmp")
+  (return-type "gint")
+  (parameters
+    '("const-gchar*" "s1")
+    '("const-gchar*" "s2")
+  )
+)
+
+(define-function empathy_strncasecmp
+  (c-name "empathy_strncasecmp")
+  (return-type "gint")
+  (parameters
+    '("const-gchar*" "s1")
+    '("const-gchar*" "s2")
+    '("gsize" "n")
+  )
+)
+
+(define-function empathy_xml_validate
+  (c-name "empathy_xml_validate")
+  (return-type "gboolean")
+  (parameters
+    '("xmlDoc*" "doc")
+    '("const-gchar*" "dtd_filename")
+  )
+)
+
+(define-function empathy_xml_node_get_child
+  (c-name "empathy_xml_node_get_child")
+  (return-type "xmlNodePtr")
+  (parameters
+    '("xmlNodePtr" "node")
+    '("const-gchar*" "child_name")
+  )
+)
+
+(define-function empathy_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 empathy_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 empathy_account_hash
+  (c-name "empathy_account_hash")
+  (return-type "guint")
+  (parameters
+    '("gconstpointer" "key")
+  )
+)
+
+(define-function empathy_account_equal
+  (c-name "empathy_account_equal")
+  (return-type "gboolean")
+  (parameters
+    '("gconstpointer" "a")
+    '("gconstpointer" "b")
+  )
+)
+
+(define-function empathy_mission_control_new
+  (c-name "empathy_mission_control_new")
+  (is-constructor-of "EmpathyMissionControl")
+  (return-type "MissionControl*")
+)
+
+(define-function empathy_inspect_handle
+  (c-name "empathy_inspect_handle")
+  (return-type "gchar*")
   (parameters
     '("McAccount*" "account")
-    '("const-gchar*" "room")
+    '("guint" "handle")
+    '("guint" "handle_type")
   )
 )
 
-(define-function empathy_chatroom_new_full
-  (c-name "empathy_chatroom_new_full")
-  (return-type "EmpathyChatroom*")
+(define-function empathy_inspect_channel
+  (c-name "empathy_inspect_channel")
+  (return-type "gchar*")
   (parameters
     '("McAccount*" "account")
-    '("const-gchar*" "room")
-    '("const-gchar*" "name")
-    '("gboolean" "auto_connect")
+    '("TpChan*" "tp_chan")
   )
 )
 
-(define-method get_account
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_get_account")
-  (return-type "McAccount*")
+(define-function empathy_call_with_contact
+  (c-name "empathy_call_with_contact")
+  (return-type "none")
+  (parameters
+    '("EmpathyContact*" "contact")
+  )
 )
 
-(define-method set_account
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_set_account")
+(define-function empathy_call_with_contact_id
+  (c-name "empathy_call_with_contact_id")
   (return-type "none")
   (parameters
     '("McAccount*" "account")
+    '("const-gchar*" "contact_id")
   )
 )
 
-(define-method get_room
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_get_room")
+(define-function empathy_chat_with_contact
+  (c-name "empathy_chat_with_contact")
+  (return-type "none")
+  (parameters
+    '("EmpathyContact*" "contact")
+  )
+)
+
+(define-function empathy_chat_with_contact_id
+  (c-name "empathy_chat_with_contact_id")
+  (return-type "none")
+  (parameters
+    '("McAccount*" "account")
+    '("const-gchar*" "contact_id")
+  )
+)
+
+(define-function empathy_presence_get_default_message
+  (c-name "empathy_presence_get_default_message")
   (return-type "const-gchar*")
+  (parameters
+    '("McPresence" "presence")
+  )
 )
 
-(define-method set_room
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_set_room")
+(define-function empathy_presence_to_str
+  (c-name "empathy_presence_to_str")
+  (return-type "const-gchar*")
+  (parameters
+    '("McPresence" "presence")
+  )
+)
+
+(define-function empathy_presence_from_str
+  (c-name "empathy_presence_from_str")
+  (return-type "McPresence")
+  (parameters
+    '("const-gchar*" "str")
+  )
+)
+
+
+
+;; From empathy-message.h
+
+(define-function empathy_message_get_gtype
+  (c-name "empathy_message_get_gtype")
+  (return-type "GType")
+)
+
+(define-function empathy_message_new
+  (c-name "empathy_message_new")
+  (is-constructor-of "EmpathyMessage")
+  (return-type "EmpathyMessage*")
+  (parameters
+    '("const-gchar*" "body")
+  )
+)
+
+(define-method get_type
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_type")
+  (return-type "EmpathyMessageType")
+)
+
+(define-method set_type
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_set_type")
   (return-type "none")
   (parameters
-    '("const-gchar*" "room")
+    '("EmpathyMessageType" "type")
   )
 )
 
-(define-method get_name
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_get_name")
+(define-method get_sender
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_sender")
+  (return-type "EmpathyContact*")
+)
+
+(define-method set_sender
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_set_sender")
+  (return-type "none")
+  (parameters
+    '("EmpathyContact*" "contact")
+  )
+)
+
+(define-method get_receiver
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_receiver")
+  (return-type "EmpathyContact*")
+)
+
+(define-method set_receiver
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_set_receiver")
+  (return-type "none")
+  (parameters
+    '("EmpathyContact*" "contact")
+  )
+)
+
+(define-method get_body
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_body")
   (return-type "const-gchar*")
 )
 
-(define-method set_name
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_set_name")
+(define-method set_body
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_set_body")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
+    '("const-gchar*" "body")
   )
 )
 
-(define-method get_auto_connect
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_get_auto_connect")
-  (return-type "gboolean")
+(define-method get_timestamp
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_timestamp")
+  (return-type "time_t")
 )
 
-(define-method set_auto_connect
-  (of-object "EmpathyChatroom")
-  (c-name "empathy_chatroom_set_auto_connect")
+(define-method set_timestamp
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_set_timestamp")
   (return-type "none")
   (parameters
-    '("gboolean" "auto_connect")
+    '("time_t" "timestamp")
   )
 )
 
-(define-function empathy_chatroom_equal
-  (c-name "empathy_chatroom_equal")
-  (return-type "gboolean")
+(define-method get_date_and_time
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_date_and_time")
+  (return-type "GDate*")
   (parameters
-    '("gconstpointer" "v1")
-    '("gconstpointer" "v2")
+    '("time_t*" "timestamp")
   )
 )
 
+(define-function empathy_message_type_from_str
+  (c-name "empathy_message_type_from_str")
+  (return-type "EmpathyMessageType")
+  (parameters
+    '("const-gchar*" "type_str")
+  )
+)
+
+(define-method to_str
+  (of-object "EmpathyMessageType")
+  (c-name "empathy_message_type_to_str")
+  (return-type "const-gchar*")
+)
+
 
 
 ;; From empathy-chatroom-manager.h
@@ -428,103 +747,100 @@
 
 
 
-;; From empathy-contact-factory.h
+;; From empathy-chatroom.h
 
-(define-function empathy_contact_factory_get_type
-  (c-name "empathy_contact_factory_get_type")
+(define-function empathy_chatroom_get_type
+  (c-name "empathy_chatroom_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_contact_factory_new
-  (c-name "empathy_contact_factory_new")
-  (is-constructor-of "EmpathyContactFactory")
-  (return-type "EmpathyContactFactory*")
-)
-
-(define-method get_user
-  (of-object "EmpathyContactFactory")
-  (c-name "empathy_contact_factory_get_user")
-  (return-type "EmpathyContact*")
+(define-function empathy_chatroom_new
+  (c-name "empathy_chatroom_new")
+  (is-constructor-of "EmpathyChatroom")
+  (return-type "EmpathyChatroom*")
   (parameters
     '("McAccount*" "account")
+    '("const-gchar*" "room")
   )
 )
 
-(define-method get_from_id
-  (of-object "EmpathyContactFactory")
-  (c-name "empathy_contact_factory_get_from_id")
-  (return-type "EmpathyContact*")
+(define-function empathy_chatroom_new_full
+  (c-name "empathy_chatroom_new_full")
+  (return-type "EmpathyChatroom*")
   (parameters
     '("McAccount*" "account")
-    '("const-gchar*" "id")
+    '("const-gchar*" "room")
+    '("const-gchar*" "name")
+    '("gboolean" "auto_connect")
   )
 )
 
-(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_account
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_get_account")
+  (return-type "McAccount*")
 )
 
-(define-method get_from_handles
-  (of-object "EmpathyContactFactory")
-  (c-name "empathy_contact_factory_get_from_handles")
-  (return-type "GList*")
+(define-method set_account
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_set_account")
+  (return-type "none")
   (parameters
     '("McAccount*" "account")
-    '("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 get_room
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_get_room")
+  (return-type "const-gchar*")
 )
 
-(define-method set_avatar
-  (of-object "EmpathyContactFactory")
-  (c-name "empathy_contact_factory_set_avatar")
+(define-method set_room
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_set_room")
   (return-type "none")
   (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "data")
-    '("gsize" "size")
-    '("const-gchar*" "mime_type")
+    '("const-gchar*" "room")
   )
 )
 
+(define-method get_name
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_get_name")
+  (return-type "const-gchar*")
+)
 
-
-;; From empathy-contact-groups.h
-
-(define-function empathy_contact_groups_get_all
-  (c-name "empathy_contact_groups_get_all")
+(define-method set_name
+  (of-object "EmpathyChatroom")
+  (c-name "empathy_chatroom_set_name")
   (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+  )
 )
 
-(define-function empathy_contact_group_get_expanded
-  (c-name "empathy_contact_group_get_expanded")
+(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
-    '("const-gchar*" "group")
+    '("gboolean" "auto_connect")
   )
 )
 
-(define-function empathy_contact_group_set_expanded
-  (c-name "empathy_contact_group_set_expanded")
-  (return-type "none")
+(define-function empathy_chatroom_equal
+  (c-name "empathy_chatroom_equal")
+  (return-type "gboolean")
   (parameters
-    '("const-gchar*" "group")
-    '("gboolean" "expanded")
+    '("gconstpointer" "v1")
+    '("gconstpointer" "v2")
   )
 )
 
@@ -676,6 +992,12 @@
   )
 )
 
+(define-method get_ready
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_get_ready")
+  (return-type "EmpathyContactReady")
+)
+
 (define-method is_user
   (of-object "EmpathyContact")
   (c-name "empathy_contact_is_user")
@@ -726,6 +1048,42 @@
   )
 )
 
+(define-method run_until_ready
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_run_until_ready")
+  (return-type "none")
+  (parameters
+    '("EmpathyContactReady" "ready")
+    '("GMainLoop**" "loop")
+  )
+)
+
+
+
+;; From empathy-contact-groups.h
+
+(define-function empathy_contact_groups_get_all
+  (c-name "empathy_contact_groups_get_all")
+  (return-type "none")
+)
+
+(define-function empathy_contact_group_get_expanded
+  (c-name "empathy_contact_group_get_expanded")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "group")
+  )
+)
+
+(define-function empathy_contact_group_set_expanded
+  (c-name "empathy_contact_group_set_expanded")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group")
+    '("gboolean" "expanded")
+  )
+)
+
 
 
 ;; From empathy-contact-list.h
@@ -847,624 +1205,481 @@
 
 
 
-;; From empathy-debug.h
-
-(define-function empathy_debug_impl
-  (c-name "empathy_debug_impl")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "domain")
-    '("const-gchar*" "msg")
-  )
-  (varargs #t)
-)
-
-(define-function empathy_debug_set_log_file_from_env
-  (c-name "empathy_debug_set_log_file_from_env")
-  (return-type "none")
-)
-
-
-
-;; From empathy-filter.h
+;; From empathy-contact-factory.h
 
-(define-function empathy_filter_get_type
-  (c-name "empathy_filter_get_type")
+(define-function empathy_contact_factory_get_type
+  (c-name "empathy_contact_factory_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_filter_new
-  (c-name "empathy_filter_new")
-  (is-constructor-of "EmpathyFilter")
-  (return-type "EmpathyFilter*")
-  (parameters
-    '("const-gchar*" "bus_name")
-    '("const-gchar*" "object_path")
-    '("const-gchar*" "channel_type")
-    '("guint" "priority")
-    '("guint" "flags")
-  )
+(define-function empathy_contact_factory_new
+  (c-name "empathy_contact_factory_new")
+  (is-constructor-of "EmpathyContactFactory")
+  (return-type "EmpathyContactFactory*")
 )
 
-(define-method process
-  (of-object "EmpathyFilter")
-  (c-name "empathy_filter_process")
-  (return-type "none")
+(define-method get_tp_factory
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_get_tp_factory")
+  (return-type "EmpathyTpContactFactory*")
   (parameters
-    '("TpChan*" "tp_chan")
-    '("gboolean" "process")
+    '("McAccount*" "account")
   )
 )
 
-
-
-;; From empathy-idle.h
-
-(define-function empathy_idle_get_type
-  (c-name "empathy_idle_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_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")
+(define-method get_user
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_get_user")
+  (return-type "EmpathyContact*")
   (parameters
-    '("McPresence" "state")
+    '("McAccount*" "account")
   )
 )
 
-(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_id
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_get_from_id")
+  (return-type "EmpathyContact*")
   (parameters
-    '("const-gchar*" "status")
+    '("McAccount*" "account")
+    '("const-gchar*" "id")
   )
 )
 
-(define-method get_flash_state
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_get_flash_state")
-  (return-type "McPresence")
-)
-
-(define-method set_flash_state
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_set_flash_state")
-  (return-type "none")
+(define-method get_from_handle
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_get_from_handle")
+  (return-type "EmpathyContact*")
   (parameters
-    '("McPresence" "state")
+    '("McAccount*" "account")
+    '("guint" "handle")
   )
 )
 
-(define-method set_presence
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_set_presence")
-  (return-type "none")
+(define-method get_from_handles
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_get_from_handles")
+  (return-type "GList*")
   (parameters
-    '("McPresence" "state")
-    '("const-gchar*" "status")
+    '("McAccount*" "account")
+    '("GArray*" "handles")
   )
 )
 
-(define-method get_auto_away
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_get_auto_away")
-  (return-type "gboolean")
-)
-
-(define-method set_auto_away
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_set_auto_away")
+(define-method set_alias
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_set_alias")
   (return-type "none")
   (parameters
-    '("gboolean" "auto_away")
+    '("EmpathyContact*" "contact")
+    '("const-gchar*" "alias")
   )
 )
 
-(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")
+(define-method set_avatar
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_set_avatar")
   (return-type "none")
   (parameters
-    '("gboolean" "use_nm")
+    '("McAccount*" "account")
+    '("const-gchar*" "data")
+    '("gsize" "size")
+    '("const-gchar*" "mime_type")
   )
 )
 
 
 
-;; From empathy-irc-network.h
+;; From empathy-tp-contact-factory.h
 
-(define-function empathy_irc_network_get_type
-  (c-name "empathy_irc_network_get_type")
+(define-function empathy_tp_contact_factory_get_type
+  (c-name "empathy_tp_contact_factory_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_irc_network_new
-  (c-name "empathy_irc_network_new")
-  (is-constructor-of "EmpathyIrcNetwork")
-  (return-type "EmpathyIrcNetwork*")
+(define-function empathy_tp_contact_factory_new
+  (c-name "empathy_tp_contact_factory_new")
+  (is-constructor-of "EmpathyTpContactFactory")
+  (return-type "EmpathyTpContactFactory*")
   (parameters
-    '("const-gchar*" "name")
+    '("McAccount*" "account")
   )
 )
 
-(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
-    '("EmpathyIrcServer*" "server")
-  )
+(define-method get_user
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_get_user")
+  (return-type "EmpathyContact*")
 )
 
-(define-method remove_server
-  (of-object "EmpathyIrcNetwork")
-  (c-name "empathy_irc_network_remove_server")
-  (return-type "none")
+(define-method get_from_id
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_get_from_id")
+  (return-type "EmpathyContact*")
   (parameters
-    '("EmpathyIrcServer*" "server")
+    '("const-gchar*" "id")
   )
 )
 
-(define-method set_server_position
-  (of-object "EmpathyIrcNetwork")
-  (c-name "empathy_irc_network_set_server_position")
-  (return-type "none")
+(define-method get_from_handle
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_get_from_handle")
+  (return-type "EmpathyContact*")
   (parameters
-    '("EmpathyIrcServer*" "server")
-    '("gint" "pos")
+    '("guint" "handle")
   )
 )
 
-
-
-;; From empathy-irc-network-manager.h
-
-(define-function empathy_irc_network_manager_get_type
-  (c-name "empathy_irc_network_manager_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_irc_network_manager_new
-  (c-name "empathy_irc_network_manager_new")
-  (is-constructor-of "EmpathyIrcNetworkManager")
-  (return-type "EmpathyIrcNetworkManager*")
+(define-method get_from_handles
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_get_from_handles")
+  (return-type "GList*")
   (parameters
-    '("const-gchar*" "global_file")
-    '("const-gchar*" "user_file")
+    '("const-GArray*" "handles")
   )
 )
 
-(define-method add
-  (of-object "EmpathyIrcNetworkManager")
-  (c-name "empathy_irc_network_manager_add")
+(define-method set_alias
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_set_alias")
   (return-type "none")
   (parameters
-    '("EmpathyIrcNetwork*" "network")
+    '("EmpathyContact*" "contact")
+    '("const-gchar*" "alias")
   )
 )
 
-(define-method remove
-  (of-object "EmpathyIrcNetworkManager")
-  (c-name "empathy_irc_network_manager_remove")
+(define-method set_avatar
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_set_avatar")
   (return-type "none")
   (parameters
-    '("EmpathyIrcNetwork*" "network")
+    '("const-gchar*" "data")
+    '("gsize" "size")
+    '("const-gchar*" "mime_type")
   )
 )
 
-(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 is_ready
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_is_ready")
+  (return-type "gboolean")
 )
 
 
 
-;; From empathy-irc-server.h
+;; From empathy-tp-group.h
 
-(define-function empathy_irc_server_get_type
-  (c-name "empathy_irc_server_get_type")
+(define-function empathy_tp_group_get_type
+  (c-name "empathy_tp_group_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_irc_server_new
-  (c-name "empathy_irc_server_new")
-  (is-constructor-of "EmpathyIrcServer")
-  (return-type "EmpathyIrcServer*")
+(define-function empathy_tp_group_new
+  (c-name "empathy_tp_group_new")
+  (is-constructor-of "EmpathyTpGroup")
+  (return-type "EmpathyTpGroup*")
   (parameters
-    '("const-gchar*" "address")
-    '("guint" "port")
-    '("gboolean" "ssl")
+    '("McAccount*" "account")
+    '("TpChan*" "tp_chan")
   )
 )
 
-
-
-;; From empathy-log-manager.h
-
-(define-function empathy_log_manager_get_type
-  (c-name "empathy_log_manager_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_log_manager_new
-  (c-name "empathy_log_manager_new")
-  (is-constructor-of "EmpathyLogManager")
-  (return-type "EmpathyLogManager*")
+(define-method close
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_close")
+  (return-type "none")
 )
 
-(define-method add_message
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_add_message")
+(define-method add_members
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_add_members")
   (return-type "none")
   (parameters
-    '("const-gchar*" "chat_id")
-    '("gboolean" "chatroom")
-    '("EmpathyMessage*" "message")
+    '("GList*" "contacts")
+    '("const-gchar*" "message")
   )
 )
 
-(define-method exists
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_exists")
-  (return-type "gboolean")
+(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_dates
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_get_dates")
-  (return-type "GList*")
+(define-method remove_members
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_remove_members")
+  (return-type "none")
   (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "chat_id")
-    '("gboolean" "chatroom")
+    '("GList*" "contacts")
+    '("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_member
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_remove_member")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "filename")
+    '("EmpathyContact*" "contact")
+    '("const-gchar*" "message")
   )
 )
 
-(define-method get_messages_for_date
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_get_messages_for_date")
+(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")
-    '("const-gchar*" "date")
-  )
 )
 
-(define-method get_last_messages
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_get_last_messages")
+(define-method get_local_pendings
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_local_pendings")
   (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_remote_pendings
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_remote_pendings")
   (return-type "GList*")
-  (parameters
-    '("const-gchar*" "filename")
-  )
 )
 
-(define-method get_chats
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_get_chats")
-  (return-type "GList*")
-  (parameters
-    '("McAccount*" "account")
-  )
+(define-method get_name
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_name")
+  (return-type "const-gchar*")
 )
 
-(define-method search_new
-  (of-object "EmpathyLogManager")
-  (c-name "empathy_log_manager_search_new")
-  (return-type "GList*")
-  (parameters
-    '("const-gchar*" "text")
-  )
+(define-method get_self_contact
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_self_contact")
+  (return-type "EmpathyContact*")
 )
 
-(define-function empathy_log_manager_search_free
-  (c-name "empathy_log_manager_search_free")
-  (return-type "none")
+(define-method get_object_path
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_object_path")
+  (return-type "const-gchar*")
+)
+
+(define-method get_channel
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_channel")
+  (return-type "TpChan*")
+)
+
+(define-method is_member
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_is_member")
+  (return-type "gboolean")
   (parameters
-    '("GList*" "hits")
+    '("EmpathyContact*" "contact")
   )
 )
 
-(define-function empathy_log_manager_get_date_readable
-  (c-name "empathy_log_manager_get_date_readable")
-  (return-type "gchar*")
+(define-function empathy_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-message.h
 
-(define-function empathy_message_get_gtype
-  (c-name "empathy_message_get_gtype")
+;; From empathy-tp-contact-list.h
+
+(define-function empathy_tp_contact_list_get_type
+  (c-name "empathy_tp_contact_list_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_message_new
-  (c-name "empathy_message_new")
-  (is-constructor-of "EmpathyMessage")
-  (return-type "EmpathyMessage*")
+(define-function empathy_tp_contact_list_new
+  (c-name "empathy_tp_contact_list_new")
+  (is-constructor-of "EmpathyTpContactList")
+  (return-type "EmpathyTpContactList*")
   (parameters
-    '("const-gchar*" "body")
+    '("McAccount*" "account")
   )
 )
 
-(define-method get_type
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_get_type")
-  (return-type "EmpathyMessageType")
+(define-method get_account
+  (of-object "EmpathyTpContactList")
+  (c-name "empathy_tp_contact_list_get_account")
+  (return-type "McAccount*")
 )
 
-(define-method set_type
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_set_type")
-  (return-type "none")
-  (parameters
-    '("EmpathyMessageType" "type")
-  )
-)
 
-(define-method get_sender
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_get_sender")
-  (return-type "EmpathyContact*")
+
+;; From empathy-tp-chat.h
+
+(define-function empathy_tp_chat_get_type
+  (c-name "empathy_tp_chat_get_type")
+  (return-type "GType")
 )
 
-(define-method set_sender
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_set_sender")
-  (return-type "none")
+(define-function empathy_tp_chat_new
+  (c-name "empathy_tp_chat_new")
+  (is-constructor-of "EmpathyTpChat")
+  (return-type "EmpathyTpChat*")
   (parameters
-    '("EmpathyContact*" "contact")
+    '("McAccount*" "account")
+    '("TpChan*" "tp_chan")
   )
 )
 
-(define-method get_receiver
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_get_receiver")
-  (return-type "EmpathyContact*")
-)
-
-(define-method set_receiver
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_set_receiver")
-  (return-type "none")
+(define-function empathy_tp_chat_new_with_contact
+  (c-name "empathy_tp_chat_new_with_contact")
+  (return-type "EmpathyTpChat*")
   (parameters
     '("EmpathyContact*" "contact")
   )
 )
 
-(define-method get_body
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_get_body")
-  (return-type "const-gchar*")
+(define-method get_acknowledge
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_get_acknowledge")
+  (return-type "gboolean")
 )
 
-(define-method set_body
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_set_body")
+(define-method set_acknowledge
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_set_acknowledge")
   (return-type "none")
   (parameters
-    '("const-gchar*" "body")
+    '("gboolean" "acknowledge")
   )
 )
 
-(define-method get_timestamp
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_get_timestamp")
-  (return-type "time_t")
+(define-method get_account
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_get_account")
+  (return-type "McAccount*")
 )
 
-(define-method set_timestamp
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_set_timestamp")
-  (return-type "none")
-  (parameters
-    '("time_t" "timestamp")
-  )
+(define-method get_channel
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_get_channel")
+  (return-type "TpChan*")
 )
 
-(define-method get_date_and_time
-  (of-object "EmpathyMessage")
-  (c-name "empathy_message_get_date_and_time")
-  (return-type "GDate*")
+(define-method send
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_send")
+  (return-type "none")
   (parameters
-    '("time_t*" "timestamp")
+    '("EmpathyMessage*" "message")
   )
 )
 
-(define-function empathy_message_type_from_str
-  (c-name "empathy_message_type_from_str")
-  (return-type "EmpathyMessageType")
+(define-method set_state
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_set_state")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "type_str")
+    '("TpChannelChatState" "state")
   )
 )
 
-(define-method to_str
-  (of-object "EmpathyMessageType")
-  (c-name "empathy_message_type_to_str")
+(define-method get_id
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_get_id")
   (return-type "const-gchar*")
 )
 
-
-
-;; From empathy-status-presets.h
-
-(define-function empathy_status_presets_get_all
-  (c-name "empathy_status_presets_get_all")
+(define-method set_property
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_set_property")
   (return-type "none")
-)
-
-(define-function empathy_status_presets_get
-  (c-name "empathy_status_presets_get")
-  (return-type "GList*")
   (parameters
-    '("McPresence" "state")
-    '("gint" "max_number")
+    '("const-gchar*" "name")
+    '("const-GValue*" "value")
   )
 )
 
-(define-function empathy_status_presets_set_last
-  (c-name "empathy_status_presets_set_last")
-  (return-type "none")
-  (parameters
-    '("McPresence" "state")
-    '("const-gchar*" "status")
-  )
-)
 
-(define-function empathy_status_presets_remove
-  (c-name "empathy_status_presets_remove")
-  (return-type "none")
-  (parameters
-    '("McPresence" "state")
-    '("const-gchar*" "status")
-  )
-)
 
-(define-function empathy_status_presets_reset
-  (c-name "empathy_status_presets_reset")
-  (return-type "none")
-)
+;; From empathy-tp-chatroom.h
 
-(define-function empathy_status_presets_get_default_state
-  (c-name "empathy_status_presets_get_default_state")
-  (return-type "McPresence")
+(define-function empathy_tp_chatroom_get_type
+  (c-name "empathy_tp_chatroom_get_type")
+  (return-type "GType")
 )
 
-(define-function empathy_status_presets_get_default_status
-  (c-name "empathy_status_presets_get_default_status")
-  (return-type "const-gchar*")
+(define-function empathy_tp_chatroom_new
+  (c-name "empathy_tp_chatroom_new")
+  (is-constructor-of "EmpathyTpChatroom")
+  (return-type "EmpathyTpChatroom*")
+  (parameters
+    '("McAccount*" "account")
+    '("TpChan*" "tp_chan")
+  )
 )
 
-(define-function empathy_status_presets_set_default
-  (c-name "empathy_status_presets_set_default")
-  (return-type "none")
+(define-method get_invitation
+  (of-object "EmpathyTpChatroom")
+  (c-name "empathy_tp_chatroom_get_invitation")
+  (return-type "gboolean")
   (parameters
-    '("McPresence" "state")
-    '("const-gchar*" "status")
+    '("EmpathyContact**" "contact")
+    '("const-gchar**" "message")
   )
 )
 
-(define-function empathy_status_presets_clear_default
-  (c-name "empathy_status_presets_clear_default")
+(define-method accept_invitation
+  (of-object "EmpathyTpChatroom")
+  (c-name "empathy_tp_chatroom_accept_invitation")
   (return-type "none")
 )
 
 
 
-;; From empathy-time.h
+;; From empathy-tp-roomlist.h
 
-(define-function empathy_time_get_current
-  (c-name "empathy_time_get_current")
-  (return-type "time_t")
+(define-function empathy_tp_roomlist_get_type
+  (c-name "empathy_tp_roomlist_get_type")
+  (return-type "GType")
 )
 
-(define-function empathy_time_get_local_time
-  (c-name "empathy_time_get_local_time")
-  (return-type "time_t")
+(define-function empathy_tp_roomlist_new
+  (c-name "empathy_tp_roomlist_new")
+  (is-constructor-of "EmpathyTpRoomlist")
+  (return-type "EmpathyTpRoomlist*")
   (parameters
-    '("struct-tm*" "tm")
+    '("McAccount*" "account")
   )
 )
 
-(define-function empathy_time_parse
-  (c-name "empathy_time_parse")
-  (return-type "time_t")
-  (parameters
-    '("const-gchar*" "str")
-  )
+(define-method is_listing
+  (of-object "EmpathyTpRoomlist")
+  (c-name "empathy_tp_roomlist_is_listing")
+  (return-type "gboolean")
 )
 
-(define-function empathy_time_to_string_utc
-  (c-name "empathy_time_to_string_utc")
-  (return-type "gchar*")
-  (parameters
-    '("time_t" "t")
-    '("const-gchar*" "format")
-  )
+(define-method start
+  (of-object "EmpathyTpRoomlist")
+  (c-name "empathy_tp_roomlist_start")
+  (return-type "none")
 )
 
-(define-function empathy_time_to_string_local
-  (c-name "empathy_time_to_string_local")
-  (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")
 )
 
 
@@ -1563,564 +1778,399 @@
 
 
 
-;; From empathy-tp-chat.h
+;; From empathy-chandler.h
 
-(define-function empathy_tp_chat_get_type
-  (c-name "empathy_tp_chat_get_type")
+(define-function empathy_chandler_get_type
+  (c-name "empathy_chandler_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_tp_chat_new
-  (c-name "empathy_tp_chat_new")
-  (is-constructor-of "EmpathyTpChat")
-  (return-type "EmpathyTpChat*")
-  (parameters
-    '("McAccount*" "account")
-    '("TpChan*" "tp_chan")
-  )
-)
-
-(define-function empathy_tp_chat_new_with_contact
-  (c-name "empathy_tp_chat_new_with_contact")
-  (return-type "EmpathyTpChat*")
+(define-function empathy_chandler_new
+  (c-name "empathy_chandler_new")
+  (is-constructor-of "EmpathyChandler")
+  (return-type "EmpathyChandler*")
   (parameters
-    '("EmpathyContact*" "contact")
+    '("const-gchar*" "bus_name")
+    '("const-gchar*" "object_path")
   )
 )
 
-(define-method get_acknowledge
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_get_acknowledge")
-  (return-type "gboolean")
-)
-
-(define-method set_acknowledge
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_set_acknowledge")
-  (return-type "none")
-  (parameters
-    '("gboolean" "acknowledge")
-  )
-)
 
-(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 "TpChan*")
-)
+;; From empathy-filter.h
 
-(define-method get_pendings
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_get_pendings")
-  (return-type "GList*")
+(define-function empathy_filter_get_type
+  (c-name "empathy_filter_get_type")
+  (return-type "GType")
 )
 
-(define-method send
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_send")
-  (return-type "none")
+(define-function empathy_filter_new
+  (c-name "empathy_filter_new")
+  (is-constructor-of "EmpathyFilter")
+  (return-type "EmpathyFilter*")
   (parameters
-    '("EmpathyMessage*" "message")
+    '("const-gchar*" "bus_name")
+    '("const-gchar*" "object_path")
+    '("const-gchar*" "channel_type")
+    '("guint" "priority")
+    '("guint" "flags")
   )
 )
 
-(define-method set_state
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_set_state")
+(define-method process
+  (of-object "EmpathyFilter")
+  (c-name "empathy_filter_process")
   (return-type "none")
   (parameters
-    '("TpChannelChatState" "state")
+    '("TpChan*" "tp_chan")
+    '("gboolean" "process")
   )
 )
 
-(define-method get_id
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_get_id")
-  (return-type "const-gchar*")
-)
 
 
+;; From empathy-idle.h
 
-;; From empathy-tp-chatroom.h
-
-(define-function empathy_tp_chatroom_get_type
-  (c-name "empathy_tp_chatroom_get_type")
+(define-function empathy_idle_get_type
+  (c-name "empathy_idle_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_tp_chatroom_new
-  (c-name "empathy_tp_chatroom_new")
-  (is-constructor-of "EmpathyTpChatroom")
-  (return-type "EmpathyTpChatroom*")
-  (parameters
-    '("McAccount*" "account")
-    '("TpChan*" "tp_chan")
-  )
+(define-function empathy_idle_new
+  (c-name "empathy_idle_new")
+  (is-constructor-of "EmpathyIdle")
+  (return-type "EmpathyIdle*")
 )
 
-(define-method get_invitation
-  (of-object "EmpathyTpChatroom")
-  (c-name "empathy_tp_chatroom_get_invitation")
-  (return-type "gboolean")
-  (parameters
-    '("EmpathyContact**" "contact")
-    '("const-gchar**" "message")
-  )
+(define-method get_state
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_get_state")
+  (return-type "McPresence")
 )
 
-(define-method accept_invitation
-  (of-object "EmpathyTpChatroom")
-  (c-name "empathy_tp_chatroom_accept_invitation")
+(define-method set_state
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_set_state")
   (return-type "none")
-)
-
-;; From empathy-tp-contact-factory.h
-
-(define-function empathy_tp_contact_factory_get_type
-  (c-name "empathy_tp_contact_factory_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_tp_contact_factory_new
-  (c-name "empathy_tp_contact_factory_new")
-  (is-constructor-of "EmpathyTpContactFactory")
-  (return-type "EmpathyTpContactFactory*")
   (parameters
-    '("McAccount*" "account")
+    '("McPresence" "state")
   )
 )
 
-(define-method get_user
-  (of-object "EmpathyTpContactFactory")
-  (c-name "empathy_tp_contact_factory_get_user")
-  (return-type "EmpathyContact*")
+(define-method get_status
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_get_status")
+  (return-type "const-gchar*")
 )
 
-(define-method get_from_id
-  (of-object "EmpathyTpContactFactory")
-  (c-name "empathy_tp_contact_factory_get_from_id")
-  (return-type "EmpathyContact*")
+(define-method set_status
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_set_status")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "id")
+    '("const-gchar*" "status")
   )
 )
 
-(define-method get_from_handle
-  (of-object "EmpathyTpContactFactory")
-  (c-name "empathy_tp_contact_factory_get_from_handle")
-  (return-type "EmpathyContact*")
-  (parameters
-    '("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*")
+(define-method set_flash_state
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_set_flash_state")
+  (return-type "none")
   (parameters
-    '("GArray*" "handles")
+    '("McPresence" "state")
   )
 )
 
-(define-method set_alias
-  (of-object "EmpathyTpContactFactory")
-  (c-name "empathy_tp_contact_factory_set_alias")
+(define-method set_presence
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_set_presence")
   (return-type "none")
   (parameters
-    '("EmpathyContact*" "contact")
-    '("const-gchar*" "alias")
+    '("McPresence" "state")
+    '("const-gchar*" "status")
   )
 )
 
-(define-method set_avatar
-  (of-object "EmpathyTpContactFactory")
-  (c-name "empathy_tp_contact_factory_set_avatar")
+(define-method get_auto_away
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_get_auto_away")
+  (return-type "gboolean")
+)
+
+(define-method set_auto_away
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_set_auto_away")
   (return-type "none")
   (parameters
-    '("const-gchar*" "data")
-    '("gsize" "size")
-    '("const-gchar*" "mime_type")
+    '("gboolean" "auto_away")
   )
 )
 
-
-
-;; From empathy-tp-contact-list.h
-
-(define-function empathy_tp_contact_list_get_type
-  (c-name "empathy_tp_contact_list_get_type")
-  (return-type "GType")
+(define-method get_use_nm
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_get_use_nm")
+  (return-type "gboolean")
 )
 
-(define-function empathy_tp_contact_list_new
-  (c-name "empathy_tp_contact_list_new")
-  (is-constructor-of "EmpathyTpContactList")
-  (return-type "EmpathyTpContactList*")
+(define-method set_use_nm
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_set_use_nm")
+  (return-type "none")
   (parameters
-    '("McAccount*" "account")
+    '("gboolean" "use_nm")
   )
 )
 
-(define-method get_account
-  (of-object "EmpathyTpContactList")
-  (c-name "empathy_tp_contact_list_get_account")
-  (return-type "McAccount*")
-)
-
 
 
-;; From empathy-tp-group.h
+;; From empathy-log-manager.h
 
-(define-function empathy_tp_group_get_type
-  (c-name "empathy_tp_group_get_type")
+(define-function empathy_log_manager_get_type
+  (c-name "empathy_log_manager_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_tp_group_new
-  (c-name "empathy_tp_group_new")
-  (is-constructor-of "EmpathyTpGroup")
-  (return-type "EmpathyTpGroup*")
-  (parameters
-    '("McAccount*" "account")
-    '("TpChan*" "tp_chan")
-  )
-)
-
-(define-method close
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_close")
-  (return-type "none")
+(define-function empathy_log_manager_new
+  (c-name "empathy_log_manager_new")
+  (is-constructor-of "EmpathyLogManager")
+  (return-type "EmpathyLogManager*")
 )
 
-(define-method add_members
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_add_members")
+(define-method add_message
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_add_message")
   (return-type "none")
   (parameters
-    '("GList*" "contacts")
-    '("const-gchar*" "message")
+    '("const-gchar*" "chat_id")
+    '("gboolean" "chatroom")
+    '("EmpathyMessage*" "message")
   )
 )
 
-(define-method add_member
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_add_member")
-  (return-type "none")
+(define-method exists
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_exists")
+  (return-type "gboolean")
   (parameters
-    '("EmpathyContact*" "contact")
-    '("const-gchar*" "message")
+    '("McAccount*" "account")
+    '("const-gchar*" "chat_id")
+    '("gboolean" "chatroom")
   )
 )
 
-(define-method remove_members
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_remove_members")
-  (return-type "none")
+(define-method get_dates
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_get_dates")
+  (return-type "GList*")
   (parameters
-    '("GList*" "contacts")
-    '("const-gchar*" "message")
+    '("McAccount*" "account")
+    '("const-gchar*" "chat_id")
+    '("gboolean" "chatroom")
   )
 )
 
-(define-method remove_member
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_remove_member")
-  (return-type "none")
+(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*" "message")
+    '("const-gchar*" "filename")
   )
 )
 
-(define-method get_members
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_get_members")
-  (return-type "GList*")
-)
-
-(define-method get_local_pendings
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_get_local_pendings")
+(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_remote_pendings
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_get_remote_pendings")
+(define-method get_last_messages
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_get_last_messages")
   (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 get_object_path
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_get_object_path")
-  (return-type "const-gchar*")
-)
-
-(define-method get_channel
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_get_channel")
-  (return-type "TpChan*")
-)
-
-(define-method is_member
-  (of-object "EmpathyTpGroup")
-  (c-name "empathy_tp_group_is_member")
-  (return-type "gboolean")
   (parameters
-    '("EmpathyContact*" "contact")
+    '("McAccount*" "account")
+    '("const-gchar*" "chat_id")
+    '("gboolean" "chatroom")
   )
 )
 
-(define-function empathy_pending_info_new
-  (c-name "empathy_pending_info_new")
-  (is-constructor-of "EmpathyPendingInfo")
-  (return-type "EmpathyPendingInfo*")
+(define-method get_messages_for_file
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_get_messages_for_file")
+  (return-type "GList*")
   (parameters
-    '("EmpathyContact*" "member")
-    '("EmpathyContact*" "actor")
-    '("const-gchar*" "message")
+    '("const-gchar*" "filename")
   )
 )
 
-(define-method free
-  (of-object "EmpathyPendingInfo")
-  (c-name "empathy_pending_info_free")
-  (return-type "none")
-)
-
-
-
-;; From empathy-tp-roomlist.h
-
-(define-function empathy_tp_roomlist_get_type
-  (c-name "empathy_tp_roomlist_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_tp_roomlist_new
-  (c-name "empathy_tp_roomlist_new")
-  (is-constructor-of "EmpathyTpRoomlist")
-  (return-type "EmpathyTpRoomlist*")
+(define-method get_chats
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_get_chats")
+  (return-type "GList*")
   (parameters
     '("McAccount*" "account")
   )
 )
 
-(define-method is_listing
-  (of-object "EmpathyTpRoomlist")
-  (c-name "empathy_tp_roomlist_is_listing")
-  (return-type "gboolean")
-)
-
-(define-method start
-  (of-object "EmpathyTpRoomlist")
-  (c-name "empathy_tp_roomlist_start")
-  (return-type "none")
-)
-
-(define-method stop
-  (of-object "EmpathyTpRoomlist")
-  (c-name "empathy_tp_roomlist_stop")
-  (return-type "none")
-)
-
-
-
-;; From empathy-utils.h
-
-(define-function empathy_substring
-  (c-name "empathy_substring")
-  (return-type "gchar*")
+(define-method search_new
+  (of-object "EmpathyLogManager")
+  (c-name "empathy_log_manager_search_new")
+  (return-type "GList*")
   (parameters
-    '("const-gchar*" "str")
-    '("gint" "start")
-    '("gint" "end")
+    '("const-gchar*" "text")
   )
 )
 
-(define-function empathy_regex_match
-  (c-name "empathy_regex_match")
-  (return-type "gint")
+(define-function empathy_log_manager_search_free
+  (c-name "empathy_log_manager_search_free")
+  (return-type "none")
   (parameters
-    '("EmpathyRegExType" "type")
-    '("const-gchar*" "msg")
-    '("GArray*" "start")
-    '("GArray*" "end")
+    '("GList*" "hits")
   )
 )
 
-(define-function empathy_strcasecmp
-  (c-name "empathy_strcasecmp")
-  (return-type "gint")
+(define-function empathy_log_manager_get_date_readable
+  (c-name "empathy_log_manager_get_date_readable")
+  (return-type "gchar*")
   (parameters
-    '("const-gchar*" "s1")
-    '("const-gchar*" "s2")
+    '("const-gchar*" "date")
   )
 )
 
-(define-function empathy_strncasecmp
-  (c-name "empathy_strncasecmp")
-  (return-type "gint")
-  (parameters
-    '("const-gchar*" "s1")
-    '("const-gchar*" "s2")
-    '("gsize" "n")
-  )
-)
 
-(define-function empathy_xml_validate
-  (c-name "empathy_xml_validate")
-  (return-type "gboolean")
-  (parameters
-    '("xmlDoc*" "doc")
-    '("const-gchar*" "dtd_filename")
-  )
+
+;; From empathy-irc-network-manager.h
+
+(define-function empathy_irc_network_manager_get_type
+  (c-name "empathy_irc_network_manager_get_type")
+  (return-type "GType")
 )
 
-(define-function empathy_xml_node_get_child
-  (c-name "empathy_xml_node_get_child")
-  (return-type "xmlNodePtr")
+(define-function empathy_irc_network_manager_new
+  (c-name "empathy_irc_network_manager_new")
+  (is-constructor-of "EmpathyIrcNetworkManager")
+  (return-type "EmpathyIrcNetworkManager*")
   (parameters
-    '("xmlNodePtr" "node")
-    '("const-gchar*" "child_name")
+    '("const-gchar*" "global_file")
+    '("const-gchar*" "user_file")
   )
 )
 
-(define-function empathy_xml_node_get_child_content
-  (c-name "empathy_xml_node_get_child_content")
-  (return-type "xmlChar*")
+(define-method add
+  (of-object "EmpathyIrcNetworkManager")
+  (c-name "empathy_irc_network_manager_add")
+  (return-type "none")
   (parameters
-    '("xmlNodePtr" "node")
-    '("const-gchar*" "child_name")
+    '("EmpathyIrcNetwork*" "network")
   )
 )
 
-(define-function empathy_xml_node_find_child_prop_value
-  (c-name "empathy_xml_node_find_child_prop_value")
-  (return-type "xmlNodePtr")
+(define-method remove
+  (of-object "EmpathyIrcNetworkManager")
+  (c-name "empathy_irc_network_manager_remove")
+  (return-type "none")
   (parameters
-    '("xmlNodePtr" "node")
-    '("const-gchar*" "prop_name")
-    '("const-gchar*" "prop_value")
+    '("EmpathyIrcNetwork*" "network")
   )
 )
 
-(define-function empathy_account_hash
-  (c-name "empathy_account_hash")
-  (return-type "guint")
-  (parameters
-    '("gconstpointer" "key")
-  )
+(define-method get_networks
+  (of-object "EmpathyIrcNetworkManager")
+  (c-name "empathy_irc_network_manager_get_networks")
+  (return-type "GSList*")
 )
 
-(define-function empathy_account_equal
-  (c-name "empathy_account_equal")
-  (return-type "gboolean")
+(define-method find_network_by_address
+  (of-object "EmpathyIrcNetworkManager")
+  (c-name "empathy_irc_network_manager_find_network_by_address")
+  (return-type "EmpathyIrcNetwork*")
   (parameters
-    '("gconstpointer" "a")
-    '("gconstpointer" "b")
+    '("const-gchar*" "address")
   )
 )
 
-(define-function empathy_mission_control_new
-  (c-name "empathy_mission_control_new")
-  (is-constructor-of "EmpathyMissionControl")
-  (return-type "MissionControl*")
-)
 
-(define-function empathy_inspect_handle
-  (c-name "empathy_inspect_handle")
-  (return-type "gchar*")
-  (parameters
-    '("McAccount*" "account")
-    '("guint" "handle")
-    '("guint" "handle_type")
-  )
+
+;; From empathy-irc-network.h
+
+(define-function empathy_irc_network_get_type
+  (c-name "empathy_irc_network_get_type")
+  (return-type "GType")
 )
 
-(define-function empathy_inspect_channel
-  (c-name "empathy_inspect_channel")
-  (return-type "gchar*")
+(define-function empathy_irc_network_new
+  (c-name "empathy_irc_network_new")
+  (is-constructor-of "EmpathyIrcNetwork")
+  (return-type "EmpathyIrcNetwork*")
   (parameters
-    '("McAccount*" "account")
-    '("TpChan*" "tp_chan")
+    '("const-gchar*" "name")
   )
 )
 
-(define-function empathy_call_with_contact
-  (c-name "empathy_call_with_contact")
-  (return-type "none")
-  (parameters
-    '("EmpathyContact*" "contact")
-  )
+(define-method get_servers
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_get_servers")
+  (return-type "GSList*")
 )
 
-(define-function empathy_call_with_contact_id
-  (c-name "empathy_call_with_contact_id")
+(define-method append_server
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_append_server")
   (return-type "none")
   (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "contact_id")
+    '("EmpathyIrcServer*" "server")
   )
 )
 
-(define-function empathy_chat_with_contact
-  (c-name "empathy_chat_with_contact")
+(define-method remove_server
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_remove_server")
   (return-type "none")
   (parameters
-    '("EmpathyContact*" "contact")
+    '("EmpathyIrcServer*" "server")
   )
 )
 
-(define-function empathy_chat_with_contact_id
-  (c-name "empathy_chat_with_contact_id")
+(define-method set_server_position
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_set_server_position")
   (return-type "none")
   (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "contact_id")
+    '("EmpathyIrcServer*" "server")
+    '("gint" "pos")
   )
 )
 
-(define-function empathy_presence_get_default_message
-  (c-name "empathy_presence_get_default_message")
-  (return-type "const-gchar*")
-  (parameters
-    '("McPresence" "presence")
-  )
-)
 
-(define-function empathy_presence_to_str
-  (c-name "empathy_presence_to_str")
-  (return-type "const-gchar*")
-  (parameters
-    '("McPresence" "presence")
-  )
+
+;; From empathy-irc-server.h
+
+(define-function empathy_irc_server_get_type
+  (c-name "empathy_irc_server_get_type")
+  (return-type "GType")
 )
 
-(define-function empathy_presence_from_str
-  (c-name "empathy_presence_from_str")
-  (return-type "McPresence")
+(define-function empathy_irc_server_new
+  (c-name "empathy_irc_server_new")
+  (is-constructor-of "EmpathyIrcServer")
+  (return-type "EmpathyIrcServer*")
   (parameters
-    '("const-gchar*" "str")
+    '("const-gchar*" "address")
+    '("guint" "port")
+    '("gboolean" "ssl")
   )
 )
 
diff --git a/python/pyempathygtk.patch b/python/pyempathygtk.patch
deleted file mode 100644
index 754735e81..000000000
--- a/python/pyempathygtk.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- pyempathygtk.defs	2008-02-10 17:56:26.000000000 +0100
-+++ pyempathygtk/pyempathygtk.defs	2008-02-10 17:57:11.000000000 +0100
-@@ -147,13 +147,6 @@
-   (gtype-id "EMPATHY_TYPE_THEME_MANAGER")
- )
- 
--(define-object Spinner
--  (in-module "Ephy")
--  (parent "GtkWidget")
--  (c-name "EphySpinner")
--  (gtype-id "EPHY_TYPE_SPINNER")
--)
--
- ;; Enumerations and flags ...
- 
- (define-enum ChatViewBlock
-@@ -2112,40 +2105,3 @@
-   (varargs #t)
- )
- 
--
--
--;; From ephy-spinner.h
--
--(define-function ephy_spinner_get_type
--  (c-name "ephy_spinner_get_type")
--  (return-type "GType")
--)
--
--(define-function ephy_spinner_new
--  (c-name "ephy_spinner_new")
--  (is-constructor-of "EphySpinner")
--  (return-type "GtkWidget*")
--)
--
--(define-method start
--  (of-object "EphySpinner")
--  (c-name "ephy_spinner_start")
--  (return-type "none")
--)
--
--(define-method stop
--  (of-object "EphySpinner")
--  (c-name "ephy_spinner_stop")
--  (return-type "none")
--)
--
--(define-method set_size
--  (of-object "EphySpinner")
--  (c-name "ephy_spinner_set_size")
--  (return-type "none")
--  (parameters
--    '("GtkIconSize" "size")
--  )
--)
--
--
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index 0ba5ecbc1..b27260a88 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -56,13 +56,6 @@
   (gtype-id "EMPATHY_TYPE_CHAT_VIEW")
 )
 
-(define-object ChatWindow
-  (in-module "Empathy")
-  (parent "GObject")
-  (c-name "EmpathyChatWindow")
-  (gtype-id "EMPATHY_TYPE_CHAT_WINDOW")
-)
-
 (define-object Conf
   (in-module "Empathy")
   (parent "GObject")
@@ -112,13 +105,6 @@
   (gtype-id "EMPATHY_TYPE_SMILEY_MANAGER")
 )
 
-(define-object StatusIcon
-  (in-module "Empathy")
-  (parent "GObject")
-  (c-name "EmpathyStatusIcon")
-  (gtype-id "EMPATHY_TYPE_STATUS_ICON")
-)
-
 (define-object Theme
   (in-module "Empathy")
   (parent "GObject")
@@ -149,20 +135,6 @@
 
 ;; Enumerations and flags ...
 
-(define-enum ChatViewBlock
-  (in-module "Empathy")
-  (c-name "EmpathyChatViewBlock")
-  (gtype-id "EMPATHY_TYPE_CHAT_VIEW_BLOCK")
-  (values
-    '("none" "EMPATHY_CHAT_VIEW_BLOCK_NONE")
-    '("self" "EMPATHY_CHAT_VIEW_BLOCK_SELF")
-    '("other" "EMPATHY_CHAT_VIEW_BLOCK_OTHER")
-    '("event" "EMPATHY_CHAT_VIEW_BLOCK_EVENT")
-    '("time" "EMPATHY_CHAT_VIEW_BLOCK_TIME")
-    '("invite" "EMPATHY_CHAT_VIEW_BLOCK_INVITE")
-  )
-)
-
 (define-enum ContactListStoreSort
   (in-module "Empathy")
   (c-name "EmpathyContactListStoreSort")
@@ -232,15 +204,7 @@
 )
 
 
-;; From empathy-about-dialog.h
-
-(define-function empathy_about_dialog_new
-  (c-name "empathy_about_dialog_new")
-  (return-type "none")
-  (parameters
-    '("GtkWindow*" "parent")
-  )
-)
+;; From empathy-images.h
 
 
 
@@ -308,228 +272,6 @@
 
 
 
-;; From empathy-accounts-dialog.h
-
-(define-function empathy_accounts_dialog_show
-  (c-name "empathy_accounts_dialog_show")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkWindow*" "parent")
-  )
-)
-
-
-
-;; From empathy-account-widget.h
-
-(define-function empathy_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 empathy_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 empathy_account_widget_generic_new
-  (c-name "empathy_account_widget_generic_new")
-  (is-constructor-of "EmpathyAccountWidgetGeneric")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function empathy_account_widget_salut_new
-  (c-name "empathy_account_widget_salut_new")
-  (is-constructor-of "EmpathyAccountWidgetSalut")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function empathy_account_widget_msn_new
-  (c-name "empathy_account_widget_msn_new")
-  (is-constructor-of "EmpathyAccountWidgetMsn")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function empathy_account_widget_jabber_new
-  (c-name "empathy_account_widget_jabber_new")
-  (is-constructor-of "EmpathyAccountWidgetJabber")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function empathy_account_widget_icq_new
-  (c-name "empathy_account_widget_icq_new")
-  (is-constructor-of "EmpathyAccountWidgetIcq")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-(define-function empathy_account_widget_yahoo_new
-  (c-name "empathy_account_widget_yahoo_new")
-  (is-constructor-of "EmpathyAccountWidgetYahoo")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-
-
-;; From empathy-account-widget-irc.h
-
-(define-function empathy_account_widget_irc_new
-  (c-name "empathy_account_widget_irc_new")
-  (is-constructor-of "EmpathyAccountWidgetIrc")
-  (return-type "GtkWidget*")
-  (parameters
-    '("McAccount*" "account")
-  )
-)
-
-
-
-;; From empathy-avatar-chooser.h
-
-(define-function empathy_avatar_chooser_get_type
-  (c-name "empathy_avatar_chooser_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_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 empathy_avatar_image_get_type
-  (c-name "empathy_avatar_image_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_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-call-window.h
-
-(define-function empathy_call_window_new
-  (c-name "empathy_call_window_new")
-  (is-constructor-of "EmpathyCallWindow")
-  (return-type "GtkWidget*")
-  (parameters
-    '("EmpathyTpCall*" "call")
-  )
-)
-
-
-
-;; From empathy-cell-renderer-activatable.h
-
-(define-function empathy_cell_renderer_activatable_get_type
-  (c-name "empathy_cell_renderer_activatable_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_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 empathy_cell_renderer_expander_get_type
-  (c-name "empathy_cell_renderer_expander_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_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 empathy_cell_renderer_text_get_type
-  (c-name "empathy_cell_renderer_text_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_cell_renderer_text_new
-  (c-name "empathy_cell_renderer_text_new")
-  (is-constructor-of "EmpathyCellRendererText")
-  (return-type "GtkCellRenderer*")
-)
-
-
-
 ;; From empathy-chat.h
 
 (define-function empathy_chat_get_type
@@ -543,21 +285,6 @@
   (return-type "EmpathyChatView*")
 )
 
-(define-method get_window
-  (of-object "EmpathyChat")
-  (c-name "empathy_chat_get_window")
-  (return-type "EmpathyChatWindow*")
-)
-
-(define-method set_window
-  (of-object "EmpathyChat")
-  (c-name "empathy_chat_set_window")
-  (return-type "none")
-  (parameters
-    '("EmpathyChatWindow*" "window")
-  )
-)
-
 (define-method present
   (of-object "EmpathyChat")
   (c-name "empathy_chat_present")
@@ -710,12 +437,40 @@
 
 
 
-;; From empathy-chatrooms-window.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-spell-dialog.h
 
-(define-function empathy_chatrooms_window_show
-  (c-name "empathy_chatrooms_window_show")
+(define-function empathy_spell_dialog_show
+  (c-name "empathy_spell_dialog_show")
   (return-type "none")
   (parameters
+    '("EmpathyChat*" "chat")
+    '("GtkTextIter" "start")
+    '("GtkTextIter" "end")
+    '("const-gchar*" "word")
+  )
+)
+
+
+
+;; From empathy-accounts-dialog.h
+
+(define-function empathy_accounts_dialog_show
+  (c-name "empathy_accounts_dialog_show")
+  (return-type "GtkWidget*")
+  (parameters
     '("GtkWindow*" "parent")
   )
 )
@@ -907,119 +662,121 @@
   )
 )
 
-(define-method get_last_block_type
-  (of-object "EmpathyChatView")
-  (c-name "empathy_chat_view_get_last_block_type")
-  (return-type "EmpathyChatViewBlock")
-)
-
-(define-method set_last_block_type
-  (of-object "EmpathyChatView")
-  (c-name "empathy_chat_view_set_last_block_type")
-  (return-type "none")
-  (parameters
-    '("EmpathyChatViewBlock" "block_type")
-  )
-)
-
 (define-method get_last_contact
   (of-object "EmpathyChatView")
   (c-name "empathy_chat_view_get_last_contact")
   (return-type "EmpathyContact*")
 )
 
-(define-method set_last_contact
-  (of-object "EmpathyChatView")
-  (c-name "empathy_chat_view_set_last_contact")
-  (return-type "none")
+(define-function empathy_chat_view_get_avatar_pixbuf_with_cache
+  (c-name "empathy_chat_view_get_avatar_pixbuf_with_cache")
+  (return-type "GdkPixbuf*")
   (parameters
     '("EmpathyContact*" "contact")
   )
 )
 
-(define-function empathy_chat_view_get_avatar_pixbuf_with_cache
-  (c-name "empathy_chat_view_get_avatar_pixbuf_with_cache")
-  (return-type "GdkPixbuf*")
+
+
+;; From empathy-log-window.h
+
+(define-function empathy_log_window_show
+  (c-name "empathy_log_window_show")
+  (return-type "GtkWidget*")
   (parameters
-    '("EmpathyContact*" "contact")
+    '("McAccount*" "account")
+    '("const-gchar*" "chat_id")
+    '("gboolean" "chatroom")
+    '("GtkWindow*" "parent")
   )
 )
 
 
 
-;; From empathy-chat-window.h
+;; From empathy-theme-boxes.h
 
-(define-function empathy_chat_window_get_type
-  (c-name "empathy_chat_window_get_type")
+(define-function empathy_theme_boxes_get_type
+  (c-name "empathy_theme_boxes_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_chat_window_get_default
-  (c-name "empathy_chat_window_get_default")
-  (return-type "EmpathyChatWindow*")
-)
 
-(define-function empathy_chat_window_new
-  (c-name "empathy_chat_window_new")
-  (is-constructor-of "EmpathyChatWindow")
-  (return-type "EmpathyChatWindow*")
-)
 
-(define-method get_dialog
-  (of-object "EmpathyChatWindow")
-  (c-name "empathy_chat_window_get_dialog")
-  (return-type "GtkWidget*")
-)
+;; From empathy-account-widget.h
 
-(define-method add_chat
-  (of-object "EmpathyChatWindow")
-  (c-name "empathy_chat_window_add_chat")
+(define-function empathy_account_widget_handle_params
+  (c-name "empathy_account_widget_handle_params")
   (return-type "none")
   (parameters
-    '("EmpathyChat*" "chat")
+    '("McAccount*" "account")
+    '("GladeXML*" "glade")
+    '("const-gchar*" "first_widget_name")
   )
+  (varargs #t)
 )
 
-(define-method remove_chat
-  (of-object "EmpathyChatWindow")
-  (c-name "empathy_chat_window_remove_chat")
+(define-function empathy_account_widget_add_forget_button
+  (c-name "empathy_account_widget_add_forget_button")
   (return-type "none")
   (parameters
-    '("EmpathyChat*" "chat")
+    '("McAccount*" "account")
+    '("GladeXML*" "glade")
+    '("const-gchar*" "button")
+    '("const-gchar*" "entry")
   )
 )
 
-(define-method move_chat
-  (of-object "EmpathyChatWindow")
-  (c-name "empathy_chat_window_move_chat")
-  (return-type "none")
+(define-function empathy_account_widget_generic_new
+  (c-name "empathy_account_widget_generic_new")
+  (is-constructor-of "EmpathyAccountWidgetGeneric")
+  (return-type "GtkWidget*")
   (parameters
-    '("EmpathyChatWindow*" "new_window")
-    '("EmpathyChat*" "chat")
+    '("McAccount*" "account")
   )
 )
 
-(define-method switch_to_chat
-  (of-object "EmpathyChatWindow")
-  (c-name "empathy_chat_window_switch_to_chat")
-  (return-type "none")
+(define-function empathy_account_widget_salut_new
+  (c-name "empathy_account_widget_salut_new")
+  (is-constructor-of "EmpathyAccountWidgetSalut")
+  (return-type "GtkWidget*")
   (parameters
-    '("EmpathyChat*" "chat")
+    '("McAccount*" "account")
   )
 )
 
-(define-method has_focus
-  (of-object "EmpathyChatWindow")
-  (c-name "empathy_chat_window_has_focus")
-  (return-type "gboolean")
+(define-function empathy_account_widget_msn_new
+  (c-name "empathy_account_widget_msn_new")
+  (is-constructor-of "EmpathyAccountWidgetMsn")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-function empathy_account_widget_jabber_new
+  (c-name "empathy_account_widget_jabber_new")
+  (is-constructor-of "EmpathyAccountWidgetJabber")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
 )
 
-(define-function empathy_chat_window_find_chat
-  (c-name "empathy_chat_window_find_chat")
-  (return-type "EmpathyChat*")
+(define-function empathy_account_widget_icq_new
+  (c-name "empathy_account_widget_icq_new")
+  (is-constructor-of "EmpathyAccountWidgetIcq")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-function empathy_account_widget_yahoo_new
+  (c-name "empathy_account_widget_yahoo_new")
+  (is-constructor-of "EmpathyAccountWidgetYahoo")
+  (return-type "GtkWidget*")
   (parameters
     '("McAccount*" "account")
-    '("const-gchar*" "id")
   )
 )
 
@@ -1144,6 +901,115 @@
 
 
 
+;; From empathy-theme.h
+
+(define-function empathy_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 empathy_account_widget_irc_new
+  (c-name "empathy_account_widget_irc_new")
+  (is-constructor-of "EmpathyAccountWidgetIrc")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+
+
 ;; From empathy-contact-dialogs.h
 
 (define-function empathy_subscription_dialog_show
@@ -1176,6 +1042,62 @@
 
 
 
+;; From empathy-new-message-dialog.h
+
+(define-function empathy_new_message_dialog_show
+  (c-name "empathy_new_message_dialog_show")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GtkWindow*" "parent")
+  )
+)
+
+
+
+;; From empathy-theme-irc.h
+
+(define-function empathy_theme_irc_get_type
+  (c-name "empathy_theme_irc_get_type")
+  (return-type "GType")
+)
+
+
+
+;; From empathy-avatar-chooser.h
+
+(define-function empathy_avatar_chooser_get_type
+  (c-name "empathy_avatar_chooser_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_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 empathy_contact_list_store_get_type
@@ -1304,266 +1226,144 @@
 
 
 
-;; From empathy-contact-list-view.h
+;; From empathy-presence-chooser.h
 
-(define-function empathy_contact_list_view_get_type
-  (c-name "empathy_contact_list_view_get_type")
+(define-function empathy_presence_chooser_get_type
+  (c-name "empathy_presence_chooser_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_contact_list_view_new
-  (c-name "empathy_contact_list_view_new")
-  (is-constructor-of "EmpathyContactListView")
-  (return-type "EmpathyContactListView*")
-  (parameters
-    '("EmpathyContactListStore*" "store")
-    '("EmpathyContactListFeatures" "features")
-  )
-)
-
-(define-method set_features
-  (of-object "EmpathyContactListView")
-  (c-name "empathy_contact_list_view_set_features")
-  (return-type "none")
-  (parameters
-    '("EmpathyContactListFeatures" "features")
-  )
-)
-
-(define-method get_features
-  (of-object "EmpathyContactListView")
-  (c-name "empathy_contact_list_view_get_features")
-  (return-type "EmpathyContactListFeatures")
-)
-
-(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")
+(define-function empathy_presence_chooser_new
+  (c-name "empathy_presence_chooser_new")
+  (is-constructor-of "EmpathyPresenceChooser")
   (return-type "GtkWidget*")
-  (parameters
-    '("EmpathyContact*" "contact")
-  )
 )
 
-(define-method get_group_menu
-  (of-object "EmpathyContactListView")
-  (c-name "empathy_contact_list_view_get_group_menu")
+(define-function empathy_presence_chooser_create_menu
+  (c-name "empathy_presence_chooser_create_menu")
   (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")
-  )
-)
+;; From empathy-theme-manager.h
 
-(define-function empathy_contact_widget_get_contact
-  (c-name "empathy_contact_widget_get_contact")
-  (return-type "EmpathyContact*")
-  (parameters
-    '("GtkWidget*" "widget")
-  )
+(define-function empathy_theme_manager_get_type
+  (c-name "empathy_theme_manager_get_type")
+  (return-type "GType")
 )
 
-(define-function empathy_contact_widget_set_contact
-  (c-name "empathy_contact_widget_set_contact")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("EmpathyContact*" "contact")
-  )
+(define-function empathy_theme_manager_get
+  (c-name "empathy_theme_manager_get")
+  (return-type "EmpathyThemeManager*")
 )
 
-(define-function empathy_contact_widget_set_account_filter
-  (c-name "empathy_contact_widget_set_account_filter")
-  (return-type "none")
-  (parameters
-    '("GtkWidget*" "widget")
-    '("EmpathyAccountChooserFilterFunc" "filter")
-    '("gpointer" "user_data")
-  )
+(define-function empathy_theme_manager_get_themes
+  (c-name "empathy_theme_manager_get_themes")
+  (return-type "const-gchar**")
 )
 
-
-
-;; From empathy-geometry.h
-
-(define-function empathy_geometry_save
-  (c-name "empathy_geometry_save")
+(define-method apply
+  (of-object "EmpathyThemeManager")
+  (c-name "empathy_theme_manager_apply")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "w")
-    '("gint" "h")
+    '("EmpathyChatView*" "view")
+    '("const-gchar*" "theme")
   )
 )
 
-(define-function empathy_geometry_load
-  (c-name "empathy_geometry_load")
+(define-method apply_saved
+  (of-object "EmpathyThemeManager")
+  (c-name "empathy_theme_manager_apply_saved")
   (return-type "none")
   (parameters
-    '("const-gchar*" "name")
-    '("gint*" "x")
-    '("gint*" "y")
-    '("gint*" "w")
-    '("gint*" "h")
+    '("EmpathyChatView*" "view")
   )
 )
 
 
 
-;; From empathy-group-chat.h
+;; From empathy-avatar-image.h
 
-(define-function empathy_group_chat_get_type
-  (c-name "empathy_group_chat_get_type")
+(define-function empathy_avatar_image_get_type
+  (c-name "empathy_avatar_image_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_group_chat_new
-  (c-name "empathy_group_chat_new")
-  (is-constructor-of "EmpathyGroupChat")
-  (return-type "EmpathyGroupChat*")
-  (parameters
-    '("EmpathyTpChatroom*" "tp_chat")
-  )
-)
-
-(define-method get_show_contacts
-  (of-object "EmpathyGroupChat")
-  (c-name "empathy_group_chat_get_show_contacts")
-  (return-type "gboolean")
+(define-function empathy_avatar_image_new
+  (c-name "empathy_avatar_image_new")
+  (is-constructor-of "EmpathyAvatarImage")
+  (return-type "GtkWidget*")
 )
 
-(define-method set_show_contacts
-  (of-object "EmpathyGroupChat")
-  (c-name "empathy_group_chat_set_show_contacts")
+(define-method set
+  (of-object "EmpathyAvatarImage")
+  (c-name "empathy_avatar_image_set")
   (return-type "none")
   (parameters
-    '("gboolean" "show")
+    '("EmpathyAvatar*" "avatar")
   )
 )
 
-(define-method set_topic
-  (of-object "EmpathyGroupChat")
-  (c-name "empathy_group_chat_set_topic")
-  (return-type "none")
-)
-
-
-
-;; From empathy-images.h
-
 
 
-;; From empathy-irc-network-dialog.h
+;; From empathy-contact-list-view.h
 
-(define-method dialog_show
-  (of-object "EmpathyIrcNetwork")
-  (c-name "empathy_irc_network_dialog_show")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkWidget*" "parent")
-  )
+(define-function empathy_contact_list_view_get_type
+  (c-name "empathy_contact_list_view_get_type")
+  (return-type "GType")
 )
 
-
-
-;; From empathy-log-window.h
-
-(define-function empathy_log_window_show
-  (c-name "empathy_log_window_show")
-  (return-type "GtkWidget*")
+(define-function empathy_contact_list_view_new
+  (c-name "empathy_contact_list_view_new")
+  (is-constructor-of "EmpathyContactListView")
+  (return-type "EmpathyContactListView*")
   (parameters
-    '("McAccount*" "account")
-    '("const-gchar*" "chat_id")
-    '("gboolean" "chatroom")
-    '("GtkWindow*" "parent")
+    '("EmpathyContactListStore*" "store")
+    '("EmpathyContactListFeatures" "features")
   )
 )
 
-
-
-;; From empathy-main-window.h
-
-(define-function empathy_main_window_show
-  (c-name "empathy_main_window_show")
-  (return-type "GtkWidget*")
-)
-
-
-
-;; From empathy-new-chatroom-dialog.h
-
-(define-function empathy_new_chatroom_dialog_show
-  (c-name "empathy_new_chatroom_dialog_show")
+(define-method set_features
+  (of-object "EmpathyContactListView")
+  (c-name "empathy_contact_list_view_set_features")
   (return-type "none")
   (parameters
-    '("GtkWindow*" "parent")
+    '("EmpathyContactListFeatures" "features")
   )
 )
 
-
-
-;; From empathy-new-message-dialog.h
-
-(define-function empathy_new_message_dialog_show
-  (c-name "empathy_new_message_dialog_show")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkWindow*" "parent")
-  )
+(define-method get_features
+  (of-object "EmpathyContactListView")
+  (c-name "empathy_contact_list_view_get_features")
+  (return-type "EmpathyContactListFeatures")
 )
 
-
-
-;; From empathy-preferences.h
-
-(define-function empathy_preferences_show
-  (c-name "empathy_preferences_show")
-  (return-type "GtkWidget*")
-  (parameters
-    '("GtkWindow*" "parent")
-  )
+(define-method get_selected
+  (of-object "EmpathyContactListView")
+  (c-name "empathy_contact_list_view_get_selected")
+  (return-type "EmpathyContact*")
 )
 
-
-
-;; From empathy-presence-chooser.h
-
-(define-function empathy_presence_chooser_get_type
-  (c-name "empathy_presence_chooser_get_type")
-  (return-type "GType")
+(define-method get_selected_group
+  (of-object "EmpathyContactListView")
+  (c-name "empathy_contact_list_view_get_selected_group")
+  (return-type "gchar*")
 )
 
-(define-function empathy_presence_chooser_new
-  (c-name "empathy_presence_chooser_new")
-  (is-constructor-of "EmpathyPresenceChooser")
+(define-method get_contact_menu
+  (of-object "EmpathyContactListView")
+  (c-name "empathy_contact_list_view_get_contact_menu")
   (return-type "GtkWidget*")
+  (parameters
+    '("EmpathyContact*" "contact")
+  )
 )
 
-(define-function empathy_presence_chooser_create_menu
-  (c-name "empathy_presence_chooser_create_menu")
+(define-method get_group_menu
+  (of-object "EmpathyContactListView")
+  (c-name "empathy_contact_list_view_get_group_menu")
   (return-type "GtkWidget*")
 )
 
@@ -1593,335 +1393,6 @@
 
 
 
-;; From empathy-profile-chooser.h
-
-(define-function empathy_profile_chooser_new
-  (c-name "empathy_profile_chooser_new")
-  (is-constructor-of "EmpathyProfileChooser")
-  (return-type "GtkWidget*")
-)
-
-(define-function empathy_profile_chooser_get_selected
-  (c-name "empathy_profile_chooser_get_selected")
-  (return-type "McProfile*")
-  (parameters
-    '("GtkWidget*" "widget")
-  )
-)
-
-(define-function empathy_profile_chooser_n_profiles
-  (c-name "empathy_profile_chooser_n_profiles")
-  (return-type "gint")
-  (parameters
-    '("GtkWidget*" "widget")
-  )
-)
-
-
-
-;; From empathy-smiley-manager.h
-
-(define-function empathy_smiley_manager_get_type
-  (c-name "empathy_smiley_manager_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_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-spell-dialog.h
-
-(define-function empathy_spell_dialog_show
-  (c-name "empathy_spell_dialog_show")
-  (return-type "none")
-  (parameters
-    '("EmpathyChat*" "chat")
-    '("GtkTextIter" "start")
-    '("GtkTextIter" "end")
-    '("const-gchar*" "word")
-  )
-)
-
-
-
-;; From empathy-spell.h
-
-(define-function empathy_spell_supported
-  (c-name "empathy_spell_supported")
-  (return-type "gboolean")
-)
-
-(define-function empathy_spell_get_language_name
-  (c-name "empathy_spell_get_language_name")
-  (return-type "const-gchar*")
-  (parameters
-    '("const-gchar*" "code")
-  )
-)
-
-(define-function empathy_spell_get_language_codes
-  (c-name "empathy_spell_get_language_codes")
-  (return-type "GList*")
-)
-
-(define-function empathy_spell_free_language_codes
-  (c-name "empathy_spell_free_language_codes")
-  (return-type "none")
-  (parameters
-    '("GList*" "codes")
-  )
-)
-
-(define-function empathy_spell_check
-  (c-name "empathy_spell_check")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "word")
-  )
-)
-
-(define-function empathy_spell_get_suggestions
-  (c-name "empathy_spell_get_suggestions")
-  (return-type "GList*")
-  (parameters
-    '("const-gchar*" "word")
-  )
-)
-
-(define-function empathy_spell_free_suggestions
-  (c-name "empathy_spell_free_suggestions")
-  (return-type "none")
-  (parameters
-    '("GList*" "suggestions")
-  )
-)
-
-
-
-;; From empathy-status-icon.h
-
-(define-function empathy_status_icon_get_type
-  (c-name "empathy_status_icon_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_status_icon_new
-  (c-name "empathy_status_icon_new")
-  (is-constructor-of "EmpathyStatusIcon")
-  (return-type "EmpathyStatusIcon*")
-  (parameters
-    '("GtkWindow*" "window")
-  )
-)
-
-
-
-;; From empathy-theme-boxes.h
-
-(define-function empathy_theme_boxes_get_type
-  (c-name "empathy_theme_boxes_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From empathy-theme.h
-
-(define-function empathy_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-theme-irc.h
-
-(define-function empathy_theme_irc_get_type
-  (c-name "empathy_theme_irc_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From empathy-theme-manager.h
-
-(define-function empathy_theme_manager_get_type
-  (c-name "empathy_theme_manager_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_theme_manager_get
-  (c-name "empathy_theme_manager_get")
-  (return-type "EmpathyThemeManager*")
-)
-
-(define-function empathy_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")
-  )
-)
-
-
-
 ;; From empathy-ui-utils.h
 
 (define-function empathy_glade_get_file_simple
@@ -2139,3 +1610,300 @@
   (varargs #t)
 )
 
+
+
+;; From empathy-cell-renderer-activatable.h
+
+(define-function empathy_cell_renderer_activatable_get_type
+  (c-name "empathy_cell_renderer_activatable_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_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 empathy_contact_widget_get_contact
+  (c-name "empathy_contact_widget_get_contact")
+  (return-type "EmpathyContact*")
+  (parameters
+    '("GtkWidget*" "widget")
+  )
+)
+
+(define-function empathy_contact_widget_set_contact
+  (c-name "empathy_contact_widget_set_contact")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("EmpathyContact*" "contact")
+  )
+)
+
+(define-function empathy_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 empathy_profile_chooser_new
+  (c-name "empathy_profile_chooser_new")
+  (is-constructor-of "EmpathyProfileChooser")
+  (return-type "GtkWidget*")
+)
+
+(define-function empathy_profile_chooser_get_selected
+  (c-name "empathy_profile_chooser_get_selected")
+  (return-type "McProfile*")
+  (parameters
+    '("GtkWidget*" "widget")
+  )
+)
+
+(define-function empathy_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 empathy_cell_renderer_expander_get_type
+  (c-name "empathy_cell_renderer_expander_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_cell_renderer_expander_new
+  (c-name "empathy_cell_renderer_expander_new")
+  (is-constructor-of "EmpathyCellRendererExpander")
+  (return-type "GtkCellRenderer*")
+)
+
+
+
+;; From empathy-geometry.h
+
+(define-function empathy_geometry_save
+  (c-name "empathy_geometry_save")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+    '("gint" "x")
+    '("gint" "y")
+    '("gint" "w")
+    '("gint" "h")
+  )
+)
+
+(define-function empathy_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 empathy_smiley_manager_get_type
+  (c-name "empathy_smiley_manager_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_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 empathy_cell_renderer_text_get_type
+  (c-name "empathy_cell_renderer_text_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_cell_renderer_text_new
+  (c-name "empathy_cell_renderer_text_new")
+  (is-constructor-of "EmpathyCellRendererText")
+  (return-type "GtkCellRenderer*")
+)
+
+
+
+;; From empathy-group-chat.h
+
+(define-function empathy_group_chat_get_type
+  (c-name "empathy_group_chat_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_group_chat_new
+  (c-name "empathy_group_chat_new")
+  (is-constructor-of "EmpathyGroupChat")
+  (return-type "EmpathyGroupChat*")
+  (parameters
+    '("EmpathyTpChatroom*" "tp_chat")
+  )
+)
+
+(define-method get_show_contacts
+  (of-object "EmpathyGroupChat")
+  (c-name "empathy_group_chat_get_show_contacts")
+  (return-type "gboolean")
+)
+
+(define-method set_show_contacts
+  (of-object "EmpathyGroupChat")
+  (c-name "empathy_group_chat_set_show_contacts")
+  (return-type "none")
+  (parameters
+    '("gboolean" "show")
+  )
+)
+
+(define-method set_topic
+  (of-object "EmpathyGroupChat")
+  (c-name "empathy_group_chat_set_topic")
+  (return-type "none")
+)
+
+
+
+;; From empathy-spell.h
+
+(define-function empathy_spell_supported
+  (c-name "empathy_spell_supported")
+  (return-type "gboolean")
+)
+
+(define-function empathy_spell_get_language_name
+  (c-name "empathy_spell_get_language_name")
+  (return-type "const-gchar*")
+  (parameters
+    '("const-gchar*" "code")
+  )
+)
+
+(define-function empathy_spell_get_language_codes
+  (c-name "empathy_spell_get_language_codes")
+  (return-type "GList*")
+)
+
+(define-function empathy_spell_free_language_codes
+  (c-name "empathy_spell_free_language_codes")
+  (return-type "none")
+  (parameters
+    '("GList*" "codes")
+  )
+)
+
+(define-function empathy_spell_check
+  (c-name "empathy_spell_check")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "word")
+  )
+)
+
+(define-function empathy_spell_get_suggestions
+  (c-name "empathy_spell_get_suggestions")
+  (return-type "GList*")
+  (parameters
+    '("const-gchar*" "word")
+  )
+)
+
+(define-function empathy_spell_free_suggestions
+  (c-name "empathy_spell_free_suggestions")
+  (return-type "none")
+  (parameters
+    '("GList*" "suggestions")
+  )
+)
+
+
diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override
index fda978849..a2bb7a724 100644
--- a/python/pyempathygtk/pyempathygtk.override
+++ b/python/pyempathygtk/pyempathygtk.override
@@ -2,21 +2,17 @@
 headers
 #include <Python.h>
 #include <pygobject.h>
-#include "empathy-about-dialog.h"
 #include "empathy-account-chooser.h"
 #include "empathy-accounts-dialog.h"
 #include "empathy-account-widget.h"
 #include "empathy-account-widget-irc.h"
 #include "empathy-avatar-chooser.h"
 #include "empathy-avatar-image.h"
-#include "empathy-call-window.h"
 #include "empathy-cell-renderer-activatable.h"
 #include "empathy-cell-renderer-expander.h"
 #include "empathy-cell-renderer-text.h"
 #include "empathy-chat.h"
-#include "empathy-chatrooms-window.h"
 #include "empathy-chat-view.h"
-#include "empathy-chat-window.h"
 #include "empathy-conf.h"
 #include "empathy-contact-dialogs.h"
 #include "empathy-contact-list-store.h"
@@ -28,17 +24,13 @@ headers
 #include "empathy-images.h"
 #include "empathy-irc-network-dialog.h"
 #include "empathy-log-window.h"
-#include "empathy-main-window.h"
-#include "empathy-new-chatroom-dialog.h"
 #include "empathy-new-message-dialog.h"
-#include "empathy-preferences.h"
 #include "empathy-presence-chooser.h"
 #include "empathy-private-chat.h"
 #include "empathy-profile-chooser.h"
 #include "empathy-smiley-manager.h"
 #include "empathy-spell-dialog.h"
 #include "empathy-spell.h"
-#include "empathy-status-icon.h"
 #include "empathy-theme-boxes.h"
 #include "empathy-theme.h"
 #include "empathy-theme-irc.h"
diff --git a/python/update-binding.sh b/python/update-binding.sh
new file mode 100755
index 000000000..629673f62
--- /dev/null
+++ b/python/update-binding.sh
@@ -0,0 +1,76 @@
+#! /bin/sh
+#Manually update headers in pyempathy.override and pyempathygtk.override.
+
+# Update the list of headers from Makefile.am
+cd ../libempathy
+python /usr/share/pygtk/2.0/codegen/h2def.py	\
+	empathy-avatar.h			\
+	empathy-time.h				\
+	empathy-status-presets.h		\
+	empathy-debug.h				\
+	empathy-utils.h				\
+	empathy-message.h			\
+	empathy-chatroom-manager.h		\
+	empathy-chatroom.h			\
+	empathy-contact.h			\
+	empathy-contact-groups.h		\
+	empathy-contact-list.h			\
+	empathy-contact-manager.h		\
+	empathy-contact-factory.h		\
+	empathy-tp-contact-factory.h		\
+	empathy-tp-group.h			\
+	empathy-tp-contact-list.h		\
+	empathy-tp-chat.h			\
+	empathy-tp-chatroom.h			\
+	empathy-tp-roomlist.h			\
+	empathy-tp-call.h			\
+	empathy-chandler.h			\
+	empathy-filter.h			\
+	empathy-idle.h				\
+	empathy-log-manager.h			\
+	empathy-irc-network-manager.h		\
+	empathy-irc-network.h			\
+	empathy-irc-server.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	\
+	empathy-images.h			\
+	empathy-account-chooser.h		\
+	empathy-chat.h				\
+	empathy-irc-network-dialog.h		\
+	empathy-spell-dialog.h			\
+	empathy-accounts-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-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-private-chat.h			\
+	empathy-ui-utils.h			\
+	empathy-cell-renderer-activatable.h	\
+	empathy-contact-widget.h		\
+	empathy-profile-chooser.h		\
+	empathy-cell-renderer-expander.h	\
+	empathy-geometry.h			\
+	empathy-smiley-manager.h		\
+	empathy-cell-renderer-text.h		\
+	empathy-group-chat.h			\
+	empathy-spell.h				\
+ > ../python/pyempathygtk/pyempathygtk.defs
+
+cd ../python
+patch -p0 < pyempathy.patch
+