Update python binding for new API.

svn path=/trunk/; revision=564

4 files changed, 930 insertions, 77 deletions

diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index d3329ff21..807991170 100644
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -1,12 +1,4 @@
 ;; -*- scheme -*-
-; interfaces
-
-(define-interface ContactList
-  (in-module "Empathy")
-  (c-name "EmpathyContactList")
-  (gtype-id "EMPATHY_TYPE_CONTACT_LIST")
-)
-
 ; object definitions ...
 (define-object Chandler
   (in-module "Empathy")
@@ -50,12 +42,18 @@
   (gtype-id "EMPATHY_TYPE_CONTACT_FACTORY")
 )
 
+(define-interface ContactList
+  (in-module "Empathy")
+  (c-name "EmpathyContactList")
+  (gtype-id "EMPATHY_TYPE_CONTACT_LIST")
+)
+
 (define-object ContactManager
   (in-module "Empathy")
   (parent "GObject")
+  (implements "EmpathyContactList")
   (c-name "EmpathyContactManager")
   (gtype-id "EMPATHY_TYPE_CONTACT_MANAGER")
-  (implements "EmpathyContactList")
 )
 
 (define-object Filter
@@ -93,6 +91,13 @@
   (gtype-id "EMPATHY_TYPE_PRESENCE")
 )
 
+(define-object TpCall
+  (in-module "Empathy")
+  (parent "GObject")
+  (c-name "EmpathyTpCall")
+  (gtype-id "EMPATHY_TYPE_TP_CALL")
+)
+
 (define-object TpChat
   (in-module "Empathy")
   (parent "GObject")
@@ -103,17 +108,24 @@
 (define-object TpChatroom
   (in-module "Empathy")
   (parent "EmpathyTpChat")
+  (implements "EmpathyContactList")
   (c-name "EmpathyTpChatroom")
   (gtype-id "EMPATHY_TYPE_TP_CHATROOM")
-  (implements "EmpathyContactList")
+)
+
+(define-object TpContactFactory
+  (in-module "Empathy")
+  (parent "GObject")
+  (c-name "EmpathyTpContactFactory")
+  (gtype-id "EMPATHY_TYPE_TP_CONTACT_FACTORY")
 )
 
 (define-object TpContactList
   (in-module "Empathy")
   (parent "GObject")
+  (implements "EmpathyContactList")
   (c-name "EmpathyTpContactList")
   (gtype-id "EMPATHY_TYPE_TP_CONTACT_LIST")
-  (implements "EmpathyContactList")
 )
 
 (define-object TpGroup
@@ -132,6 +144,16 @@
 
 ;; Enumerations and flags ...
 
+(define-flags Capabilities
+  (in-module "Empathy")
+  (c-name "EmpathyCapabilities")
+  (gtype-id "EMPATHY_TYPE_CAPABILITIES")
+  (values
+    '("audio" "EMPATHY_CAPABILITIES_AUDIO")
+    '("video" "EMPATHY_CAPABILITIES_VIDEO")
+  )
+)
+
 (define-enum MessageType
   (in-module "Empathy")
   (c-name "EmpathyMessageType")
@@ -145,6 +167,17 @@
   )
 )
 
+(define-enum TpCallStatus
+  (in-module "Empathy")
+  (c-name "EmpathyTpCallStatus")
+  (gtype-id "EMPATHY_TYPE_TP_CALL_STATUS")
+  (values
+    '("preparing" "EMPATHY_TP_CALL_STATUS_PREPARING")
+    '("ringing" "EMPATHY_TP_CALL_STATUS_RINGING")
+    '("running" "EMPATHY_TP_CALL_STATUS_RUNNING")
+  )
+)
+
 (define-enum RegExType
   (in-module "Empathy")
   (c-name "EmpathyRegExType")
@@ -171,9 +204,18 @@
   (is-constructor-of "EmpathyAvatar")
   (return-type "EmpathyAvatar*")
   (parameters
-    '("guchar*" "avatar")
-    '("gsize" "len")
-    '("gchar*" "format")
+    '("const-guchar*" "avatar")
+    '("const-gsize" "len")
+    '("const-gchar*" "format")
+    '("const-gchar*" "token")
+  )
+)
+
+(define-function empathy_avatar_new_from_cache
+  (c-name "empathy_avatar_new_from_cache")
+  (return-type "EmpathyAvatar*")
+  (parameters
+    '("const-gchar*" "token")
   )
 )
 
@@ -553,7 +595,19 @@
   (return-type "none")
   (parameters
     '("EmpathyContact*" "contact")
-    '("const-gchar*" "name")
+    '("const-gchar*" "alias")
+  )
+)
+
+(define-method set_avatar
+  (of-object "EmpathyContactFactory")
+  (c-name "empathy_contact_factory_set_avatar")
+  (return-type "none")
+  (parameters
+    '("McAccount*" "account")
+    '("const-gchar*" "data")
+    '("gsize" "size")
+    '("const-gchar*" "mime_type")
   )
 )
 
@@ -675,6 +729,21 @@
   )
 )
 
+(define-method get_capabilities
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_get_capabilities")
+  (return-type "EmpathyCapabilities")
+)
+
+(define-method set_capabilities
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_set_capabilities")
+  (return-type "none")
+  (parameters
+    '("EmpathyCapabilities" "capabilities")
+  )
+)
+
 (define-method is_user
   (of-object "EmpathyContact")
   (c-name "empathy_contact_is_user")
@@ -702,6 +771,12 @@
   (return-type "const-gchar*")
 )
 
+(define-method can_voip
+  (of-object "EmpathyContact")
+  (c-name "empathy_contact_can_voip")
+  (return-type "gboolean")
+)
+
 (define-function empathy_contact_equal
   (c-name "empathy_contact_equal")
   (return-type "gboolean")
@@ -805,6 +880,15 @@
   )
 )
 
+(define-method remove_group
+  (of-object "EmpathyContactList")
+  (c-name "empathy_contact_list_remove_group")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "group")
+  )
+)
+
 
 
 ;; From empathy-contact-manager.h
@@ -950,6 +1034,36 @@
   )
 )
 
+(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
+    '("gboolean" "auto_away")
+  )
+)
+
+(define-method get_use_nm
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_get_use_nm")
+  (return-type "gboolean")
+)
+
+(define-method set_use_nm
+  (of-object "EmpathyIdle")
+  (c-name "empathy_idle_set_use_nm")
+  (return-type "none")
+  (parameters
+    '("gboolean" "use_nm")
+  )
+)
+
 
 
 ;; From empathy-log-manager.h
@@ -1154,7 +1268,7 @@
 (define-method get_timestamp
   (of-object "EmpathyMessage")
   (c-name "empathy_message_get_timestamp")
-  (return-type "EmpathyTime")
+  (return-type "time_t")
 )
 
 (define-method set_timestamp
@@ -1162,7 +1276,16 @@
   (c-name "empathy_message_set_timestamp")
   (return-type "none")
   (parameters
-    '("EmpathyTime" "timestamp")
+    '("time_t" "timestamp")
+  )
+)
+
+(define-method get_date_and_time
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_get_date_and_time")
+  (return-type "GDate*")
+  (parameters
+    '("time_t*" "timestamp")
   )
 )
 
@@ -1273,7 +1396,7 @@
 
 (define-function empathy_time_get_current
   (c-name "empathy_time_get_current")
-  (return-type "EmpathyTime")
+  (return-type "time_t")
 )
 
 (define-function empathy_time_get_local_time
@@ -1286,7 +1409,7 @@
 
 (define-function empathy_time_parse
   (c-name "empathy_time_parse")
-  (return-type "EmpathyTime")
+  (return-type "time_t")
   (parameters
     '("const-gchar*" "str")
   )
@@ -1294,33 +1417,158 @@
 
 (define-function empathy_time_parse_format
   (c-name "empathy_time_parse_format")
-  (return-type "EmpathyTime")
+  (return-type "time_t")
   (parameters
     '("const-gchar*" "str")
     '("const-gchar*" "format")
   )
 )
 
-(define-method to_string_utc
-  (of-object "EmpathyTime")
+(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 to_string_local
-  (of-object "EmpathyTime")
+(define-function empathy_time_to_string_local
   (c-name "empathy_time_to_string_local")
   (return-type "gchar*")
   (parameters
+    '("time_t" "t")
     '("const-gchar*" "format")
   )
 )
 
 
 
+;; From empathy-tp-call.h
+
+(define-function empathy_tp_call_get_type
+  (c-name "empathy_tp_call_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_tp_call_new
+  (c-name "empathy_tp_call_new")
+  (is-constructor-of "EmpathyTpCall")
+  (return-type "EmpathyTpCall*")
+  (parameters
+    '("McAccount*" "account")
+    '("TpChan*" "tp_chan")
+  )
+)
+
+(define-method is_incoming
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_is_incoming")
+  (return-type "gboolean")
+)
+
+(define-method get_status
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_get_status")
+  (return-type "EmpathyTpCallStatus")
+)
+
+(define-method get_contact
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_get_contact")
+  (return-type "EmpathyContact*")
+)
+
+(define-method accept
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_accept")
+  (return-type "none")
+)
+
+(define-method invite
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_invite")
+  (return-type "none")
+  (parameters
+    '("EmpathyContact*" "contact")
+  )
+)
+
+(define-method request_streams
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_request_streams")
+  (return-type "none")
+  (parameters
+    '("gboolean" "audio")
+    '("gboolean" "video")
+  )
+)
+
+(define-method send_video
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_send_video")
+  (return-type "none")
+  (parameters
+    '("gboolean" "send")
+  )
+)
+
+(define-method add_preview_window
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_add_preview_window")
+  (return-type "none")
+  (parameters
+    '("guint" "socket_id")
+  )
+)
+
+(define-method remove_preview_window
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_remove_preview_window")
+  (return-type "none")
+  (parameters
+    '("guint" "socket_id")
+  )
+)
+
+(define-method set_output_window
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_set_output_window")
+  (return-type "none")
+  (parameters
+    '("guint" "socket_id")
+  )
+)
+
+(define-method set_output_volume
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_set_output_volume")
+  (return-type "none")
+  (parameters
+    '("guint" "volume")
+  )
+)
+
+(define-method mute_output
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_mute_output")
+  (return-type "none")
+  (parameters
+    '("gboolean" "is_muted")
+  )
+)
+
+(define-method mute_input
+  (of-object "EmpathyTpCall")
+  (c-name "empathy_tp_call_mute_input")
+  (return-type "none")
+  (parameters
+    '("gboolean" "is_muted")
+  )
+)
+
+
+
 ;; From empathy-tp-chat.h
 
 (define-function empathy_tp_chat_get_type
@@ -1338,6 +1586,14 @@
   )
 )
 
+(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_acknowledge
   (of-object "EmpathyTpChat")
   (c-name "empathy_tp_chat_get_acknowledge")
@@ -1353,6 +1609,12 @@
   )
 )
 
+(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")
@@ -1379,7 +1641,7 @@
   (c-name "empathy_tp_chat_set_state")
   (return-type "none")
   (parameters
-    '("TelepathyChannelChatState" "state")
+    '("TpChannelChatState" "state")
   )
 )
 
@@ -1435,6 +1697,78 @@
 
 
 
+;; 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")
+  )
+)
+
+(define-method get_user
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_get_user")
+  (return-type "EmpathyContact*")
+)
+
+(define-method get_from_id
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_get_from_id")
+  (return-type "EmpathyContact*")
+  (parameters
+    '("const-gchar*" "id")
+  )
+)
+
+(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_from_handles
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_get_from_handles")
+  (return-type "GList*")
+  (parameters
+    '("GArray*" "handles")
+  )
+)
+
+(define-method set_alias
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_set_alias")
+  (return-type "none")
+  (parameters
+    '("EmpathyContact*" "contact")
+    '("const-gchar*" "alias")
+  )
+)
+
+(define-method set_avatar
+  (of-object "EmpathyTpContactFactory")
+  (c-name "empathy_tp_contact_factory_set_avatar")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "data")
+    '("gsize" "size")
+    '("const-gchar*" "mime_type")
+  )
+)
+
+
+
 ;; From empathy-tp-contact-list.h
 
 (define-function empathy_tp_contact_list_get_type
@@ -1743,4 +2077,89 @@
   )
 )
 
+(define-function empathy_call_contact
+  (c-name "empathy_call_contact")
+  (return-type "none")
+  (parameters
+    '("EmpathyContact*" "contact")
+  )
+)
+
+(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")
+  )
+)
+
+
+
+;; From tp-stream-engine-gen.h
+
+(define-function dbus_g_proxy_begin_call
+  (c-name "dbus_g_proxy_begin_call")
+  (return-type "return")
+  (parameters
+  )
+)
+
+(define-function dbus_g_proxy_begin_call
+  (c-name "dbus_g_proxy_begin_call")
+  (return-type "return")
+  (parameters
+  )
+)
+
+(define-function dbus_g_proxy_begin_call
+  (c-name "dbus_g_proxy_begin_call")
+  (return-type "return")
+  (parameters
+  )
+)
+
+(define-function dbus_g_proxy_begin_call
+  (c-name "dbus_g_proxy_begin_call")
+  (return-type "return")
+  (parameters
+  )
+)
+
+(define-function dbus_g_proxy_begin_call
+  (c-name "dbus_g_proxy_begin_call")
+  (return-type "return")
+  (parameters
+  )
+)
+
+(define-function dbus_g_proxy_begin_call
+  (c-name "dbus_g_proxy_begin_call")
+  (return-type "return")
+  (parameters
+  )
+)
+
+(define-function dbus_g_proxy_begin_call
+  (c-name "dbus_g_proxy_begin_call")
+  (return-type "return")
+  (parameters
+  )
+)
+
+(define-function dbus_g_proxy_begin_call
+  (c-name "dbus_g_proxy_begin_call")
+  (return-type "return")
+  (parameters
+  )
+)
+
 
diff --git a/python/pyempathy/pyempathy.override b/python/pyempathy/pyempathy.override
index dd816e23a..56b143917 100644
--- a/python/pyempathy/pyempathy.override
+++ b/python/pyempathy/pyempathy.override
@@ -19,6 +19,7 @@ headers
 #include "empathy-time.h"
 #include "empathy-tp-chat.h"
 #include "empathy-tp-chatroom.h"
+#include "empathy-tp-contact-factory.h"
 #include "empathy-tp-contact-list.h"
 #include "empathy-tp-group.h"
 #include "empathy-tp-roomlist.h"
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index d9401f6db..cd85572e1 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -7,6 +7,27 @@
   (gtype-id "EMPATHY_TYPE_ACCOUNT_CHOOSER")
 )
 
+(define-object AvatarChooser
+  (in-module "Empathy")
+  (parent "GtkButton")
+  (c-name "EmpathyAvatarChooser")
+  (gtype-id "EMPATHY_TYPE_AVATAR_CHOOSER")
+)
+
+(define-object AvatarImage
+  (in-module "Empathy")
+  (parent "GtkEventBox")
+  (c-name "EmpathyAvatarImage")
+  (gtype-id "EMPATHY_TYPE_AVATAR_IMAGE")
+)
+
+(define-object CellRendererActivatable
+  (in-module "Empathy")
+  (parent "GtkCellRendererPixbuf")
+  (c-name "EmpathyCellRendererActivatable")
+  (gtype-id "EMPATHY_TYPE_CELL_RENDERER_ACTIVATABLE")
+)
+
 (define-object CellRendererExpander
   (in-module "Empathy")
   (parent "GtkCellRenderer")
@@ -91,6 +112,27 @@
   (gtype-id "EMPATHY_TYPE_STATUS_ICON")
 )
 
+(define-object Theme
+  (in-module "Empathy")
+  (parent "GObject")
+  (c-name "EmpathyTheme")
+  (gtype-id "EMPATHY_TYPE_THEME")
+)
+
+(define-object ThemeBoxes
+  (in-module "Empathy")
+  (parent "EmpathyTheme")
+  (c-name "EmpathyThemeBoxes")
+  (gtype-id "EMPATHY_TYPE_THEME_BOXES")
+)
+
+(define-object ThemeIrc
+  (in-module "Empathy")
+  (parent "EmpathyTheme")
+  (c-name "EmpathyThemeIrc")
+  (gtype-id "EMPATHY_TYPE_THEME_IRC")
+)
+
 (define-object ThemeManager
   (in-module "Empathy")
   (parent "GObject")
@@ -107,6 +149,20 @@
 
 ;; 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")
@@ -122,30 +178,33 @@
   (c-name "EmpathyContactListStoreCol")
   (gtype-id "EMPATHY_TYPE_CONTACT_LIST_STORE_COL")
   (values
-    '("icon-status" "COL_ICON_STATUS")
-    '("pixbuf-avatar" "COL_PIXBUF_AVATAR")
-    '("pixbuf-avatar-visible" "COL_PIXBUF_AVATAR_VISIBLE")
-    '("name" "COL_NAME")
-    '("status" "COL_STATUS")
-    '("status-visible" "COL_STATUS_VISIBLE")
-    '("contact" "COL_CONTACT")
-    '("is-group" "COL_IS_GROUP")
-    '("is-active" "COL_IS_ACTIVE")
-    '("is-online" "COL_IS_ONLINE")
-    '("is-separator" "COL_IS_SEPARATOR")
-    '("count" "COL_COUNT")
-  )
-)
-
-(define-enum ContactWidgetType
+    '("icon-status" "EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS")
+    '("pixbuf-avatar" "EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR")
+    '("pixbuf-avatar-visible" "EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE")
+    '("name" "EMPATHY_CONTACT_LIST_STORE_COL_NAME")
+    '("status" "EMPATHY_CONTACT_LIST_STORE_COL_STATUS")
+    '("status-visible" "EMPATHY_CONTACT_LIST_STORE_COL_STATUS_VISIBLE")
+    '("contact" "EMPATHY_CONTACT_LIST_STORE_COL_CONTACT")
+    '("is-group" "EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP")
+    '("is-active" "EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE")
+    '("is-online" "EMPATHY_CONTACT_LIST_STORE_COL_IS_ONLINE")
+    '("is-separator" "EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR")
+    '("can-voip" "EMPATHY_CONTACT_LIST_STORE_COL_CAN_VOIP")
+    '("count" "EMPATHY_CONTACT_LIST_STORE_COL_COUNT")
+  )
+)
+
+(define-flags ContactWidgetFlags
   (in-module "Empathy")
-  (c-name "EmpathyContactWidgetType")
-  (gtype-id "EMPATHY_TYPE_CONTACT_WIDGET_TYPE")
+  (c-name "EmpathyContactWidgetFlags")
+  (gtype-id "EMPATHY_TYPE_CONTACT_WIDGET_FLAGS")
   (values
-    '("show" "CONTACT_WIDGET_TYPE_SHOW")
-    '("edit" "CONTACT_WIDGET_TYPE_EDIT")
-    '("add" "CONTACT_WIDGET_TYPE_ADD")
-    '("subscription" "CONTACT_WIDGET_TYPE_SUBSCRIPTION")
+    '("none" "EMPATHY_CONTACT_WIDGET_EDIT_NONE")
+    '("alias" "EMPATHY_CONTACT_WIDGET_EDIT_ALIAS")
+    '("avatar" "EMPATHY_CONTACT_WIDGET_EDIT_AVATAR")
+    '("account" "EMPATHY_CONTACT_WIDGET_EDIT_ACCOUNT")
+    '("id" "EMPATHY_CONTACT_WIDGET_EDIT_ID")
+    '("groups" "EMPATHY_CONTACT_WIDGET_EDIT_GROUPS")
   )
 )
 
@@ -290,6 +349,92 @@
 
 
 
+;; 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_show
+  (c-name "empathy_call_window_show")
+  (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
@@ -459,6 +604,12 @@
   (return-type "const-gchar*")
 )
 
+(define-method get_account
+  (of-object "EmpathyChat")
+  (c-name "empathy_chat_get_account")
+  (return-type "McAccount*")
+)
+
 (define-function empathy_chat_get_is_command
   (c-name "empathy_chat_get_is_command")
   (return-type "gboolean")
@@ -634,6 +785,21 @@
   (return-type "none")
 )
 
+(define-method get_theme
+  (of-object "EmpathyChatView")
+  (c-name "empathy_chat_view_get_theme")
+  (return-type "EmpathyTheme*")
+)
+
+(define-method set_theme
+  (of-object "EmpathyChatView")
+  (c-name "empathy_chat_view_set_theme")
+  (return-type "none")
+  (parameters
+    '("EmpathyTheme*" "theme")
+  )
+)
+
 (define-method set_margin
   (of-object "EmpathyChatView")
   (c-name "empathy_chat_view_set_margin")
@@ -649,7 +815,6 @@
   (parameters
     '("GCallback" "callback")
     '("gpointer" "user_data")
-    '("GtkTooltips*" "tooltips")
   )
 )
 
@@ -662,6 +827,59 @@
   )
 )
 
+(define-method get_last_timestamp
+  (of-object "EmpathyChatView")
+  (c-name "empathy_chat_view_get_last_timestamp")
+  (return-type "time_t")
+)
+
+(define-method set_last_timestamp
+  (of-object "EmpathyChatView")
+  (c-name "empathy_chat_view_set_last_timestamp")
+  (return-type "none")
+  (parameters
+    '("time_t" "timestamp")
+  )
+)
+
+(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")
+  (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*")
+  (parameters
+    '("EmpathyContact*" "contact")
+  )
+)
+
 
 
 ;; From empathy-chat-window.h
@@ -760,6 +978,7 @@
   (parameters
     '("GtkWindow*" "parent")
     '("gboolean" "edit")
+    '("gboolean" "is_user")
   )
 )
 
@@ -928,6 +1147,21 @@
   )
 )
 
+(define-method set_interactive
+  (of-object "EmpathyContactListView")
+  (c-name "empathy_contact_list_view_set_interactive")
+  (return-type "none")
+  (parameters
+    '("gboolean" "interactive")
+  )
+)
+
+(define-method get_interactive
+  (of-object "EmpathyContactListView")
+  (c-name "empathy_contact_list_view_get_interactive")
+  (return-type "gboolean")
+)
+
 (define-method get_selected
   (of-object "EmpathyContactListView")
   (c-name "empathy_contact_list_view_get_selected")
@@ -964,7 +1198,7 @@
   (c-name "empathy_contact_widget_new")
   (return-type "GtkWidget*")
   (parameters
-    '("EmpathyContactWidgetType" "type")
+    '("EmpathyContactWidgetFlags" "flags")
   )
 )
 
@@ -976,6 +1210,16 @@
   )
 )
 
+(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-geometry.h
@@ -1018,8 +1262,7 @@
   (is-constructor-of "EmpathyGroupChat")
   (return-type "EmpathyGroupChat*")
   (parameters
-    '("McAccount*" "account")
-    '("TpChan*" "tp_chan")
+    '("EmpathyTpChatroom*" "tp_chat")
   )
 )
 
@@ -1046,6 +1289,30 @@
 
 
 
+;; From empathy-gtk-enum-types.h
+
+(define-function empathy_contact_widget_flags_get_type
+  (c-name "empathy_contact_widget_flags_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_contact_list_store_sort_get_type
+  (c-name "empathy_contact_list_store_sort_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_contact_list_store_col_get_type
+  (c-name "empathy_contact_list_store_col_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_chat_view_block_get_type
+  (c-name "empathy_chat_view_block_get_type")
+  (return-type "GType")
+)
+
+
+
 ;; From empathy-images.h
 
 
@@ -1086,6 +1353,18 @@
 
 
 
+;; 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-preferences.h
 
 (define-function empathy_preferences_show
@@ -1130,8 +1409,7 @@
   (is-constructor-of "EmpathyPrivateChat")
   (return-type "EmpathyPrivateChat*")
   (parameters
-    '("McAccount*" "account")
-    '("TpChan*" "tp_chan")
+    '("EmpathyTpChat*" "tp_chat")
   )
 )
 
@@ -1159,6 +1437,14 @@
   )
 )
 
+(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
@@ -1377,6 +1663,120 @@
 
 
 
+;; 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
@@ -1413,16 +1813,6 @@
   )
 )
 
-(define-method update_show_avatars
-  (of-object "EmpathyThemeManager")
-  (c-name "empathy_theme_manager_update_show_avatars")
-  (return-type "none")
-  (parameters
-    '("EmpathyChatView*" "view")
-    '("gboolean" "show")
-  )
-)
-
 
 
 ;; From empathy-ui-utils.h
@@ -1473,15 +1863,6 @@
   (varargs #t)
 )
 
-(define-function empathy_pixbuf_from_icon_name
-  (c-name "empathy_pixbuf_from_icon_name")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("const-gchar*" "icon_name")
-    '("GtkIconSize" "icon_size")
-  )
-)
-
 (define-function empathy_icon_name_from_account
   (c-name "empathy_icon_name_from_account")
   (return-type "const-gchar*")
@@ -1514,6 +1895,15 @@
   )
 )
 
+(define-function empathy_pixbuf_from_data
+  (c-name "empathy_pixbuf_from_data")
+  (return-type "GdkPixbuf*")
+  (parameters
+    '("gchar*" "data")
+    '("gsize" "data_size")
+  )
+)
+
 (define-function empathy_pixbuf_from_avatar_scaled
   (c-name "empathy_pixbuf_from_avatar_scaled")
   (return-type "GdkPixbuf*")
@@ -1534,6 +1924,24 @@
   )
 )
 
+(define-function empathy_pixbuf_scale_down_if_necessary
+  (c-name "empathy_pixbuf_scale_down_if_necessary")
+  (return-type "GdkPixbuf*")
+  (parameters
+    '("GdkPixbuf*" "pixbuf")
+    '("gint" "max_size")
+  )
+)
+
+(define-function empathy_pixbuf_from_icon_name
+  (c-name "empathy_pixbuf_from_icon_name")
+  (return-type "GdkPixbuf*")
+  (parameters
+    '("const-gchar*" "icon_name")
+    '("GtkIconSize" "icon_size")
+  )
+)
+
 (define-function empathy_text_iter_forward_search
   (c-name "empathy_text_iter_forward_search")
   (return-type "gboolean")
@@ -1621,6 +2029,17 @@
   )
 )
 
+(define-function empathy_text_buffer_tag_set
+  (c-name "empathy_text_buffer_tag_set")
+  (return-type "GtkTextTag*")
+  (parameters
+    '("GtkTextBuffer*" "buffer")
+    '("const-gchar*" "tag_name")
+    '("const-gchar*" "first_property_name")
+  )
+  (varargs #t)
+)
+
 
 
 ;; From ephy-spinner.h
@@ -1658,3 +2077,7 @@
 )
 
 
+
+;; From stamp-empathy-gtk-enum-types.h
+
+
diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override
index 6f7974cd9..3c7c1a446 100644
--- a/python/pyempathygtk/pyempathygtk.override
+++ b/python/pyempathygtk/pyempathygtk.override
@@ -2,6 +2,8 @@
 headers
 #include <Python.h>
 #include <pygobject.h>
+#include "empathy-avatar-chooser.h"
+#include "empathy-avatar-image.h"
 #include "empathy-about-dialog.h"
 #include "empathy-account-chooser.h"
 #include "empathy-accounts-dialog.h"
@@ -10,6 +12,7 @@ headers
 #include "empathy-account-widget-msn.h"
 #include "empathy-cell-renderer-expander.h"
 #include "empathy-cell-renderer-text.h"
+#include "empathy-cell-renderer-activatable.h"
 #include "empathy-chat.h"
 #include "empathy-chatrooms-window.h"
 #include "empathy-chat-view.h"
@@ -33,15 +36,16 @@ headers
 #include "empathy-spell.h"
 #include "empathy-status-icon.h"
 #include "empathy-status-presets.h"
+#include "empathy-theme.h"
 #include "empathy-theme-manager.h"
+#include "empathy-theme-boxes.h"
+#include "empathy-theme-irc.h"
 #include "empathy-ui-utils.h"
 #include "ephy-spinner.h"
 #include "empathy-smiley-manager.h"
-
-/* FIXME */
-#define EMPATHY_TYPE_CONTACT_LIST_STORE_COL 2
-#define EMPATHY_TYPE_CONTACT_LIST_STORE_SORT 3
-#define EMPATHY_TYPE_CONTACT_WIDGET_TYPE 4
+#include "empathy-new-message-dialog.h"
+#include "empathy-call-window.h"
+#include "empathy-gtk-enum-types.h"
 
 void empathy_add_constants(PyObject *module, const gchar *strip_prefix);
 void empathy_register_classes(PyObject *d);
@@ -59,11 +63,17 @@ import gtk.TreeStore as PyGtkTreeStore_Type
 import gtk.ToggleButton as PyGtkToggleButton_Type
 import gtk.ComboBox as PyGtkComboBox_Type
 import gtk.StatusIcon as PyGtkStatusIcon_Type
+import gtk.Button as PyGtkButton_Type
+import gtk.EventBox as PyGtkEventBox_Type
+import gtk.CellRendererPixbuf as PyGtkCellRendererPixbuf_Type
+import gdk.Pixbuf as PyGdkPixbuf_Type
 import empathy.Contact as PyEmpathyContact_Type
 import empathy.ContactList as PyEmpathyContactList_Type
 import empathy.TpChat as PyEmpathyTpChat_Type
 import empathy.Presence as PyEmpathyPresence_Type
 import empathy.Message as PyEmpathyMessage_Type
+import empathy.TpChatroom as PyEmpathyTpChatroom_Type
+import empathy.TpCall as PyEmpathyTpCall_Type
 %%
 ignore-glob
 	*_get_type