Update python binding

svn path=/trunk/; revision=859

2 files changed, 28 insertions, 65 deletions

diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index d75155c4c..ef46a7b38 100644
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -112,14 +112,6 @@
   (gtype-id "EMPATHY_TYPE_TP_CHAT")
 )
 
-(define-object TpChatroom
-  (in-module "Empathy")
-  (parent "EmpathyTpChat")
-  (implements "EmpathyContactList")
-  (c-name "EmpathyTpChatroom")
-  (gtype-id "EMPATHY_TYPE_TP_CHATROOM")
-)
-
 (define-object TpContactFactory
   (in-module "Empathy")
   (parent "GObject")
@@ -562,6 +554,15 @@
   )
 )
 
+(define-function empathy_file_lookup
+  (c-name "empathy_file_lookup")
+  (return-type "gchar*")
+  (parameters
+    '("const-gchar*" "filename")
+    '("const-gchar*" "subdir")
+  )
+)
+
 
 
 ;; From empathy-message.h
@@ -664,6 +665,12 @@
   )
 )
 
+(define-method should_highlight
+  (of-object "EmpathyMessage")
+  (c-name "empathy_message_should_highlight")
+  (return-type "gboolean")
+)
+
 (define-function empathy_message_type_from_str
   (c-name "empathy_message_type_from_str")
   (return-type "EmpathyMessageType")
@@ -1539,6 +1546,7 @@
   (parameters
     '("McAccount*" "account")
     '("TpChan*" "tp_chan")
+    '("gboolean" "acknowledge")
   )
 )
 
@@ -1550,21 +1558,6 @@
   )
 )
 
-(define-method get_acknowledge
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_get_acknowledge")
-  (return-type "gboolean")
-)
-
-(define-method set_acknowledge
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_set_acknowledge")
-  (return-type "none")
-  (parameters
-    '("gboolean" "acknowledge")
-  )
-)
-
 (define-method get_account
   (of-object "EmpathyTpChat")
   (c-name "empathy_tp_chat_get_account")
@@ -1577,6 +1570,18 @@
   (return-type "TpChan*")
 )
 
+(define-method get_id
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_get_id")
+  (return-type "const-gchar*")
+)
+
+(define-method get_remote_contact
+  (of-object "EmpathyTpChat")
+  (c-name "empathy_tp_chat_get_remote_contact")
+  (return-type "EmpathyContact*")
+)
+
 (define-method send
   (of-object "EmpathyTpChat")
   (c-name "empathy_tp_chat_send")
@@ -1595,12 +1600,6 @@
   )
 )
 
-(define-method get_id
-  (of-object "EmpathyTpChat")
-  (c-name "empathy_tp_chat_get_id")
-  (return-type "const-gchar*")
-)
-
 (define-method set_property
   (of-object "EmpathyTpChat")
   (c-name "empathy_tp_chat_set_property")
@@ -1613,41 +1612,6 @@
 
 
 
-;; From empathy-tp-chatroom.h
-
-(define-function empathy_tp_chatroom_get_type
-  (c-name "empathy_tp_chatroom_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_tp_chatroom_new
-  (c-name "empathy_tp_chatroom_new")
-  (is-constructor-of "EmpathyTpChatroom")
-  (return-type "EmpathyTpChatroom*")
-  (parameters
-    '("McAccount*" "account")
-    '("TpChan*" "tp_chan")
-  )
-)
-
-(define-method get_invitation
-  (of-object "EmpathyTpChatroom")
-  (c-name "empathy_tp_chatroom_get_invitation")
-  (return-type "gboolean")
-  (parameters
-    '("EmpathyContact**" "contact")
-    '("const-gchar**" "message")
-  )
-)
-
-(define-method accept_invitation
-  (of-object "EmpathyTpChatroom")
-  (c-name "empathy_tp_chatroom_accept_invitation")
-  (return-type "none")
-)
-
-
-
 ;; From empathy-tp-roomlist.h
 
 (define-function empathy_tp_roomlist_get_type
diff --git a/python/pyempathy/pyempathy.override b/python/pyempathy/pyempathy.override
index 64b65e920..c5b70c17c 100644
--- a/python/pyempathy/pyempathy.override
+++ b/python/pyempathy/pyempathy.override
@@ -24,7 +24,6 @@ headers
 #include "empathy-time.h"
 #include "empathy-tp-call.h"
 #include "empathy-tp-chat.h"
-#include "empathy-tp-chatroom.h"
 #include "empathy-tp-contact-factory.h"
 #include "empathy-tp-contact-list.h"
 #include "empathy-tp-group.h"