Merge back from master

[empathy.git] / python / pyempathygtk / pyempathygtk.defs

diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index d4601b211540abc7e1d308187a6439508bd11e3a..51d32709e9fdaa53800525b067e2ecf3baeb2648 100644 (file)
--- 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*")