Merge call branch from Elliot Fairweather with cleanups from Xavier Claessens.

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

diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index a8412437f8de6afaf51ad909e65716e5dfa96005..0d5a3e5cac8e8b30ae17f28b5c6ad5d4bbdc8879 100644 (file)
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -147,13 +147,6 @@
   (gtype-id "EMPATHY_TYPE_THEME_MANAGER")
 )
 
-(define-object Spinner
-  (in-module "Ephy")
-  (parent "GtkWidget")
-  (c-name "EphySpinner")
-  (gtype-id "EPHY_TYPE_SPINNER")
-)
-
 ;; Enumerations and flags ...
 
 (define-enum ChatViewBlock
@@ -327,7 +320,29 @@
 
 
 
-;; From empathy-account-widget-generic.h
+;; From empathy-account-widget.h
+
+(define-function empathy_account_widget_handle_params
+  (c-name "empathy_account_widget_handle_params")
+  (return-type "none")
+  (parameters
+    '("McAccount*" "account")
+    '("GladeXML*" "glade")
+    '("const-gchar*" "first_widget_name")
+  )
+  (varargs #t)
+)
+
+(define-function emapthy_account_widget_add_forget_button
+  (c-name "emapthy_account_widget_add_forget_button")
+  (return-type "none")
+  (parameters
+    '("McAccount*" "account")
+    '("GladeXML*" "glade")
+    '("const-gchar*" "button")
+    '("const-gchar*" "entry")
+  )
+)
 
 (define-function empathy_account_widget_generic_new
   (c-name "empathy_account_widget_generic_new")
@@ -338,23 +353,15 @@
   )
 )
 
-
-
-;; From empathy-account-widget-jabber.h
-
-(define-function empathy_account_widget_jabber_new
-  (c-name "empathy_account_widget_jabber_new")
-  (is-constructor-of "EmpathyAccountWidgetJabber")
+(define-function empathy_account_widget_salut_new
+  (c-name "empathy_account_widget_salut_new")
+  (is-constructor-of "EmpathyAccountWidgetSalut")
   (return-type "GtkWidget*")
   (parameters
     '("McAccount*" "account")
   )
 )
 
-
-
-;; From empathy-account-widget-msn.h
-
 (define-function empathy_account_widget_msn_new
   (c-name "empathy_account_widget_msn_new")
   (is-constructor-of "EmpathyAccountWidgetMsn")
@@ -364,13 +371,9 @@
   )
 )
 
-
-
-;; From empathy-account-widget-salut.h
-
-(define-function empathy_account_widget_salut_new
-  (c-name "empathy_account_widget_salut_new")
-  (is-constructor-of "EmpathyAccountWidgetSalut")
+(define-function empathy_account_widget_jabber_new
+  (c-name "empathy_account_widget_jabber_new")
+  (is-constructor-of "EmpathyAccountWidgetJabber")
   (return-type "GtkWidget*")
   (parameters
     '("McAccount*" "account")
@@ -440,8 +443,9 @@
 
 ;; From empathy-call-window.h
 
-(define-function empathy_call_window_show
-  (c-name "empathy_call_window_show")
+(define-function empathy_call_window_new
+  (c-name "empathy_call_window_new")
+  (is-constructor-of "EmpathyCallWindow")
   (return-type "GtkWidget*")
   (parameters
     '("EmpathyTpCall*" "call")
@@ -1349,6 +1353,15 @@
   )
 )
 
+(define-function empathy_contact_widget_set_contact
+  (c-name "empathy_contact_widget_set_contact")
+  (return-type "none")
+  (parameters
+    '("GtkWidget*" "widget")
+    '("EmpathyContact*" "contact")
+  )
+)
+
 (define-function empathy_contact_widget_set_account_filter
   (c-name "empathy_contact_widget_set_account_filter")
   (return-type "none")
@@ -1921,19 +1934,11 @@
   )
 )
 
-(define-function empathy_icon_name_for_presence_state
-  (c-name "empathy_icon_name_for_presence_state")
-  (return-type "const-gchar*")
-  (parameters
-    '("McPresence" "state")
-  )
-)
-
 (define-function empathy_icon_name_for_presence
   (c-name "empathy_icon_name_for_presence")
   (return-type "const-gchar*")
   (parameters
-    '("EmpathyPresence*" "presence")
+    '("McPresence" "presence")
   )
 )
 
@@ -2090,40 +2095,3 @@
   (varargs #t)
 )
 
-
-
-;; From ephy-spinner.h
-
-(define-function ephy_spinner_get_type
-  (c-name "ephy_spinner_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_spinner_new
-  (c-name "ephy_spinner_new")
-  (is-constructor-of "EphySpinner")
-  (return-type "GtkWidget*")
-)
-
-(define-method start
-  (of-object "EphySpinner")
-  (c-name "ephy_spinner_start")
-  (return-type "none")
-)
-
-(define-method stop
-  (of-object "EphySpinner")
-  (c-name "ephy_spinner_stop")
-  (return-type "none")
-)
-
-(define-method set_size
-  (of-object "EphySpinner")
-  (c-name "ephy_spinner_set_size")
-  (return-type "none")
-  (parameters
-    '("GtkIconSize" "size")
-  )
-)
-
-