Use empathy.foo() instead of empathy_foo() for functions binding

svn path=/trunk/; revision=1158

3 files changed, 200 insertions, 197 deletions

diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 2c3e8d20b..1eb3c20cc 100644
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -219,12 +219,12 @@
 
 ;; From empathy-time.h
 
-(define-function empathy_time_get_current
+(define-function time_get_current
   (c-name "empathy_time_get_current")
   (return-type "time_t")
 )
 
-(define-function empathy_time_get_local_time
+(define-function time_get_local_time
   (c-name "empathy_time_get_local_time")
   (return-type "time_t")
   (parameters
@@ -232,7 +232,7 @@
   )
 )
 
-(define-function empathy_time_parse
+(define-function time_parse
   (c-name "empathy_time_parse")
   (return-type "time_t")
   (parameters
@@ -240,7 +240,7 @@
   )
 )
 
-(define-function empathy_time_to_string_utc
+(define-function time_to_string_utc
   (c-name "empathy_time_to_string_utc")
   (return-type "gchar*")
   (parameters
@@ -249,7 +249,7 @@
   )
 )
 
-(define-function empathy_time_to_string_local
+(define-function time_to_string_local
   (c-name "empathy_time_to_string_local")
   (return-type "gchar*")
   (parameters
@@ -262,12 +262,12 @@
 
 ;; From empathy-status-presets.h
 
-(define-function empathy_status_presets_get_all
+(define-function status_presets_get_all
   (c-name "empathy_status_presets_get_all")
   (return-type "none")
 )
 
-(define-function empathy_status_presets_get
+(define-function status_presets_get
   (c-name "empathy_status_presets_get")
   (return-type "GList*")
   (parameters
@@ -276,7 +276,7 @@
   )
 )
 
-(define-function empathy_status_presets_set_last
+(define-function status_presets_set_last
   (c-name "empathy_status_presets_set_last")
   (return-type "none")
   (parameters
@@ -285,7 +285,7 @@
   )
 )
 
-(define-function empathy_status_presets_remove
+(define-function status_presets_remove
   (c-name "empathy_status_presets_remove")
   (return-type "none")
   (parameters
@@ -294,22 +294,22 @@
   )
 )
 
-(define-function empathy_status_presets_reset
+(define-function status_presets_reset
   (c-name "empathy_status_presets_reset")
   (return-type "none")
 )
 
-(define-function empathy_status_presets_get_default_state
+(define-function status_presets_get_default_state
   (c-name "empathy_status_presets_get_default_state")
   (return-type "McPresence")
 )
 
-(define-function empathy_status_presets_get_default_status
+(define-function status_presets_get_default_status
   (c-name "empathy_status_presets_get_default_status")
   (return-type "const-gchar*")
 )
 
-(define-function empathy_status_presets_set_default
+(define-function status_presets_set_default
   (c-name "empathy_status_presets_set_default")
   (return-type "none")
   (parameters
@@ -318,7 +318,7 @@
   )
 )
 
-(define-function empathy_status_presets_clear_default
+(define-function status_presets_clear_default
   (c-name "empathy_status_presets_clear_default")
   (return-type "none")
 )
@@ -327,7 +327,7 @@
 
 ;; From empathy-debug.h
 
-(define-function empathy_debug_flag_is_set
+(define-function debug_flag_is_set
   (c-name "empathy_debug_flag_is_set")
   (return-type "gboolean")
   (parameters
@@ -335,7 +335,7 @@
   )
 )
 
-(define-function empathy_debug
+(define-function debug
   (c-name "empathy_debug")
   (return-type "none")
   (parameters
@@ -345,7 +345,7 @@
   (varargs #t)
 )
 
-(define-function empathy_debug_set_flags
+(define-function debug_set_flags
   (c-name "empathy_debug_set_flags")
   (return-type "none")
   (parameters
@@ -357,7 +357,7 @@
 
 ;; From empathy-utils.h
 
-(define-function empathy_substring
+(define-function substring
   (c-name "empathy_substring")
   (return-type "gchar*")
   (parameters
@@ -367,7 +367,7 @@
   )
 )
 
-(define-function empathy_regex_match
+(define-function regex_match
   (c-name "empathy_regex_match")
   (return-type "gint")
   (parameters
@@ -378,7 +378,7 @@
   )
 )
 
-(define-function empathy_strcasecmp
+(define-function strcasecmp
   (c-name "empathy_strcasecmp")
   (return-type "gint")
   (parameters
@@ -387,7 +387,7 @@
   )
 )
 
-(define-function empathy_strncasecmp
+(define-function strncasecmp
   (c-name "empathy_strncasecmp")
   (return-type "gint")
   (parameters
@@ -397,7 +397,7 @@
   )
 )
 
-(define-function empathy_xml_validate
+(define-function xml_validate
   (c-name "empathy_xml_validate")
   (return-type "gboolean")
   (parameters
@@ -406,7 +406,7 @@
   )
 )
 
-(define-function empathy_xml_node_get_child
+(define-function xml_node_get_child
   (c-name "empathy_xml_node_get_child")
   (return-type "xmlNodePtr")
   (parameters
@@ -415,7 +415,7 @@
   )
 )
 
-(define-function empathy_xml_node_get_child_content
+(define-function xml_node_get_child_content
   (c-name "empathy_xml_node_get_child_content")
   (return-type "xmlChar*")
   (parameters
@@ -424,7 +424,7 @@
   )
 )
 
-(define-function empathy_xml_node_find_child_prop_value
+(define-function xml_node_find_child_prop_value
   (c-name "empathy_xml_node_find_child_prop_value")
   (return-type "xmlNodePtr")
   (parameters
@@ -434,7 +434,7 @@
   )
 )
 
-(define-function empathy_account_hash
+(define-function account_hash
   (c-name "empathy_account_hash")
   (return-type "guint")
   (parameters
@@ -442,7 +442,7 @@
   )
 )
 
-(define-function empathy_account_equal
+(define-function account_equal
   (c-name "empathy_account_equal")
   (return-type "gboolean")
   (parameters
@@ -451,13 +451,13 @@
   )
 )
 
-(define-function empathy_mission_control_new
+(define-function mission_control_new
   (c-name "empathy_mission_control_new")
   (is-constructor-of "EmpathyMissionControl")
   (return-type "MissionControl*")
 )
 
-(define-function empathy_presence_get_default_message
+(define-function presence_get_default_message
   (c-name "empathy_presence_get_default_message")
   (return-type "const-gchar*")
   (parameters
@@ -465,7 +465,7 @@
   )
 )
 
-(define-function empathy_presence_to_str
+(define-function presence_to_str
   (c-name "empathy_presence_to_str")
   (return-type "const-gchar*")
   (parameters
@@ -473,7 +473,7 @@
   )
 )
 
-(define-function empathy_presence_from_str
+(define-function presence_from_str
   (c-name "empathy_presence_from_str")
   (return-type "McPresence")
   (parameters
@@ -481,7 +481,7 @@
   )
 )
 
-(define-function empathy_file_lookup
+(define-function file_lookup
   (c-name "empathy_file_lookup")
   (return-type "gchar*")
   (parameters
@@ -490,7 +490,7 @@
   )
 )
 
-(define-function empathy_run_until_ready
+(define-function run_until_ready
   (c-name "empathy_run_until_ready")
   (return-type "none")
   (parameters
@@ -498,7 +498,7 @@
   )
 )
 
-(define-function empathy_run_until_ready_full
+(define-function run_until_ready_full
   (c-name "empathy_run_until_ready_full")
   (return-type "none")
   (parameters
@@ -510,7 +510,7 @@
   )
 )
 
-(define-function empathy_channel_get_account
+(define-function channel_get_account
   (c-name "empathy_channel_get_account")
   (return-type "McAccount*")
   (parameters
@@ -518,7 +518,7 @@
   )
 )
 
-(define-function empathy_connect_to_account_status_changed
+(define-function connect_to_account_status_changed
   (c-name "empathy_connect_to_account_status_changed")
   (return-type "gpointer")
   (parameters
@@ -529,7 +529,7 @@
   )
 )
 
-(define-function empathy_disconnect_account_status_changed
+(define-function disconnect_account_status_changed
   (c-name "empathy_disconnect_account_status_changed")
   (return-type "none")
   (parameters
@@ -537,7 +537,7 @@
   )
 )
 
-(define-function empathy_proxy_equal
+(define-function proxy_equal
   (c-name "empathy_proxy_equal")
   (return-type "gboolean")
   (parameters
@@ -546,7 +546,7 @@
   )
 )
 
-(define-function empathy_proxy_hash
+(define-function proxy_hash
   (c-name "empathy_proxy_hash")
   (return-type "guint")
   (parameters
@@ -558,12 +558,12 @@
 
 ;; From empathy-message.h
 
-(define-function empathy_message_get_type
+(define-function message_get_type
   (c-name "empathy_message_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_message_new
+(define-function message_new
   (c-name "empathy_message_new")
   (is-constructor-of "EmpathyMessage")
   (return-type "EmpathyMessage*")
@@ -662,7 +662,7 @@
   (return-type "gboolean")
 )
 
-(define-function empathy_message_type_from_str
+(define-function message_type_from_str
   (c-name "empathy_message_type_from_str")
   (return-type "TpChannelTextMessageType")
   (parameters
@@ -670,7 +670,7 @@
   )
 )
 
-(define-function empathy_message_type_to_str
+(define-function message_type_to_str
   (c-name "empathy_message_type_to_str")
   (return-type "const-gchar*")
   (parameters
@@ -682,12 +682,12 @@
 
 ;; From empathy-chatroom-manager.h
 
-(define-function empathy_chatroom_manager_get_type
+(define-function chatroom_manager_get_type
   (c-name "empathy_chatroom_manager_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_chatroom_manager_new
+(define-function chatroom_manager_new
   (c-name "empathy_chatroom_manager_new")
   (is-constructor-of "EmpathyChatroomManager")
   (return-type "EmpathyChatroomManager*")
@@ -749,12 +749,12 @@
 
 ;; From empathy-chatroom.h
 
-(define-function empathy_chatroom_get_type
+(define-function chatroom_get_type
   (c-name "empathy_chatroom_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_chatroom_new
+(define-function chatroom_new
   (c-name "empathy_chatroom_new")
   (is-constructor-of "EmpathyChatroom")
   (return-type "EmpathyChatroom*")
@@ -764,7 +764,7 @@
   )
 )
 
-(define-function empathy_chatroom_new_full
+(define-function chatroom_new_full
   (c-name "empathy_chatroom_new_full")
   (return-type "EmpathyChatroom*")
   (parameters
@@ -835,7 +835,7 @@
   )
 )
 
-(define-function empathy_chatroom_equal
+(define-function chatroom_equal
   (c-name "empathy_chatroom_equal")
   (return-type "gboolean")
   (parameters
@@ -848,12 +848,12 @@
 
 ;; From empathy-contact.h
 
-(define-function empathy_contact_get_type
+(define-function contact_get_type
   (c-name "empathy_contact_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_contact_new
+(define-function contact_new
   (c-name "empathy_contact_new")
   (is-constructor-of "EmpathyContact")
   (return-type "EmpathyContact*")
@@ -862,7 +862,7 @@
   )
 )
 
-(define-function empathy_contact_new_full
+(define-function contact_new_full
   (c-name "empathy_contact_new_full")
   (return-type "EmpathyContact*")
   (parameters
@@ -1031,7 +1031,7 @@
   (return-type "gboolean")
 )
 
-(define-function empathy_contact_equal
+(define-function contact_equal
   (c-name "empathy_contact_equal")
   (return-type "gboolean")
   (parameters
@@ -1040,7 +1040,7 @@
   )
 )
 
-(define-function empathy_contact_hash
+(define-function contact_hash
   (c-name "empathy_contact_hash")
   (return-type "guint")
   (parameters
@@ -1079,12 +1079,12 @@
   )
 )
 
-(define-function empathy_avatar_get_type
+(define-function avatar_get_type
   (c-name "empathy_avatar_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_avatar_new
+(define-function avatar_new
   (c-name "empathy_avatar_new")
   (is-constructor-of "EmpathyAvatar")
   (return-type "EmpathyAvatar*")
@@ -1112,12 +1112,12 @@
 
 ;; From empathy-contact-groups.h
 
-(define-function empathy_contact_groups_get_all
+(define-function contact_groups_get_all
   (c-name "empathy_contact_groups_get_all")
   (return-type "none")
 )
 
-(define-function empathy_contact_group_get_expanded
+(define-function contact_group_get_expanded
   (c-name "empathy_contact_group_get_expanded")
   (return-type "gboolean")
   (parameters
@@ -1125,7 +1125,7 @@
   )
 )
 
-(define-function empathy_contact_group_set_expanded
+(define-function contact_group_set_expanded
   (c-name "empathy_contact_group_set_expanded")
   (return-type "none")
   (parameters
@@ -1138,7 +1138,7 @@
 
 ;; From empathy-contact-list.h
 
-(define-function empathy_contact_list_get_type
+(define-function contact_list_get_type
   (c-name "empathy_contact_list_get_type")
   (return-type "GType")
 )
@@ -1233,12 +1233,12 @@
 
 ;; From empathy-contact-manager.h
 
-(define-function empathy_contact_manager_get_type
+(define-function contact_manager_get_type
   (c-name "empathy_contact_manager_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_contact_manager_new
+(define-function contact_manager_new
   (c-name "empathy_contact_manager_new")
   (is-constructor-of "EmpathyContactManager")
   (return-type "EmpathyContactManager*")
@@ -1257,12 +1257,12 @@
 
 ;; From empathy-contact-factory.h
 
-(define-function empathy_contact_factory_get_type
+(define-function contact_factory_get_type
   (c-name "empathy_contact_factory_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_contact_factory_new
+(define-function contact_factory_new
   (c-name "empathy_contact_factory_new")
   (is-constructor-of "EmpathyContactFactory")
   (return-type "EmpathyContactFactory*")
@@ -1342,12 +1342,12 @@
 
 ;; From empathy-tp-contact-factory.h
 
-(define-function empathy_tp_contact_factory_get_type
+(define-function tp_contact_factory_get_type
   (c-name "empathy_tp_contact_factory_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_tp_contact_factory_new
+(define-function tp_contact_factory_new
   (c-name "empathy_tp_contact_factory_new")
   (is-constructor-of "EmpathyTpContactFactory")
   (return-type "EmpathyTpContactFactory*")
@@ -1420,12 +1420,12 @@
 
 ;; From empathy-tp-group.h
 
-(define-function empathy_tp_group_get_type
+(define-function tp_group_get_type
   (c-name "empathy_tp_group_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_tp_group_new
+(define-function tp_group_new
   (c-name "empathy_tp_group_new")
   (is-constructor-of "EmpathyTpGroup")
   (return-type "EmpathyTpGroup*")
@@ -1534,7 +1534,7 @@
   )
 )
 
-(define-function empathy_pending_info_new
+(define-function pending_info_new
   (c-name "empathy_pending_info_new")
   (is-constructor-of "EmpathyPendingInfo")
   (return-type "EmpathyPendingInfo*")
@@ -1555,12 +1555,12 @@
 
 ;; From empathy-tp-contact-list.h
 
-(define-function empathy_tp_contact_list_get_type
+(define-function tp_contact_list_get_type
   (c-name "empathy_tp_contact_list_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_tp_contact_list_new
+(define-function tp_contact_list_new
   (c-name "empathy_tp_contact_list_new")
   (is-constructor-of "EmpathyTpContactList")
   (return-type "EmpathyTpContactList*")
@@ -1579,12 +1579,12 @@
 
 ;; From empathy-tp-chat.h
 
-(define-function empathy_tp_chat_get_type
+(define-function tp_chat_get_type
   (c-name "empathy_tp_chat_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_tp_chat_new
+(define-function tp_chat_new
   (c-name "empathy_tp_chat_new")
   (is-constructor-of "EmpathyTpChat")
   (return-type "EmpathyTpChat*")
@@ -1676,12 +1676,12 @@
 
 ;; From empathy-tp-roomlist.h
 
-(define-function empathy_tp_roomlist_get_type
+(define-function tp_roomlist_get_type
   (c-name "empathy_tp_roomlist_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_tp_roomlist_new
+(define-function tp_roomlist_new
   (c-name "empathy_tp_roomlist_new")
   (is-constructor-of "EmpathyTpRoomlist")
   (return-type "EmpathyTpRoomlist*")
@@ -1712,12 +1712,12 @@
 
 ;; From empathy-tp-call.h
 
-(define-function empathy_tp_call_get_type
+(define-function tp_call_get_type
   (c-name "empathy_tp_call_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_tp_call_new
+(define-function tp_call_new
   (c-name "empathy_tp_call_new")
   (is-constructor-of "EmpathyTpCall")
   (return-type "EmpathyTpCall*")
@@ -1814,12 +1814,12 @@
 
 ;; From empathy-tp-tube.h
 
-(define-function empathy_tp_tube_get_type
+(define-function tp_tube_get_type
   (c-name "empathy_tp_tube_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_tp_tube_new
+(define-function tp_tube_new
   (c-name "empathy_tp_tube_new")
   (is-constructor-of "EmpathyTpTube")
   (return-type "EmpathyTpTube*")
@@ -1829,7 +1829,7 @@
   )
 )
 
-(define-function empathy_tp_tube_new_stream_tube
+(define-function tp_tube_new_stream_tube
   (c-name "empathy_tp_tube_new_stream_tube")
   (return-type "EmpathyTpTube*")
   (parameters
@@ -1864,12 +1864,12 @@
 
 ;; From empathy-idle.h
 
-(define-function empathy_idle_get_type
+(define-function idle_get_type
   (c-name "empathy_idle_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_idle_new
+(define-function idle_new
   (c-name "empathy_idle_new")
   (is-constructor-of "EmpathyIdle")
   (return-type "EmpathyIdle*")
@@ -1964,12 +1964,12 @@
 
 ;; From empathy-log-manager.h
 
-(define-function empathy_log_manager_get_type
+(define-function log_manager_get_type
   (c-name "empathy_log_manager_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_log_manager_new
+(define-function log_manager_new
   (c-name "empathy_log_manager_new")
   (is-constructor-of "EmpathyLogManager")
   (return-type "EmpathyLogManager*")
@@ -2067,7 +2067,7 @@
   )
 )
 
-(define-function empathy_log_manager_search_free
+(define-function log_manager_search_free
   (c-name "empathy_log_manager_search_free")
   (return-type "none")
   (parameters
@@ -2075,7 +2075,7 @@
   )
 )
 
-(define-function empathy_log_manager_get_date_readable
+(define-function log_manager_get_date_readable
   (c-name "empathy_log_manager_get_date_readable")
   (return-type "gchar*")
   (parameters
@@ -2087,12 +2087,12 @@
 
 ;; From empathy-irc-network-manager.h
 
-(define-function empathy_irc_network_manager_get_type
+(define-function irc_network_manager_get_type
   (c-name "empathy_irc_network_manager_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_irc_network_manager_new
+(define-function irc_network_manager_new
   (c-name "empathy_irc_network_manager_new")
   (is-constructor-of "EmpathyIrcNetworkManager")
   (return-type "EmpathyIrcNetworkManager*")
@@ -2139,12 +2139,12 @@
 
 ;; From empathy-irc-network.h
 
-(define-function empathy_irc_network_get_type
+(define-function irc_network_get_type
   (c-name "empathy_irc_network_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_irc_network_new
+(define-function irc_network_new
   (c-name "empathy_irc_network_new")
   (is-constructor-of "EmpathyIrcNetwork")
   (return-type "EmpathyIrcNetwork*")
@@ -2191,12 +2191,12 @@
 
 ;; From empathy-irc-server.h
 
-(define-function empathy_irc_server_get_type
+(define-function irc_server_get_type
   (c-name "empathy_irc_server_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_irc_server_new
+(define-function irc_server_new
   (c-name "empathy_irc_server_new")
   (is-constructor-of "EmpathyIrcServer")
   (return-type "EmpathyIrcServer*")
@@ -2211,12 +2211,12 @@
 
 ;; From empathy-tube-handler.h
 
-(define-function empathy_tube_handler_get_type
+(define-function tube_handler_get_type
   (c-name "empathy_tube_handler_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_tube_handler_new
+(define-function tube_handler_new
   (c-name "empathy_tube_handler_new")
   (is-constructor-of "EmpathyTubeHandler")
   (return-type "EmpathyTubeHandler*")
@@ -2226,7 +2226,7 @@
   )
 )
 
-(define-function empathy_tube_handler_build_bus_name
+(define-function tube_handler_build_bus_name
   (c-name "empathy_tube_handler_build_bus_name")
   (return-type "gchar*")
   (parameters
@@ -2235,7 +2235,7 @@
   )
 )
 
-(define-function empathy_tube_handler_build_object_path
+(define-function tube_handler_build_object_path
   (c-name "empathy_tube_handler_build_object_path")
   (return-type "gchar*")
   (parameters
@@ -2248,12 +2248,12 @@
 
 ;; From empathy-dispatcher.h
 
-(define-function empathy_dispatcher_get_type
+(define-function dispatcher_get_type
   (c-name "empathy_dispatcher_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_dispatcher_new
+(define-function dispatcher_new
   (c-name "empathy_dispatcher_new")
   (is-constructor-of "EmpathyDispatcher")
   (return-type "EmpathyDispatcher*")
@@ -2268,7 +2268,7 @@
   )
 )
 
-(define-function empathy_dispatcher_tube_get_type
+(define-function dispatcher_tube_get_type
   (c-name "empathy_dispatcher_tube_get_type")
   (return-type "GType")
 )
@@ -2294,7 +2294,7 @@
   )
 )
 
-(define-function empathy_dispatcher_call_with_contact
+(define-function dispatcher_call_with_contact
   (c-name "empathy_dispatcher_call_with_contact")
   (return-type "none")
   (parameters
@@ -2302,7 +2302,7 @@
   )
 )
 
-(define-function empathy_dispatcher_call_with_contact_id
+(define-function dispatcher_call_with_contact_id
   (c-name "empathy_dispatcher_call_with_contact_id")
   (return-type "none")
   (parameters
@@ -2311,7 +2311,7 @@
   )
 )
 
-(define-function empathy_dispatcher_chat_with_contact_id
+(define-function dispatcher_chat_with_contact_id
   (c-name "empathy_dispatcher_chat_with_contact_id")
   (return-type "none")
   (parameters
@@ -2320,7 +2320,7 @@
   )
 )
 
-(define-function empathy_dispatcher_chat_with_contact
+(define-function dispatcher_chat_with_contact
   (c-name "empathy_dispatcher_chat_with_contact")
   (return-type "none")
   (parameters
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index f0ea3b096..379f35cbf 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -164,6 +164,7 @@
     '("contact-remove" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_REMOVE")
     '("contact-drop" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DROP")
     '("contact-drag" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DRAG")
+    '("contact-tooltip" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_TOOLTIP")
     '("all" "EMPATHY_CONTACT_LIST_FEATURE_ALL")
   )
 )
@@ -204,12 +205,12 @@
 
 ;; From empathy-account-chooser.h
 
-(define-function empathy_account_chooser_get_type
+(define-function account_chooser_get_type
   (c-name "empathy_account_chooser_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_account_chooser_new
+(define-function account_chooser_new
   (c-name "empathy_account_chooser_new")
   (is-constructor-of "EmpathyAccountChooser")
   (return-type "GtkWidget*")
@@ -255,7 +256,7 @@
   )
 )
 
-(define-function empathy_account_chooser_filter_is_connected
+(define-function account_chooser_filter_is_connected
   (c-name "empathy_account_chooser_filter_is_connected")
   (return-type "gboolean")
   (parameters
@@ -268,12 +269,12 @@
 
 ;; From empathy-chat.h
 
-(define-function empathy_chat_get_type
+(define-function chat_get_type
   (c-name "empathy_chat_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_chat_new
+(define-function chat_new
   (c-name "empathy_chat_new")
   (is-constructor-of "EmpathyChat")
   (return-type "EmpathyChat*")
@@ -397,7 +398,7 @@
 
 ;; From empathy-spell-dialog.h
 
-(define-function empathy_spell_dialog_show
+(define-function spell_dialog_show
   (c-name "empathy_spell_dialog_show")
   (return-type "none")
   (parameters
@@ -412,7 +413,7 @@
 
 ;; From empathy-accounts-dialog.h
 
-(define-function empathy_accounts_dialog_show
+(define-function accounts_dialog_show
   (c-name "empathy_accounts_dialog_show")
   (return-type "GtkWidget*")
   (parameters
@@ -424,12 +425,12 @@
 
 ;; From empathy-chat-view.h
 
-(define-function empathy_chat_view_get_type
+(define-function chat_view_get_type
   (c-name "empathy_chat_view_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_chat_view_new
+(define-function chat_view_new
   (c-name "empathy_chat_view_new")
   (is-constructor-of "EmpathyChatView")
   (return-type "EmpathyChatView*")
@@ -565,7 +566,7 @@
   )
 )
 
-(define-function empathy_chat_view_get_smiley_menu
+(define-function chat_view_get_smiley_menu
   (c-name "empathy_chat_view_get_smiley_menu")
   (return-type "GtkWidget*")
   (parameters
@@ -595,7 +596,7 @@
   (return-type "EmpathyContact*")
 )
 
-(define-function empathy_chat_view_get_avatar_pixbuf_with_cache
+(define-function chat_view_get_avatar_pixbuf_with_cache
   (c-name "empathy_chat_view_get_avatar_pixbuf_with_cache")
   (return-type "GdkPixbuf*")
   (parameters
@@ -607,7 +608,7 @@
 
 ;; From empathy-log-window.h
 
-(define-function empathy_log_window_show
+(define-function log_window_show
   (c-name "empathy_log_window_show")
   (return-type "GtkWidget*")
   (parameters
@@ -622,7 +623,7 @@
 
 ;; From empathy-theme-boxes.h
 
-(define-function empathy_theme_boxes_get_type
+(define-function theme_boxes_get_type
   (c-name "empathy_theme_boxes_get_type")
   (return-type "GType")
 )
@@ -631,7 +632,7 @@
 
 ;; From empathy-account-widget.h
 
-(define-function empathy_account_widget_handle_params
+(define-function account_widget_handle_params
   (c-name "empathy_account_widget_handle_params")
   (return-type "none")
   (parameters
@@ -642,7 +643,7 @@
   (varargs #t)
 )
 
-(define-function empathy_account_widget_add_forget_button
+(define-function account_widget_add_forget_button
   (c-name "empathy_account_widget_add_forget_button")
   (return-type "none")
   (parameters
@@ -653,7 +654,7 @@
   )
 )
 
-(define-function empathy_account_widget_generic_new
+(define-function account_widget_generic_new
   (c-name "empathy_account_widget_generic_new")
   (is-constructor-of "EmpathyAccountWidgetGeneric")
   (return-type "GtkWidget*")
@@ -662,7 +663,7 @@
   )
 )
 
-(define-function empathy_account_widget_salut_new
+(define-function account_widget_salut_new
   (c-name "empathy_account_widget_salut_new")
   (is-constructor-of "EmpathyAccountWidgetSalut")
   (return-type "GtkWidget*")
@@ -671,7 +672,7 @@
   )
 )
 
-(define-function empathy_account_widget_msn_new
+(define-function account_widget_msn_new
   (c-name "empathy_account_widget_msn_new")
   (is-constructor-of "EmpathyAccountWidgetMsn")
   (return-type "GtkWidget*")
@@ -680,7 +681,7 @@
   )
 )
 
-(define-function empathy_account_widget_jabber_new
+(define-function account_widget_jabber_new
   (c-name "empathy_account_widget_jabber_new")
   (is-constructor-of "EmpathyAccountWidgetJabber")
   (return-type "GtkWidget*")
@@ -689,7 +690,7 @@
   )
 )
 
-(define-function empathy_account_widget_icq_new
+(define-function account_widget_icq_new
   (c-name "empathy_account_widget_icq_new")
   (is-constructor-of "EmpathyAccountWidgetIcq")
   (return-type "GtkWidget*")
@@ -698,7 +699,7 @@
   )
 )
 
-(define-function empathy_account_widget_aim_new
+(define-function account_widget_aim_new
   (c-name "empathy_account_widget_aim_new")
   (is-constructor-of "EmpathyAccountWidgetAim")
   (return-type "GtkWidget*")
@@ -707,7 +708,7 @@
   )
 )
 
-(define-function empathy_account_widget_yahoo_new
+(define-function account_widget_yahoo_new
   (c-name "empathy_account_widget_yahoo_new")
   (is-constructor-of "EmpathyAccountWidgetYahoo")
   (return-type "GtkWidget*")
@@ -716,7 +717,7 @@
   )
 )
 
-(define-function empathy_account_widget_groupwise_new
+(define-function account_widget_groupwise_new
   (c-name "empathy_account_widget_groupwise_new")
   (is-constructor-of "EmpathyAccountWidgetGroupwise")
   (return-type "GtkWidget*")
@@ -729,17 +730,17 @@
 
 ;; From empathy-conf.h
 
-(define-function empathy_conf_get_type
+(define-function conf_get_type
   (c-name "empathy_conf_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_conf_get
+(define-function conf_get
   (c-name "empathy_conf_get")
   (return-type "EmpathyConf*")
 )
 
-(define-function empathy_conf_shutdown
+(define-function conf_shutdown
   (c-name "empathy_conf_shutdown")
   (return-type "none")
 )
@@ -848,7 +849,7 @@
 
 ;; From empathy-theme.h
 
-(define-function empathy_theme_get_type
+(define-function theme_get_type
   (c-name "empathy_theme_get_type")
   (return-type "GType")
 )
@@ -944,7 +945,7 @@
 
 ;; From empathy-account-widget-irc.h
 
-(define-function empathy_account_widget_irc_new
+(define-function account_widget_irc_new
   (c-name "empathy_account_widget_irc_new")
   (is-constructor-of "EmpathyAccountWidgetIrc")
   (return-type "GtkWidget*")
@@ -957,7 +958,7 @@
 
 ;; From empathy-account-widget-sip.h
 
-(define-function empathy_account_widget_sip_new
+(define-function account_widget_sip_new
   (c-name "empathy_account_widget_sip_new")
   (is-constructor-of "EmpathyAccountWidgetSip")
   (return-type "GtkWidget*")
@@ -970,7 +971,7 @@
 
 ;; From empathy-contact-dialogs.h
 
-(define-function empathy_subscription_dialog_show
+(define-function subscription_dialog_show
   (c-name "empathy_subscription_dialog_show")
   (return-type "none")
   (parameters
@@ -990,7 +991,7 @@
   )
 )
 
-(define-function empathy_new_contact_dialog_show
+(define-function new_contact_dialog_show
   (c-name "empathy_new_contact_dialog_show")
   (return-type "none")
   (parameters
@@ -1002,7 +1003,7 @@
 
 ;; From empathy-new-message-dialog.h
 
-(define-function empathy_new_message_dialog_show
+(define-function new_message_dialog_show
   (c-name "empathy_new_message_dialog_show")
   (return-type "GtkWidget*")
   (parameters
@@ -1014,7 +1015,7 @@
 
 ;; From empathy-theme-irc.h
 
-(define-function empathy_theme_irc_get_type
+(define-function theme_irc_get_type
   (c-name "empathy_theme_irc_get_type")
   (return-type "GType")
 )
@@ -1023,12 +1024,12 @@
 
 ;; From empathy-avatar-chooser.h
 
-(define-function empathy_avatar_chooser_get_type
+(define-function avatar_chooser_get_type
   (c-name "empathy_avatar_chooser_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_avatar_chooser_new
+(define-function avatar_chooser_new
   (c-name "empathy_avatar_chooser_new")
   (is-constructor-of "EmpathyAvatarChooser")
   (return-type "GtkWidget*")
@@ -1058,7 +1059,7 @@
 
 ;; From empathy-contact-list-store.h
 
-(define-function empathy_contact_list_store_get_type
+(define-function contact_list_store_get_type
   (c-name "empathy_contact_list_store_get_type")
   (return-type "GType")
 )
@@ -1153,7 +1154,7 @@
   )
 )
 
-(define-function empathy_contact_list_store_row_separator_func
+(define-function contact_list_store_row_separator_func
   (c-name "empathy_contact_list_store_row_separator_func")
   (return-type "gboolean")
   (parameters
@@ -1163,7 +1164,7 @@
   )
 )
 
-(define-function empathy_contact_list_store_get_parent_group
+(define-function contact_list_store_get_parent_group
   (c-name "empathy_contact_list_store_get_parent_group")
   (return-type "gchar*")
   (parameters
@@ -1173,7 +1174,7 @@
   )
 )
 
-(define-function empathy_contact_list_store_search_equal_func
+(define-function contact_list_store_search_equal_func
   (c-name "empathy_contact_list_store_search_equal_func")
   (return-type "gboolean")
   (parameters
@@ -1189,18 +1190,18 @@
 
 ;; From empathy-presence-chooser.h
 
-(define-function empathy_presence_chooser_get_type
+(define-function presence_chooser_get_type
   (c-name "empathy_presence_chooser_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_presence_chooser_new
+(define-function presence_chooser_new
   (c-name "empathy_presence_chooser_new")
   (is-constructor-of "EmpathyPresenceChooser")
   (return-type "GtkWidget*")
 )
 
-(define-function empathy_presence_chooser_create_menu
+(define-function presence_chooser_create_menu
   (c-name "empathy_presence_chooser_create_menu")
   (return-type "GtkWidget*")
 )
@@ -1209,17 +1210,17 @@
 
 ;; From empathy-theme-manager.h
 
-(define-function empathy_theme_manager_get_type
+(define-function theme_manager_get_type
   (c-name "empathy_theme_manager_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_theme_manager_get
+(define-function theme_manager_get
   (c-name "empathy_theme_manager_get")
   (return-type "EmpathyThemeManager*")
 )
 
-(define-function empathy_theme_manager_get_themes
+(define-function theme_manager_get_themes
   (c-name "empathy_theme_manager_get_themes")
   (return-type "const-gchar**")
 )
@@ -1247,12 +1248,12 @@
 
 ;; From empathy-avatar-image.h
 
-(define-function empathy_avatar_image_get_type
+(define-function avatar_image_get_type
   (c-name "empathy_avatar_image_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_avatar_image_new
+(define-function avatar_image_new
   (c-name "empathy_avatar_image_new")
   (is-constructor-of "EmpathyAvatarImage")
   (return-type "GtkWidget*")
@@ -1271,12 +1272,12 @@
 
 ;; From empathy-contact-list-view.h
 
-(define-function empathy_contact_list_view_get_type
+(define-function contact_list_view_get_type
   (c-name "empathy_contact_list_view_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_contact_list_view_new
+(define-function contact_list_view_new
   (c-name "empathy_contact_list_view_new")
   (is-constructor-of "EmpathyContactListView")
   (return-type "EmpathyContactListView*")
@@ -1315,7 +1316,7 @@
 
 ;; From empathy-ui-utils.h
 
-(define-function empathy_glade_get_file_simple
+(define-function glade_get_file_simple
   (c-name "empathy_glade_get_file_simple")
   (return-type "none")
   (parameters
@@ -1327,7 +1328,7 @@
   (varargs #t)
 )
 
-(define-function empathy_glade_get_file
+(define-function glade_get_file
   (c-name "empathy_glade_get_file")
   (return-type "GladeXML*")
   (parameters
@@ -1339,7 +1340,7 @@
   (varargs #t)
 )
 
-(define-function empathy_glade_connect
+(define-function glade_connect
   (c-name "empathy_glade_connect")
   (return-type "none")
   (parameters
@@ -1350,7 +1351,7 @@
   (varargs #t)
 )
 
-(define-function empathy_glade_setup_size_group
+(define-function glade_setup_size_group
   (c-name "empathy_glade_setup_size_group")
   (return-type "none")
   (parameters
@@ -1361,7 +1362,7 @@
   (varargs #t)
 )
 
-(define-function empathy_icon_name_from_account
+(define-function icon_name_from_account
   (c-name "empathy_icon_name_from_account")
   (return-type "const-gchar*")
   (parameters
@@ -1369,7 +1370,7 @@
   )
 )
 
-(define-function empathy_icon_name_for_presence
+(define-function icon_name_for_presence
   (c-name "empathy_icon_name_for_presence")
   (return-type "const-gchar*")
   (parameters
@@ -1377,7 +1378,7 @@
   )
 )
 
-(define-function empathy_icon_name_for_contact
+(define-function icon_name_for_contact
   (c-name "empathy_icon_name_for_contact")
   (return-type "const-gchar*")
   (parameters
@@ -1385,7 +1386,7 @@
   )
 )
 
-(define-function empathy_pixbuf_from_data
+(define-function pixbuf_from_data
   (c-name "empathy_pixbuf_from_data")
   (return-type "GdkPixbuf*")
   (parameters
@@ -1394,7 +1395,7 @@
   )
 )
 
-(define-function empathy_pixbuf_from_avatar_scaled
+(define-function pixbuf_from_avatar_scaled
   (c-name "empathy_pixbuf_from_avatar_scaled")
   (return-type "GdkPixbuf*")
   (parameters
@@ -1404,7 +1405,7 @@
   )
 )
 
-(define-function empathy_pixbuf_avatar_from_contact_scaled
+(define-function pixbuf_avatar_from_contact_scaled
   (c-name "empathy_pixbuf_avatar_from_contact_scaled")
   (return-type "GdkPixbuf*")
   (parameters
@@ -1414,7 +1415,7 @@
   )
 )
 
-(define-function empathy_pixbuf_scale_down_if_necessary
+(define-function pixbuf_scale_down_if_necessary
   (c-name "empathy_pixbuf_scale_down_if_necessary")
   (return-type "GdkPixbuf*")
   (parameters
@@ -1423,7 +1424,7 @@
   )
 )
 
-(define-function empathy_pixbuf_from_icon_name
+(define-function pixbuf_from_icon_name
   (c-name "empathy_pixbuf_from_icon_name")
   (return-type "GdkPixbuf*")
   (parameters
@@ -1432,7 +1433,7 @@
   )
 )
 
-(define-function empathy_text_iter_forward_search
+(define-function text_iter_forward_search
   (c-name "empathy_text_iter_forward_search")
   (return-type "gboolean")
   (parameters
@@ -1444,7 +1445,7 @@
   )
 )
 
-(define-function empathy_text_iter_backward_search
+(define-function text_iter_backward_search
   (c-name "empathy_text_iter_backward_search")
   (return-type "gboolean")
   (parameters
@@ -1456,7 +1457,7 @@
   )
 )
 
-(define-function empathy_window_get_is_visible
+(define-function window_get_is_visible
   (c-name "empathy_window_get_is_visible")
   (return-type "gboolean")
   (parameters
@@ -1464,7 +1465,7 @@
   )
 )
 
-(define-function empathy_window_present
+(define-function window_present
   (c-name "empathy_window_present")
   (return-type "none")
   (parameters
@@ -1473,7 +1474,7 @@
   )
 )
 
-(define-function empathy_window_iconify
+(define-function window_iconify
   (c-name "empathy_window_iconify")
   (return-type "none")
   (parameters
@@ -1482,7 +1483,7 @@
   )
 )
 
-(define-function empathy_get_toplevel_window
+(define-function get_toplevel_window
   (c-name "empathy_get_toplevel_window")
   (return-type "GtkWindow*")
   (parameters
@@ -1490,7 +1491,7 @@
   )
 )
 
-(define-function empathy_url_show
+(define-function url_show
   (c-name "empathy_url_show")
   (return-type "none")
   (parameters
@@ -1498,7 +1499,7 @@
   )
 )
 
-(define-function empathy_toggle_button_set_state_quietly
+(define-function toggle_button_set_state_quietly
   (c-name "empathy_toggle_button_set_state_quietly")
   (return-type "none")
   (parameters
@@ -1509,7 +1510,7 @@
   )
 )
 
-(define-function empathy_link_button_new
+(define-function link_button_new
   (c-name "empathy_link_button_new")
   (is-constructor-of "EmpathyLinkButton")
   (return-type "GtkWidget*")
@@ -1519,7 +1520,7 @@
   )
 )
 
-(define-function empathy_text_buffer_tag_set
+(define-function text_buffer_tag_set
   (c-name "empathy_text_buffer_tag_set")
   (return-type "GtkTextTag*")
   (parameters
@@ -1534,12 +1535,12 @@
 
 ;; From empathy-cell-renderer-activatable.h
 
-(define-function empathy_cell_renderer_activatable_get_type
+(define-function cell_renderer_activatable_get_type
   (c-name "empathy_cell_renderer_activatable_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_cell_renderer_activatable_new
+(define-function cell_renderer_activatable_new
   (c-name "empathy_cell_renderer_activatable_new")
   (is-constructor-of "EmpathyCellRendererActivatable")
   (return-type "GtkCellRenderer*")
@@ -1558,7 +1559,7 @@
   )
 )
 
-(define-function empathy_contact_widget_get_contact
+(define-function contact_widget_get_contact
   (c-name "empathy_contact_widget_get_contact")
   (return-type "EmpathyContact*")
   (parameters
@@ -1566,7 +1567,7 @@
   )
 )
 
-(define-function empathy_contact_widget_set_contact
+(define-function contact_widget_set_contact
   (c-name "empathy_contact_widget_set_contact")
   (return-type "none")
   (parameters
@@ -1575,7 +1576,7 @@
   )
 )
 
-(define-function empathy_contact_widget_set_account_filter
+(define-function contact_widget_set_account_filter
   (c-name "empathy_contact_widget_set_account_filter")
   (return-type "none")
   (parameters
@@ -1589,13 +1590,13 @@
 
 ;; From empathy-profile-chooser.h
 
-(define-function empathy_profile_chooser_new
+(define-function profile_chooser_new
   (c-name "empathy_profile_chooser_new")
   (is-constructor-of "EmpathyProfileChooser")
   (return-type "GtkWidget*")
 )
 
-(define-function empathy_profile_chooser_get_selected
+(define-function profile_chooser_get_selected
   (c-name "empathy_profile_chooser_get_selected")
   (return-type "McProfile*")
   (parameters
@@ -1603,7 +1604,7 @@
   )
 )
 
-(define-function empathy_profile_chooser_n_profiles
+(define-function profile_chooser_n_profiles
   (c-name "empathy_profile_chooser_n_profiles")
   (return-type "gint")
   (parameters
@@ -1615,12 +1616,12 @@
 
 ;; From empathy-cell-renderer-expander.h
 
-(define-function empathy_cell_renderer_expander_get_type
+(define-function cell_renderer_expander_get_type
   (c-name "empathy_cell_renderer_expander_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_cell_renderer_expander_new
+(define-function cell_renderer_expander_new
   (c-name "empathy_cell_renderer_expander_new")
   (is-constructor-of "EmpathyCellRendererExpander")
   (return-type "GtkCellRenderer*")
@@ -1630,7 +1631,7 @@
 
 ;; From empathy-geometry.h
 
-(define-function empathy_geometry_save
+(define-function geometry_save
   (c-name "empathy_geometry_save")
   (return-type "none")
   (parameters
@@ -1642,7 +1643,7 @@
   )
 )
 
-(define-function empathy_geometry_load
+(define-function geometry_load
   (c-name "empathy_geometry_load")
   (return-type "none")
   (parameters
@@ -1658,12 +1659,12 @@
 
 ;; From empathy-smiley-manager.h
 
-(define-function empathy_smiley_manager_get_type
+(define-function smiley_manager_get_type
   (c-name "empathy_smiley_manager_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_smiley_manager_new
+(define-function smiley_manager_new
   (c-name "empathy_smiley_manager_new")
   (is-constructor-of "EmpathySmileyManager")
   (return-type "EmpathySmileyManager*")
@@ -1722,12 +1723,12 @@
 
 ;; From empathy-cell-renderer-text.h
 
-(define-function empathy_cell_renderer_text_get_type
+(define-function cell_renderer_text_get_type
   (c-name "empathy_cell_renderer_text_get_type")
   (return-type "GType")
 )
 
-(define-function empathy_cell_renderer_text_new
+(define-function cell_renderer_text_new
   (c-name "empathy_cell_renderer_text_new")
   (is-constructor-of "EmpathyCellRendererText")
   (return-type "GtkCellRenderer*")
@@ -1737,12 +1738,12 @@
 
 ;; From empathy-spell.h
 
-(define-function empathy_spell_supported
+(define-function spell_supported
   (c-name "empathy_spell_supported")
   (return-type "gboolean")
 )
 
-(define-function empathy_spell_get_language_name
+(define-function spell_get_language_name
   (c-name "empathy_spell_get_language_name")
   (return-type "const-gchar*")
   (parameters
@@ -1750,12 +1751,12 @@
   )
 )
 
-(define-function empathy_spell_get_language_codes
+(define-function spell_get_language_codes
   (c-name "empathy_spell_get_language_codes")
   (return-type "GList*")
 )
 
-(define-function empathy_spell_free_language_codes
+(define-function spell_free_language_codes
   (c-name "empathy_spell_free_language_codes")
   (return-type "none")
   (parameters
@@ -1763,7 +1764,7 @@
   )
 )
 
-(define-function empathy_spell_check
+(define-function spell_check
   (c-name "empathy_spell_check")
   (return-type "gboolean")
   (parameters
@@ -1771,7 +1772,7 @@
   )
 )
 
-(define-function empathy_spell_get_suggestions
+(define-function spell_get_suggestions
   (c-name "empathy_spell_get_suggestions")
   (return-type "GList*")
   (parameters
@@ -1779,7 +1780,7 @@
   )
 )
 
-(define-function empathy_spell_free_suggestions
+(define-function spell_free_suggestions
   (c-name "empathy_spell_free_suggestions")
   (return-type "none")
   (parameters
diff --git a/python/update-binding.sh b/python/update-binding.sh
index fbc5b4c79..e358a32c5 100755
--- a/python/update-binding.sh
+++ b/python/update-binding.sh
@@ -4,6 +4,7 @@
 # Update the list of headers from Makefile.am
 cd ../libempathy
 python /usr/share/pygtk/2.0/codegen/h2def.py	\
+        -m empathy				\
 	empathy-time.h				\
 	empathy-status-presets.h		\
 	empathy-debug.h				\
@@ -35,6 +36,7 @@ python /usr/share/pygtk/2.0/codegen/h2def.py	\
 # Update the list of headers from Makefile.am
 cd ../libempathy-gtk
 python /usr/share/pygtk/2.0/codegen/h2def.py	\
+	-m empathy				\
 	empathy-images.h			\
 	empathy-account-chooser.h		\
 	empathy-chat.h				\