diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/pyempathy/pyempathy.defs | 98 | ||||
| -rw-r--r-- | python/pyempathygtk/pyempathygtk.defs | 128 | ||||
| -rw-r--r-- | python/pyempathygtk/pyempathygtk.override | 3 | ||||
| -rwxr-xr-x | python/update-binding.sh | 2 |
4 files changed, 150 insertions, 81 deletions
diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs index 488f5b3ac..b8f0b40aa 100644 --- a/python/pyempathy/pyempathy.defs +++ b/python/pyempathy/pyempathy.defs @@ -291,13 +291,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 +315,18 @@ (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 get_account (of-object "EmpathyAccountManager") - (c-name "empathy_account_manager_lookup") + (c-name "empathy_account_manager_get_account") (return-type "EmpathyAccount*") (parameters '("const-gchar*" "unique_name") @@ -357,6 +354,52 @@ ) ) +(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_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 @@ -2893,28 +2936,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 +3000,17 @@ ) ) +(define-function protocol_icon_name + (c-name "empathy_protocol_icon_name") + (return-type "gchar*") + (parameters + '("const-gchar*" "protocol") + ) +) + +(define-function type_dbus_ao + (c-name "empathy_type_dbus_ao") + (return-type "GType") +) + diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs index d4601b211..51d32709e 100644 --- a/python/pyempathygtk/pyempathygtk.defs +++ b/python/pyempathygtk/pyempathygtk.defs @@ -118,11 +118,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 @@ -328,28 +328,37 @@ ;; From empathy-account-widget.h -(define-method widget_handle_params - (of-object "EmpathyAccount") +(define-function account_widget_handle_params (c-name "empathy_account_widget_handle_params") (return-type "none") (parameters + '("EmpathyAccountSettings*" "settings") '("GtkBuilder*" "gui") '("const-gchar*" "first_widget") ) (varargs #t) ) -(define-method widget_add_forget_button - (of-object "EmpathyAccount") +(define-function account_widget_add_forget_button (c-name "empathy_account_widget_add_forget_button") (return-type "none") (parameters + '("EmpathyAccountSettings*" "settings") '("GtkBuilder*" "gui") '("const-gchar*" "button") '("const-gchar*" "entry") ) ) +(define-function account_widget_add_apply_button + (c-name "empathy_account_widget_add_apply_button") + (return-type "none") + (parameters + '("EmpathyAccountSettings*" "settings") + '("GtkWidget*" "vbox") + ) +) + (define-function account_widget_set_default_focus (c-name "empathy_account_widget_set_default_focus") (return-type "none") @@ -359,72 +368,102 @@ ) ) -(define-method widget_generic_new - (of-object "EmpathyAccount") +(define-function account_widget_generic_new (c-name "empathy_account_widget_generic_new") + (is-constructor-of "EmpathyAccountWidgetGeneric") (return-type "GtkWidget*") + (parameters + '("EmpathyAccountSettings*" "settings") + ) ) -(define-method widget_salut_new - (of-object "EmpathyAccount") +(define-function account_widget_salut_new (c-name "empathy_account_widget_salut_new") + (is-constructor-of "EmpathyAccountWidgetSalut") (return-type "GtkWidget*") + (parameters + '("EmpathyAccountSettings*" "settings") + ) ) -(define-method widget_msn_new - (of-object "EmpathyAccount") +(define-function account_widget_msn_new (c-name "empathy_account_widget_msn_new") + (is-constructor-of "EmpathyAccountWidgetMsn") (return-type "GtkWidget*") + (parameters + '("EmpathyAccountSettings*" "settings") + ) ) -(define-method widget_jabber_new - (of-object "EmpathyAccount") +(define-function account_widget_jabber_new (c-name "empathy_account_widget_jabber_new") + (is-constructor-of "EmpathyAccountWidgetJabber") (return-type "GtkWidget*") + (parameters + '("EmpathyAccountSettings*" "settings") + ) ) -(define-method widget_icq_new - (of-object "EmpathyAccount") +(define-function account_widget_icq_new (c-name "empathy_account_widget_icq_new") + (is-constructor-of "EmpathyAccountWidgetIcq") (return-type "GtkWidget*") + (parameters + '("EmpathyAccountSettings*" "settings") + ) ) -(define-method widget_aim_new - (of-object "EmpathyAccount") +(define-function account_widget_aim_new (c-name "empathy_account_widget_aim_new") + (is-constructor-of "EmpathyAccountWidgetAim") (return-type "GtkWidget*") + (parameters + '("EmpathyAccountSettings*" "settings") + ) ) -(define-method widget_yahoo_new - (of-object "EmpathyAccount") +(define-function account_widget_yahoo_new (c-name "empathy_account_widget_yahoo_new") + (is-constructor-of "EmpathyAccountWidgetYahoo") (return-type "GtkWidget*") + (parameters + '("EmpathyAccountSettings*" "settings") + ) ) -(define-method widget_groupwise_new - (of-object "EmpathyAccount") +(define-function account_widget_groupwise_new (c-name "empathy_account_widget_groupwise_new") + (is-constructor-of "EmpathyAccountWidgetGroupwise") (return-type "GtkWidget*") + (parameters + '("EmpathyAccountSettings*" "settings") + ) ) ;; From empathy-account-widget-irc.h -(define-method widget_irc_new - (of-object "EmpathyAccount") +(define-function account_widget_irc_new (c-name "empathy_account_widget_irc_new") + (is-constructor-of "EmpathyAccountWidgetIrc") (return-type "GtkWidget*") + (parameters + '("EmpathyAccountSettings*" "settings") + ) ) ;; From empathy-account-widget-sip.h -(define-method widget_sip_new - (of-object "EmpathyAccount") +(define-function account_widget_sip_new (c-name "empathy_account_widget_sip_new") + (is-constructor-of "EmpathyAccountWidgetSip") (return-type "GtkWidget*") + (parameters + '("EmpathyAccountSettings*" "settings") + ) ) @@ -1550,28 +1589,31 @@ -;; 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") +(define-method n_protocols + (of-object "EmpathyProtocolChooser") + (c-name "empathy_protocol_chooser_n_protocols") (return-type "gint") ) @@ -1796,14 +1838,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..d758afbf8 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" @@ -27,7 +28,7 @@ headers #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-theme-boxes.h" diff --git a/python/update-binding.sh b/python/update-binding.sh index 854c33159..3636b6341 100755 --- a/python/update-binding.sh +++ b/python/update-binding.sh @@ -74,7 +74,7 @@ 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-spell.h \ empathy-theme-boxes.h \ |