aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/pyempathy/pyempathy.defs742
-rw-r--r--python/pyempathy/pyempathy.override4
-rw-r--r--python/pyempathygtk/pyempathygtk.defs283
-rw-r--r--python/pyempathygtk/pyempathygtk.override9
-rwxr-xr-xpython/update-binding.sh12
5 files changed, 913 insertions, 137 deletions
diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 488f5b3ac..3a8b3a9f6 100644
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -1,5 +1,12 @@
;; -*- scheme -*-
; object definitions ...
+(define-object Account
+ (in-module "Empathy")
+ (parent "GObject")
+ (c-name "EmpathyAccount")
+ (gtype-id "EMPATHY_TYPE_ACCOUNT")
+)
+
(define-object AccountManager
(in-module "Empathy")
(parent "GObject")
@@ -7,6 +14,13 @@
(gtype-id "EMPATHY_TYPE_ACCOUNT_MANAGER")
)
+(define-object AccountSettings
+ (in-module "Empathy")
+ (parent "GObject")
+ (c-name "EmpathyAccountSettings")
+ (gtype-id "EMPATHY_TYPE_ACCOUNT_SETTINGS")
+)
+
(define-object CallFactory
(in-module "Empathy")
(parent "GObject")
@@ -35,6 +49,20 @@
(gtype-id "EMPATHY_TYPE_CHATROOM_MANAGER")
)
+(define-object ConnectionManagers
+ (in-module "Empathy")
+ (parent "GObject")
+ (c-name "EmpathyConnectionManagers")
+ (gtype-id "EMPATHY_TYPE_CONNECTION_MANAGERS")
+)
+
+(define-object Connectivity
+ (in-module "Empathy")
+ (parent "GObject")
+ (c-name "EmpathyConnectivity")
+ (gtype-id "EMPATHY_TYPE_CONNECTIVITY")
+)
+
(define-object Contact
(in-module "Empathy")
(parent "GObject")
@@ -63,6 +91,13 @@
(gtype-id "EMPATHY_TYPE_CONTACT_MONITOR")
)
+(define-object Debugger
+ (in-module "Empathy")
+ (parent "GObject")
+ (c-name "EmpathyDebugger")
+ (gtype-id "EMPATHY_TYPE_DEBUGGER")
+)
+
(define-object DispatchOperation
(in-module "Empathy")
(parent "GObject")
@@ -234,6 +269,7 @@
'("other" "EMPATHY_DEBUG_OTHER")
'("share-desktop" "EMPATHY_DEBUG_SHARE_DESKTOP")
'("connectivity" "EMPATHY_DEBUG_CONNECTIVITY")
+ '("import-mc4-accounts" "EMPATHY_DEBUG_IMPORT_MC4_ACCOUNTS")
)
)
@@ -279,6 +315,475 @@
)
+;; From empathy-account-settings.h
+
+(define-function account_settings_get_type
+ (c-name "empathy_account_settings_get_type")
+ (return-type "GType")
+)
+
+(define-function account_settings_new
+ (c-name "empathy_account_settings_new")
+ (is-constructor-of "EmpathyAccountSettings")
+ (return-type "EmpathyAccountSettings*")
+ (parameters
+ '("const-gchar*" "connection_manager")
+ '("const-gchar*" "protocol")
+ '("const-char*" "display_name")
+ )
+)
+
+(define-method settings_new_for_account
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_settings_new_for_account")
+ (return-type "EmpathyAccountSettings*")
+)
+
+(define-method is_ready
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_is_ready")
+ (return-type "gboolean")
+)
+
+(define-method get_cm
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_cm")
+ (return-type "const-gchar*")
+)
+
+(define-method get_protocol
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_protocol")
+ (return-type "const-gchar*")
+)
+
+(define-method get_account
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_account")
+ (return-type "EmpathyAccount*")
+)
+
+(define-method has_account
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_has_account")
+ (return-type "gboolean")
+ (parameters
+ '("EmpathyAccount*" "account")
+ )
+)
+
+(define-method get_tp_params
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_tp_params")
+ (return-type "TpConnectionManagerParam*")
+)
+
+(define-method unset
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_unset")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "param")
+ )
+)
+
+(define-method discard_changes
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_discard_changes")
+ (return-type "none")
+)
+
+(define-method get
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get")
+ (return-type "const-GValue*")
+ (parameters
+ '("const-gchar*" "param")
+ )
+)
+
+(define-method get_dbus_signature
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_dbus_signature")
+ (return-type "const-gchar*")
+ (parameters
+ '("const-gchar*" "param")
+ )
+)
+
+(define-method get_default
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_default")
+ (return-type "const-GValue*")
+ (parameters
+ '("const-gchar*" "param")
+ )
+)
+
+(define-method get_string
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_string")
+ (return-type "const-gchar*")
+ (parameters
+ '("const-gchar*" "param")
+ )
+)
+
+(define-method get_int32
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_int32")
+ (return-type "gint32")
+ (parameters
+ '("const-gchar*" "param")
+ )
+)
+
+(define-method get_int64
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_int64")
+ (return-type "gint64")
+ (parameters
+ '("const-gchar*" "param")
+ )
+)
+
+(define-method get_uint32
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_uint32")
+ (return-type "guint32")
+ (parameters
+ '("const-gchar*" "param")
+ )
+)
+
+(define-method get_uint64
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_uint64")
+ (return-type "guint64")
+ (parameters
+ '("const-gchar*" "param")
+ )
+)
+
+(define-method get_boolean
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_boolean")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*" "param")
+ )
+)
+
+(define-method set_string
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_set_string")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "param")
+ '("const-gchar*" "value")
+ )
+)
+
+(define-method set_int32
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_set_int32")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "param")
+ '("gint32" "value")
+ )
+)
+
+(define-method set_int64
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_set_int64")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "param")
+ '("gint64" "value")
+ )
+)
+
+(define-method set_uint32
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_set_uint32")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "param")
+ '("guint32" "value")
+ )
+)
+
+(define-method set_uint64
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_set_uint64")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "param")
+ '("guint64" "value")
+ )
+)
+
+(define-method set_boolean
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_set_boolean")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "param")
+ '("gboolean" "value")
+ )
+)
+
+(define-method get_icon_name
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_icon_name")
+ (return-type "gchar*")
+)
+
+(define-method get_display_name
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_get_display_name")
+ (return-type "const-gchar*")
+)
+
+(define-method set_display_name_async
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_set_display_name_async")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "name")
+ '("GAsyncReadyCallback" "callback")
+ '("gpointer" "user_data")
+ )
+)
+
+(define-method set_display_name_finish
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_set_display_name_finish")
+ (return-type "gboolean")
+ (parameters
+ '("GAsyncResult*" "result")
+ '("GError**" "error")
+ )
+)
+
+(define-method apply_async
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_apply_async")
+ (return-type "none")
+ (parameters
+ '("GAsyncReadyCallback" "callback")
+ '("gpointer" "user_data")
+ )
+)
+
+(define-method apply_finish
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_apply_finish")
+ (return-type "gboolean")
+ (parameters
+ '("GAsyncResult*" "result")
+ '("GError**" "error")
+ )
+)
+
+(define-method is_valid
+ (of-object "EmpathyAccountSettings")
+ (c-name "empathy_account_settings_is_valid")
+ (return-type "gboolean")
+)
+
+
+
+;; From empathy-account.h
+
+(define-function account_get_type
+ (c-name "empathy_account_get_type")
+ (return-type "GType")
+)
+
+(define-method is_just_connected
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_is_just_connected")
+ (return-type "gboolean")
+)
+
+(define-method get_connection
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_get_connection")
+ (return-type "TpConnection*")
+)
+
+(define-method get_connection_for_path
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_get_connection_for_path")
+ (return-type "TpConnection*")
+ (parameters
+ '("const-gchar*" "path")
+ )
+)
+
+(define-method get_unique_name
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_get_unique_name")
+ (return-type "const-gchar*")
+)
+
+(define-method get_display_name
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_get_display_name")
+ (return-type "const-gchar*")
+)
+
+(define-method get_connection_manager
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_get_connection_manager")
+ (return-type "const-gchar*")
+)
+
+(define-method get_protocol
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_get_protocol")
+ (return-type "const-gchar*")
+)
+
+(define-method get_icon_name
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_get_icon_name")
+ (return-type "const-gchar*")
+)
+
+(define-method set_enabled_async
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_set_enabled_async")
+ (return-type "none")
+ (parameters
+ '("gboolean" "enabled")
+ '("GAsyncReadyCallback" "callback")
+ '("gpointer" "user_data")
+ )
+)
+
+(define-method set_enabled_finish
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_set_enabled_finish")
+ (return-type "gboolean")
+ (parameters
+ '("GAsyncResult*" "result")
+ '("GError**" "error")
+ )
+)
+
+(define-method is_enabled
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_is_enabled")
+ (return-type "gboolean")
+)
+
+(define-method is_valid
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_is_valid")
+ (return-type "gboolean")
+)
+
+(define-method is_ready
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_is_ready")
+ (return-type "gboolean")
+)
+
+(define-method update_settings_async
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_update_settings_async")
+ (return-type "none")
+ (parameters
+ '("GHashTable*" "parameters")
+ '("const-gchar**" "unset_parameters")
+ '("GAsyncReadyCallback" "callback")
+ '("gpointer" "user_data")
+ )
+)
+
+(define-method update_settings_finish
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_update_settings_finish")
+ (return-type "gboolean")
+ (parameters
+ '("GAsyncResult*" "result")
+ '("GError**" "error")
+ )
+)
+
+(define-method remove_async
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_remove_async")
+ (return-type "none")
+ (parameters
+ '("GAsyncReadyCallback" "callback")
+ '("gpointer" "user_data")
+ )
+)
+
+(define-method remove_finish
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_remove_finish")
+ (return-type "gboolean")
+ (parameters
+ '("GAsyncResult*" "result")
+ '("GError**" "error")
+ )
+)
+
+(define-method set_display_name_async
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_set_display_name_async")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "display_name")
+ '("GAsyncReadyCallback" "callback")
+ '("gpointer" "user_data")
+ )
+)
+
+(define-method set_display_name_finish
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_set_display_name_finish")
+ (return-type "gboolean")
+ (parameters
+ '("GAsyncResult*" "result")
+ '("GError**" "error")
+ )
+)
+
+(define-function account_new
+ (c-name "empathy_account_new")
+ (is-constructor-of "EmpathyAccount")
+ (return-type "EmpathyAccount*")
+ (parameters
+ '("TpDBusDaemon*" "bus_daemon")
+ '("const-gchar*" "unique_name")
+ )
+)
+
+(define-method request_presence
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_request_presence")
+ (return-type "none")
+ (parameters
+ '("TpConnectionPresenceType" "type")
+ '("const-gchar*" "status")
+ '("const-gchar*" "message")
+ )
+)
+
+(define-method get_parameters
+ (of-object "EmpathyAccount")
+ (c-name "empathy_account_get_parameters")
+ (return-type "const-GHashTable*")
+)
+
+
+
;; From empathy-account-manager.h
(define-function account_manager_get_type
@@ -291,13 +796,10 @@
(return-type "EmpathyAccountManager*")
)
-(define-method create
+(define-method is_ready
(of-object "EmpathyAccountManager")
- (c-name "empathy_account_manager_create")
- (return-type "EmpathyAccount*")
- (parameters
- '("McProfile*" "profile")
- )
+ (c-name "empathy_account_manager_is_ready")
+ (return-type "gboolean")
)
(define-method get_connected_accounts
@@ -318,18 +820,27 @@
(return-type "int")
)
-(define-method get_account
+(define-method get_account_for_connection
(of-object "EmpathyAccountManager")
- (c-name "empathy_account_manager_get_account")
+ (c-name "empathy_account_manager_get_account_for_connection")
(return-type "EmpathyAccount*")
(parameters
'("TpConnection*" "connection")
)
)
-(define-method lookup
+(define-method ensure_account
(of-object "EmpathyAccountManager")
- (c-name "empathy_account_manager_lookup")
+ (c-name "empathy_account_manager_ensure_account")
+ (return-type "EmpathyAccount*")
+ (parameters
+ '("const-gchar*" "unique_name")
+ )
+)
+
+(define-method get_account
+ (of-object "EmpathyAccountManager")
+ (c-name "empathy_account_manager_get_account")
(return-type "EmpathyAccount*")
(parameters
'("const-gchar*" "unique_name")
@@ -357,6 +868,62 @@
)
)
+(define-method request_global_presence
+ (of-object "EmpathyAccountManager")
+ (c-name "empathy_account_manager_request_global_presence")
+ (return-type "none")
+ (parameters
+ '("TpConnectionPresenceType" "type")
+ '("const-gchar*" "status")
+ '("const-gchar*" "message")
+ )
+)
+
+(define-method get_requested_global_presence
+ (of-object "EmpathyAccountManager")
+ (c-name "empathy_account_manager_get_requested_global_presence")
+ (return-type "TpConnectionPresenceType")
+ (parameters
+ '("gchar**" "status")
+ '("gchar**" "message")
+ )
+)
+
+(define-method get_global_presence
+ (of-object "EmpathyAccountManager")
+ (c-name "empathy_account_manager_get_global_presence")
+ (return-type "TpConnectionPresenceType")
+ (parameters
+ '("gchar**" "status")
+ '("gchar**" "message")
+ )
+)
+
+(define-method create_account_async
+ (of-object "EmpathyAccountManager")
+ (c-name "empathy_account_manager_create_account_async")
+ (return-type "none")
+ (parameters
+ '("const-gchar*" "connection_manager")
+ '("const-gchar*" "protocol")
+ '("const-gchar*" "display_name")
+ '("GHashTable*" "parameters")
+ '("GHashTable*" "properties")
+ '("GAsyncReadyCallback" "callback")
+ '("gpointer" "user_data")
+ )
+)
+
+(define-method create_account_finish
+ (of-object "EmpathyAccountManager")
+ (c-name "empathy_account_manager_create_account_finish")
+ (return-type "EmpathyAccount*")
+ (parameters
+ '("GAsyncResult*" "result")
+ '("GError**" "error")
+ )
+)
+
;; From empathy-chatroom.h
@@ -730,6 +1297,41 @@
+;; From empathy-connectivity.h
+
+(define-function connectivity_get_type
+ (c-name "empathy_connectivity_get_type")
+ (return-type "GType")
+)
+
+(define-function connectivity_dup_singleton
+ (c-name "empathy_connectivity_dup_singleton")
+ (return-type "EmpathyConnectivity*")
+)
+
+(define-method is_online
+ (of-object "EmpathyConnectivity")
+ (c-name "empathy_connectivity_is_online")
+ (return-type "gboolean")
+)
+
+(define-method get_use_conn
+ (of-object "EmpathyConnectivity")
+ (c-name "empathy_connectivity_get_use_conn")
+ (return-type "gboolean")
+)
+
+(define-method set_use_conn
+ (of-object "EmpathyConnectivity")
+ (c-name "empathy_connectivity_set_use_conn")
+ (return-type "none")
+ (parameters
+ '("gboolean" "use_conn")
+ )
+)
+
+
+
;; From empathy-contact.h
(define-function contact_get_type
@@ -1228,6 +1830,53 @@
+;; From empathy-connection-managers.h
+
+(define-function connection_managers_get_type
+ (c-name "empathy_connection_managers_get_type")
+ (return-type "GType")
+)
+
+(define-function connection_managers_dup_singleton
+ (c-name "empathy_connection_managers_dup_singleton")
+ (return-type "EmpathyConnectionManagers*")
+)
+
+(define-method is_ready
+ (of-object "EmpathyConnectionManagers")
+ (c-name "empathy_connection_managers_is_ready")
+ (return-type "gboolean")
+)
+
+(define-method update
+ (of-object "EmpathyConnectionManagers")
+ (c-name "empathy_connection_managers_update")
+ (return-type "none")
+)
+
+(define-method get_cms
+ (of-object "EmpathyConnectionManagers")
+ (c-name "empathy_connection_managers_get_cms")
+ (return-type "GList*")
+)
+
+(define-method get_cms_num
+ (of-object "EmpathyConnectionManagers")
+ (c-name "empathy_connection_managers_get_cms_num")
+ (return-type "guint")
+)
+
+(define-method get_cm
+ (of-object "EmpathyConnectionManagers")
+ (c-name "empathy_connection_managers_get_cm")
+ (return-type "TpConnectionManager*")
+ (parameters
+ '("const-gchar*" "cm")
+ )
+)
+
+
+
;; From empathy-debug.h
(define-function debug_flag_is_set
@@ -1263,6 +1912,32 @@
+;; From empathy-debugger.h
+
+(define-function debugger_get_type
+ (c-name "empathy_debugger_get_type")
+ (return-type "GType")
+)
+
+(define-function debugger_get_singleton
+ (c-name "empathy_debugger_get_singleton")
+ (return-type "EmpathyDebugger*")
+)
+
+(define-method add_message
+ (of-object "EmpathyDebugger")
+ (c-name "empathy_debugger_add_message")
+ (return-type "none")
+ (parameters
+ '("GTimeVal*" "timestamp")
+ '("const-gchar*" "domain")
+ '("GLogLevelFlags" "level")
+ '("const-gchar*" "string")
+ )
+)
+
+
+
;; From empathy-dispatcher.h
(define-function dispatcher_get_type
@@ -1824,6 +2499,10 @@
+;; From empathy-location.h
+
+
+
;; From empathy-log-manager.h
(define-function log_manager_get_type
@@ -2893,28 +3572,6 @@
)
)
-(define-function account_hash
- (c-name "empathy_account_hash")
- (return-type "guint")
- (parameters
- '("gconstpointer" "key")
- )
-)
-
-(define-function account_equal
- (c-name "empathy_account_equal")
- (return-type "gboolean")
- (parameters
- '("gconstpointer" "a")
- '("gconstpointer" "b")
- )
-)
-
-(define-function mission_control_dup_singleton
- (c-name "empathy_mission_control_dup_singleton")
- (return-type "MissionControl*")
-)
-
(define-function presence_get_default_message
(c-name "empathy_presence_get_default_message")
(return-type "const-gchar*")
@@ -2979,4 +3636,25 @@
)
)
+(define-function protocol_icon_name
+ (c-name "empathy_protocol_icon_name")
+ (return-type "gchar*")
+ (parameters
+ '("const-gchar*" "protocol")
+ )
+)
+
+(define-function protocol_name_to_display_name
+ (c-name "empathy_protocol_name_to_display_name")
+ (return-type "const-gchar*")
+ (parameters
+ '("const-gchar*" "proto_name")
+ )
+)
+
+(define-function type_dbus_ao
+ (c-name "empathy_type_dbus_ao")
+ (return-type "GType")
+)
+
diff --git a/python/pyempathy/pyempathy.override b/python/pyempathy/pyempathy.override
index 6f46405a3..a96c7c6f3 100644
--- a/python/pyempathy/pyempathy.override
+++ b/python/pyempathy/pyempathy.override
@@ -3,15 +3,19 @@ headers
#include <Python.h>
#include <pygobject.h>
#include "empathy-account-manager.h"
+#include "empathy-account-settings.h"
#include "empathy-call-factory.h"
#include "empathy-chatroom.h"
#include "empathy-chatroom-manager.h"
+#include "empathy-connection-managers.h"
+#include "empathy-connectivity.h"
#include "empathy-contact.h"
#include "empathy-contact-groups.h"
#include "empathy-contact-list.h"
#include "empathy-contact-manager.h"
#include "empathy-contact-monitor.h"
#include "empathy-debug.h"
+#include "empathy-debugger.h"
#include "empathy-dispatcher.h"
#include "empathy-enum-types.h"
#include "empathy-ft-factory.h"
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index d4601b211..d931fcc4d 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -7,6 +7,13 @@
(gtype-id "EMPATHY_TYPE_ACCOUNT_CHOOSER")
)
+(define-object AccountWidget
+ (in-module "Empathy")
+ (parent "GObject")
+ (c-name "EmpathyAccountWidget")
+ (gtype-id "EMPATHY_TYPE_ACCOUNT_WIDGET")
+)
+
(define-object AvatarChooser
(in-module "Empathy")
(parent "GtkButton")
@@ -111,6 +118,13 @@
(gtype-id "EMPATHY_TYPE_GST_VIDEO_SRC")
)
+(define-object KludgeLabel
+ (in-module "Empathy")
+ (parent "GtkLabel")
+ (c-name "EmpathyKludgeLabel")
+ (gtype-id "EMPATHY_TYPE_KLUDGE_LABEL")
+)
+
(define-object PresenceChooser
(in-module "Empathy")
(parent "GtkComboBoxEntry")
@@ -118,11 +132,11 @@
(gtype-id "EMPATHY_TYPE_PRESENCE_CHOOSER")
)
-(define-object ProfileChooser
+(define-object ProtocolChooser
(in-module "Empathy")
(parent "GtkComboBox")
- (c-name "EmpathyProfileChooser")
- (gtype-id "EMPATHY_TYPE_PROFILE_CHOOSER")
+ (c-name "EmpathyProtocolChooser")
+ (gtype-id "EMPATHY_TYPE_PROTOCOL_CHOOSER")
)
(define-object SmileyManager
@@ -132,6 +146,13 @@
(gtype-id "EMPATHY_TYPE_SMILEY_MANAGER")
)
+(define-object StatusPresetDialog
+ (in-module "Empathy")
+ (parent "GtkDialog")
+ (c-name "EmpathyStatusPresetDialog")
+ (gtype-id "EMPATHY_TYPE_STATUS_PRESET_DIALOG")
+)
+
(define-object ThemeBoxes
(in-module "Empathy")
(parent "EmpathyChatTextView")
@@ -255,6 +276,25 @@
)
)
+(define-enum Sound
+ (in-module "Empathy")
+ (c-name "EmpathySound")
+ (gtype-id "EMPATHY_TYPE_SOUND")
+ (values
+ '("empathy-sound-message-incoming" "EMPATHY_SOUND_MESSAGE_INCOMING")
+ '("empathy-sound-message-outgoing" "EMPATHY_SOUND_MESSAGE_OUTGOING")
+ '("empathy-sound-conversation-new" "EMPATHY_SOUND_CONVERSATION_NEW")
+ '("empathy-sound-contact-connected" "EMPATHY_SOUND_CONTACT_CONNECTED")
+ '("empathy-sound-contact-disconnected" "EMPATHY_SOUND_CONTACT_DISCONNECTED")
+ '("empathy-sound-account-connected" "EMPATHY_SOUND_ACCOUNT_CONNECTED")
+ '("empathy-sound-account-disconnected" "EMPATHY_SOUND_ACCOUNT_DISCONNECTED")
+ '("empathy-sound-phone-incoming" "EMPATHY_SOUND_PHONE_INCOMING")
+ '("empathy-sound-phone-outgoing" "EMPATHY_SOUND_PHONE_OUTGOING")
+ '("empathy-sound-phone-hangup" "EMPATHY_SOUND_PHONE_HANGUP")
+ '("last-empathy-sound" "LAST_EMPATHY_SOUND")
+ )
+)
+
;; From empathy-account-chooser.h
@@ -328,103 +368,53 @@
;; From empathy-account-widget.h
-(define-method widget_handle_params
- (of-object "EmpathyAccount")
- (c-name "empathy_account_widget_handle_params")
- (return-type "none")
- (parameters
- '("GtkBuilder*" "gui")
- '("const-gchar*" "first_widget")
- )
- (varargs #t)
+(define-function account_widget_get_type
+ (c-name "empathy_account_widget_get_type")
+ (return-type "GType")
)
-(define-method widget_add_forget_button
- (of-object "EmpathyAccount")
- (c-name "empathy_account_widget_add_forget_button")
- (return-type "none")
- (parameters
- '("GtkBuilder*" "gui")
- '("const-gchar*" "button")
- '("const-gchar*" "entry")
- )
+(define-method get_widget
+ (of-object "EmpathyAccountWidget")
+ (c-name "empathy_account_widget_get_widget")
+ (return-type "GtkWidget*")
)
-(define-function account_widget_set_default_focus
- (c-name "empathy_account_widget_set_default_focus")
- (return-type "none")
+(define-function account_widget_new_for_protocol
+ (c-name "empathy_account_widget_new_for_protocol")
+ (return-type "EmpathyAccountWidget*")
(parameters
- '("GtkBuilder*" "gui")
- '("const-gchar*" "entry")
+ '("const-char*" "protocol")
+ '("EmpathyAccountSettings*" "settings")
+ '("gboolean" "simple")
)
)
-(define-method widget_generic_new
- (of-object "EmpathyAccount")
- (c-name "empathy_account_widget_generic_new")
- (return-type "GtkWidget*")
-)
-
-(define-method widget_salut_new
- (of-object "EmpathyAccount")
- (c-name "empathy_account_widget_salut_new")
- (return-type "GtkWidget*")
-)
-
-(define-method widget_msn_new
- (of-object "EmpathyAccount")
- (c-name "empathy_account_widget_msn_new")
- (return-type "GtkWidget*")
-)
-
-(define-method widget_jabber_new
- (of-object "EmpathyAccount")
- (c-name "empathy_account_widget_jabber_new")
- (return-type "GtkWidget*")
-)
-
-(define-method widget_icq_new
- (of-object "EmpathyAccount")
- (c-name "empathy_account_widget_icq_new")
- (return-type "GtkWidget*")
-)
-
-(define-method widget_aim_new
- (of-object "EmpathyAccount")
- (c-name "empathy_account_widget_aim_new")
- (return-type "GtkWidget*")
-)
-
-(define-method widget_yahoo_new
- (of-object "EmpathyAccount")
- (c-name "empathy_account_widget_yahoo_new")
- (return-type "GtkWidget*")
-)
-
-(define-method widget_groupwise_new
- (of-object "EmpathyAccount")
- (c-name "empathy_account_widget_groupwise_new")
- (return-type "GtkWidget*")
-)
-
;; From empathy-account-widget-irc.h
-(define-method widget_irc_new
- (of-object "EmpathyAccount")
- (c-name "empathy_account_widget_irc_new")
- (return-type "GtkWidget*")
+(define-method irc_build
+ (of-object "EmpathyAccountWidget")
+ (c-name "empathy_account_widget_irc_build")
+ (return-type "none")
+ (parameters
+ '("const-char*" "filename")
+ '("GtkWidget**" "table_common_settings")
+ )
)
;; From empathy-account-widget-sip.h
-(define-method widget_sip_new
- (of-object "EmpathyAccount")
- (c-name "empathy_account_widget_sip_new")
- (return-type "GtkWidget*")
+(define-method sip_build
+ (of-object "EmpathyAccountWidget")
+ (c-name "empathy_account_widget_sip_build")
+ (return-type "none")
+ (parameters
+ '("const-char*" "filename")
+ '("GtkWidget**" "table_common_settings")
+ )
)
@@ -1238,6 +1228,18 @@
+;; From empathy-share-my-desktop.h
+
+(define-function share_my_desktop_share_with_contact
+ (c-name "empathy_share_my_desktop_share_with_contact")
+ (return-type "none")
+ (parameters
+ '("EmpathyContact*" "contact")
+ )
+)
+
+
+
;; From empathy-contact-selector.h
(define-function contact_selector_get_type
@@ -1550,29 +1552,36 @@
-;; From empathy-profile-chooser.h
+;; From empathy-protocol-chooser.h
-(define-function profile_chooser_get_type
- (c-name "empathy_profile_chooser_get_type")
+(define-function protocol_chooser_get_type
+ (c-name "empathy_protocol_chooser_get_type")
(return-type "GType")
)
-(define-function profile_chooser_new
- (c-name "empathy_profile_chooser_new")
- (is-constructor-of "EmpathyProfileChooser")
+(define-function protocol_chooser_new
+ (c-name "empathy_protocol_chooser_new")
+ (is-constructor-of "EmpathyProtocolChooser")
(return-type "GtkWidget*")
)
(define-method dup_selected
- (of-object "EmpathyProfileChooser")
- (c-name "empathy_profile_chooser_dup_selected")
- (return-type "McProfile*")
+ (of-object "EmpathyProtocolChooser")
+ (c-name "empathy_protocol_chooser_dup_selected")
+ (return-type "TpConnectionManager*")
+ (parameters
+ '("TpConnectionManagerProtocol**" "protocol")
+ )
)
-(define-method n_profiles
- (of-object "EmpathyProfileChooser")
- (c-name "empathy_profile_chooser_n_profiles")
- (return-type "gint")
+(define-method set_visible
+ (of-object "EmpathyProtocolChooser")
+ (c-name "empathy_protocol_chooser_set_visible")
+ (return-type "none")
+ (parameters
+ '("EmpathyProtocolChooserFilterFunc" "func")
+ '("gpointer" "user_data")
+ )
)
@@ -1640,6 +1649,46 @@
+;; From empathy-sound.h
+
+(define-function sound_play
+ (c-name "empathy_sound_play")
+ (return-type "gboolean")
+ (parameters
+ '("GtkWidget*" "widget")
+ '("EmpathySound" "sound_id")
+ )
+)
+
+(define-method stop
+ (of-object "EmpathySound")
+ (c-name "empathy_sound_stop")
+ (return-type "none")
+)
+
+(define-function sound_start_playing
+ (c-name "empathy_sound_start_playing")
+ (return-type "gboolean")
+ (parameters
+ '("GtkWidget*" "widget")
+ '("EmpathySound" "sound_id")
+ '("guint" "timeout_before_replay")
+ )
+)
+
+(define-function sound_play_full
+ (c-name "empathy_sound_play_full")
+ (return-type "gboolean")
+ (parameters
+ '("GtkWidget*" "widget")
+ '("EmpathySound" "sound_id")
+ '("ca_finish_callback_t" "callback")
+ '("gpointer" "user_data")
+ )
+)
+
+
+
;; From empathy-spell.h
(define-function spell_supported
@@ -1694,6 +1743,24 @@
+;; From empathy-status-preset-dialog.h
+
+(define-function status_preset_dialog_get_type
+ (c-name "empathy_status_preset_dialog_get_type")
+ (return-type "GType")
+)
+
+(define-function status_preset_dialog_new
+ (c-name "empathy_status_preset_dialog_new")
+ (is-constructor-of "EmpathyStatusPresetDialog")
+ (return-type "GtkWidget*")
+ (parameters
+ '("GtkWindow*" "parent")
+ )
+)
+
+
+
;; From empathy-theme-boxes.h
(define-function theme_boxes_get_type
@@ -1754,6 +1821,24 @@
+;; From empathy-kludge-label.h
+
+(define-function kludge_label_get_type
+ (c-name "empathy_kludge_label_get_type")
+ (return-type "GType")
+)
+
+(define-function kludge_label_new
+ (c-name "empathy_kludge_label_new")
+ (is-constructor-of "EmpathyKludgeLabel")
+ (return-type "GtkWidget*")
+ (parameters
+ '("const-char*" "str")
+ )
+)
+
+
+
;; From empathy-ui-utils.h
(define-function gtk_init
@@ -1796,14 +1881,6 @@
)
)
-(define-function icon_name_from_account
- (c-name "empathy_icon_name_from_account")
- (return-type "const-gchar*")
- (parameters
- '("EmpathyAccount*" "account")
- )
-)
-
(define-function icon_name_for_presence
(c-name "empathy_icon_name_for_presence")
(return-type "const-gchar*")
diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override
index 3229cbac2..378fe3684 100644
--- a/python/pyempathygtk/pyempathygtk.override
+++ b/python/pyempathygtk/pyempathygtk.override
@@ -2,6 +2,7 @@
headers
#include <Python.h>
#include <pygobject.h>
+#include <libempathy/empathy-enum-types.h>
#include "empathy-account-chooser.h"
#include "empathy-account-widget.h"
#include "empathy-account-widget-irc.h"
@@ -24,12 +25,14 @@ headers
#include "empathy-gtk-enum-types.h"
#include "empathy-images.h"
#include "empathy-irc-network-dialog.h"
+#include "empathy-kludge-label.h"
#include "empathy-log-window.h"
#include "empathy-new-message-dialog.h"
#include "empathy-presence-chooser.h"
-#include "empathy-profile-chooser.h"
+#include "empathy-protocol-chooser.h"
#include "empathy-smiley-manager.h"
#include "empathy-spell.h"
+#include "empathy-status-preset-dialog.h"
#include "empathy-theme-boxes.h"
#include "empathy-theme-irc.h"
#include "empathy-theme-manager.h"
@@ -61,6 +64,8 @@ import gtk.Bin as PyGtkBin_Type
import gtk.DrawingArea as PyGtkDrawingArea_Type
import gtk.ComboBoxEntry as PyGtkComboBoxEntry_Type
import gtk.Builder as PyGtkBuilder_Type
+import gtk.Label as PyGtkLabel_Type
+import gtk.Dialog as PyGtkDialog_Type
import gst.Bin as PyGstBin_Type
import empathy.Contact as PyEmpathyContact_Type
import empathy.ContactList as PyEmpathyContactList_Type
@@ -68,6 +73,8 @@ import empathy.TpChat as PyEmpathyTpChat_Type
import empathy.Message as PyEmpathyMessage_Type
import empathy.TpCall as PyEmpathyTpCall_Type
import empathy.FTHandler as PyEmpathyFTHandler_Type
+import empathy.Account as PyEmpathyAccount_Type
+import empathy.AccountSettings as PyEmpathyAccountSettings_Type
%%
ignore-glob
*_get_type
diff --git a/python/update-binding.sh b/python/update-binding.sh
index 854c33159..34b28200a 100755
--- a/python/update-binding.sh
+++ b/python/update-binding.sh
@@ -5,17 +5,22 @@
cd ../libempathy
python /usr/share/pygobject/2.0/codegen/h2def.py \
-m empathy \
+ empathy-account-settings.h \
+ empathy-account.h \
empathy-account-manager.h \
empathy-chatroom.h \
empathy-chatroom-manager.h \
empathy-call-factory.h \
empathy-call-handler.h \
+ empathy-connectivity.h \
empathy-contact.h \
empathy-contact-groups.h \
empathy-contact-list.h \
empathy-contact-manager.h \
empathy-contact-monitor.h \
+ empathy-connection-managers.h \
empathy-debug.h \
+ empathy-debugger.h \
empathy-dispatcher.h \
empathy-dispatch-operation.h \
empathy-ft-factory.h \
@@ -24,6 +29,7 @@ python /usr/share/pygobject/2.0/codegen/h2def.py \
empathy-irc-network.h \
empathy-irc-network-manager.h \
empathy-irc-server.h \
+ empathy-location.h \
empathy-log-manager.h \
empathy-log-store.h \
empathy-log-store-empathy.h \
@@ -62,6 +68,7 @@ python /usr/share/pygobject/2.0/codegen/h2def.py \
empathy-contact-list-store.h \
empathy-contact-list-view.h \
empathy-contact-menu.h \
+ empathy-share-my-desktop.h \
empathy-contact-selector.h \
empathy-contact-widget.h \
empathy-geometry.h \
@@ -74,12 +81,15 @@ python /usr/share/pygobject/2.0/codegen/h2def.py \
empathy-log-window.h \
empathy-new-message-dialog.h \
empathy-presence-chooser.h \
- empathy-profile-chooser.h \
+ empathy-protocol-chooser.h \
empathy-smiley-manager.h \
+ empathy-sound.h \
empathy-spell.h \
+ empathy-status-preset-dialog.h \
empathy-theme-boxes.h \
empathy-theme-irc.h \
empathy-theme-manager.h \
+ empathy-kludge-label.h \
empathy-ui-utils.h \
> ../python/pyempathygtk/pyempathygtk.defs