Update python binding

svn path=/trunk/; revision=859

2 files changed, 60 insertions, 179 deletions

diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index f50676043..d75152702 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -44,7 +44,7 @@
 
 (define-object Chat
   (in-module "Empathy")
-  (parent "GObject")
+  (parent "GtkBin")
   (c-name "EmpathyChat")
   (gtype-id "EMPATHY_TYPE_CHAT")
 )
@@ -77,13 +77,6 @@
   (gtype-id "EMPATHY_TYPE_CONTACT_LIST_VIEW")
 )
 
-(define-object GroupChat
-  (in-module "Empathy")
-  (parent "EmpathyChat")
-  (c-name "EmpathyGroupChat")
-  (gtype-id "EMPATHY_TYPE_GROUP_CHAT")
-)
-
 (define-object PresenceChooser
   (in-module "Empathy")
   (parent "GtkToggleButton")
@@ -91,13 +84,6 @@
   (gtype-id "EMPATHY_TYPE_PRESENCE_CHOOSER")
 )
 
-(define-object PrivateChat
-  (in-module "Empathy")
-  (parent "EmpathyChat")
-  (c-name "EmpathyPrivateChat")
-  (gtype-id "EMPATHY_TYPE_PRIVATE_CHAT")
-)
-
 (define-object SmileyManager
   (in-module "Empathy")
   (parent "GObject")
@@ -279,40 +265,40 @@
   (return-type "GType")
 )
 
-(define-method get_view
-  (of-object "EmpathyChat")
-  (c-name "empathy_chat_get_view")
-  (return-type "EmpathyChatView*")
-)
-
-(define-method clear
-  (of-object "EmpathyChat")
-  (c-name "empathy_chat_clear")
-  (return-type "none")
+(define-function empathy_chat_new
+  (c-name "empathy_chat_new")
+  (is-constructor-of "EmpathyChat")
+  (return-type "EmpathyChat*")
+  (parameters
+    '("EmpathyTpChat*" "tp_chat")
+  )
 )
 
-(define-method scroll_down
+(define-method get_tp_chat
   (of-object "EmpathyChat")
-  (c-name "empathy_chat_scroll_down")
-  (return-type "none")
+  (c-name "empathy_chat_get_tp_chat")
+  (return-type "EmpathyTpChat*")
 )
 
-(define-method cut
+(define-method set_tp_chat
   (of-object "EmpathyChat")
-  (c-name "empathy_chat_cut")
+  (c-name "empathy_chat_set_tp_chat")
   (return-type "none")
+  (parameters
+    '("EmpathyTpChat*" "tp_chat")
+  )
 )
 
-(define-method copy
+(define-method get_account
   (of-object "EmpathyChat")
-  (c-name "empathy_chat_copy")
-  (return-type "none")
+  (c-name "empathy_chat_get_account")
+  (return-type "McAccount*")
 )
 
-(define-method paste
+(define-method get_id
   (of-object "EmpathyChat")
-  (c-name "empathy_chat_paste")
-  (return-type "none")
+  (c-name "empathy_chat_get_id")
+  (return-type "const-gchar*")
 )
 
 (define-method get_name
@@ -321,87 +307,40 @@
   (return-type "const-gchar*")
 )
 
-(define-method get_tooltip
+(define-method get_subject
   (of-object "EmpathyChat")
-  (c-name "empathy_chat_get_tooltip")
-  (return-type "gchar*")
-)
-
-(define-method get_status_icon_name
-  (of-object "EmpathyChat")
-  (c-name "empathy_chat_get_status_icon_name")
+  (c-name "empathy_chat_get_subject")
   (return-type "const-gchar*")
 )
 
-(define-method get_widget
-  (of-object "EmpathyChat")
-  (c-name "empathy_chat_get_widget")
-  (return-type "GtkWidget*")
-)
-
-(define-method is_group_chat
-  (of-object "EmpathyChat")
-  (c-name "empathy_chat_is_group_chat")
-  (return-type "gboolean")
-)
-
-(define-method is_connected
-  (of-object "EmpathyChat")
-  (c-name "empathy_chat_is_connected")
-  (return-type "gboolean")
-)
-
-(define-method save_geometry
+(define-method clear
   (of-object "EmpathyChat")
-  (c-name "empathy_chat_save_geometry")
+  (c-name "empathy_chat_clear")
   (return-type "none")
-  (parameters
-    '("gint" "x")
-    '("gint" "y")
-    '("gint" "w")
-    '("gint" "h")
-  )
 )
 
-(define-method load_geometry
+(define-method scroll_down
   (of-object "EmpathyChat")
-  (c-name "empathy_chat_load_geometry")
+  (c-name "empathy_chat_scroll_down")
   (return-type "none")
-  (parameters
-    '("gint*" "x")
-    '("gint*" "y")
-    '("gint*" "w")
-    '("gint*" "h")
-  )
 )
 
-(define-method set_tp_chat
+(define-method cut
   (of-object "EmpathyChat")
-  (c-name "empathy_chat_set_tp_chat")
+  (c-name "empathy_chat_cut")
   (return-type "none")
-  (parameters
-    '("EmpathyTpChat*" "tp_chat")
-  )
 )
 
-(define-method get_id
+(define-method copy
   (of-object "EmpathyChat")
-  (c-name "empathy_chat_get_id")
-  (return-type "const-gchar*")
+  (c-name "empathy_chat_copy")
+  (return-type "none")
 )
 
-(define-method get_account
+(define-method paste
   (of-object "EmpathyChat")
-  (c-name "empathy_chat_get_account")
-  (return-type "McAccount*")
-)
-
-(define-function empathy_chat_get_is_command
-  (c-name "empathy_chat_get_is_command")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "str")
-  )
+  (c-name "empathy_chat_paste")
+  (return-type "none")
 )
 
 (define-method correct_word
@@ -415,20 +354,6 @@
   )
 )
 
-(define-method should_play_sound
-  (of-object "EmpathyChat")
-  (c-name "empathy_chat_should_play_sound")
-  (return-type "gboolean")
-)
-
-(define-function empathy_chat_should_highlight_nick
-  (c-name "empathy_chat_should_highlight_nick")
-  (return-type "gboolean")
-  (parameters
-    '("EmpathyMessage*" "message")
-  )
-)
-
 
 
 ;; From empathy-irc-network-dialog.h
@@ -774,6 +699,24 @@
   )
 )
 
+(define-function empathy_account_widget_sip_new
+  (c-name "empathy_account_widget_sip_new")
+  (is-constructor-of "EmpathyAccountWidgetSip")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-function empathy_account_widget_groupwise_new
+  (c-name "empathy_account_widget_groupwise_new")
+  (is-constructor-of "EmpathyAccountWidgetGroupwise")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
 
 
 ;; From empathy-conf.h
@@ -1099,10 +1042,13 @@
   (return-type "GType")
 )
 
-(define-method store_new
-  (of-object "EmpathyContactList")
+(define-function empathy_contact_list_store_new
+  (is-constructor-of "EmpathyContactListStore")
   (c-name "empathy_contact_list_store_new")
   (return-type "EmpathyContactListStore*")
+  (parameters
+    '("EmpathyContactList*" "list_iface")
+  )
 )
 
 (define-method get_list_iface
@@ -1363,30 +1309,6 @@
 
 
 
-;; From empathy-private-chat.h
-
-(define-function empathy_private_chat_get_type
-  (c-name "empathy_private_chat_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_private_chat_new
-  (c-name "empathy_private_chat_new")
-  (is-constructor-of "EmpathyPrivateChat")
-  (return-type "EmpathyPrivateChat*")
-  (parameters
-    '("EmpathyTpChat*" "tp_chat")
-  )
-)
-
-(define-method get_contact
-  (of-object "EmpathyPrivateChat")
-  (c-name "empathy_private_chat_get_contact")
-  (return-type "EmpathyContact*")
-)
-
-
-
 ;; From empathy-ui-utils.h
 
 (define-function empathy_glade_get_file_simple
@@ -1809,45 +1731,6 @@
 
 
 
-;; From empathy-group-chat.h
-
-(define-function empathy_group_chat_get_type
-  (c-name "empathy_group_chat_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_group_chat_new
-  (c-name "empathy_group_chat_new")
-  (is-constructor-of "EmpathyGroupChat")
-  (return-type "EmpathyGroupChat*")
-  (parameters
-    '("EmpathyTpChatroom*" "tp_chat")
-  )
-)
-
-(define-method get_show_contacts
-  (of-object "EmpathyGroupChat")
-  (c-name "empathy_group_chat_get_show_contacts")
-  (return-type "gboolean")
-)
-
-(define-method set_show_contacts
-  (of-object "EmpathyGroupChat")
-  (c-name "empathy_group_chat_set_show_contacts")
-  (return-type "none")
-  (parameters
-    '("gboolean" "show")
-  )
-)
-
-(define-method set_topic
-  (of-object "EmpathyGroupChat")
-  (c-name "empathy_group_chat_set_topic")
-  (return-type "none")
-)
-
-
-
 ;; From empathy-spell.h
 
 (define-function empathy_spell_supported
diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override
index 7afb8e952..262942888 100644
--- a/python/pyempathygtk/pyempathygtk.override
+++ b/python/pyempathygtk/pyempathygtk.override
@@ -19,14 +19,12 @@ headers
 #include "empathy-contact-list-view.h"
 #include "empathy-contact-widget.h"
 #include "empathy-geometry.h"
-#include "empathy-group-chat.h"
 #include "empathy-gtk-enum-types.h"
 #include "empathy-images.h"
 #include "empathy-irc-network-dialog.h"
 #include "empathy-log-window.h"
 #include "empathy-new-message-dialog.h"
 #include "empathy-presence-chooser.h"
-#include "empathy-private-chat.h"
 #include "empathy-profile-chooser.h"
 #include "empathy-smiley-manager.h"
 #include "empathy-spell-dialog.h"
@@ -57,11 +55,11 @@ import gtk.Button as PyGtkButton_Type
 import gtk.EventBox as PyGtkEventBox_Type
 import gtk.CellRendererPixbuf as PyGtkCellRendererPixbuf_Type
 import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
+import gtk.Bin as PyGtkBin_Type
 import empathy.Contact as PyEmpathyContact_Type
 import empathy.ContactList as PyEmpathyContactList_Type
 import empathy.TpChat as PyEmpathyTpChat_Type
 import empathy.Message as PyEmpathyMessage_Type
-import empathy.TpChatroom as PyEmpathyTpChatroom_Type
 import empathy.TpCall as PyEmpathyTpCall_Type
 %%
 ignore-glob