X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=conversation.pyx;h=588f29a1feeaf894d42090dbe7e4e897135b11cb;hp=5b8cb04a4ba615986e9fc0ddc5057a5a521c3ce9;hb=2491093a6b435f34eb5ba929ec404bf2aee87709;hpb=d88947735d2c204731d80ae6513aeea7463a6e87

diff --git a/conversation.pyx b/conversation.pyx
index 5b8cb04..588f29a 100644
--- a/conversation.pyx
+++ b/conversation.pyx
@@ -17,17 +17,55 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-cimport conversation
+cimport purple
 
 cdef class Conversation:
     """ Conversation class """
     cdef conversation.PurpleConversation *__conv
+    cdef Account __acc
+
+    cdef object __name
 
     def __init__(self):
         conversation.c_purple_conversations_init()
+        self.__name = None
+
+    def __get_account(self):
+        return self.__acc
+    def __set_account(self, acc):
+        self.__acc = acc
+    account = property(__get_account, __set_account)
+
+    def __get_name(self):
+        return self.__name
+    def __set_name(self, name):
+        self.__name = name
+    name = property(__get_name, __set_name)
+
+    def initialize(self, acc, type, char *name):
+        self.__acc = acc
+        self.__name = name
 
-    def conversation_new(self, type, acc, char *name):
-        self.__conv = conversation.c_purple_conversation_new(type, <account.PurpleAccount*>acc.__account, name)
+        if type == "UNKNOWN":
+            self.__conv =\
+            conversation.c_purple_conversation_new(conversation.PURPLE_CONV_TYPE_UNKNOWN,\
+                <account.PurpleAccount*>self.__acc.c_account, self.__name)
+        elif type == "IM":
+            self.__conv =\
+            conversation.c_purple_conversation_new(conversation.PURPLE_CONV_TYPE_IM,\
+                <account.PurpleAccount*>self.__acc.c_account, self.__name)
+        elif type == "CHAT":
+            self.__conv =\
+            conversation.c_purple_conversation_new(conversation.PURPLE_CONV_TYPE_CHAT,\
+                <account.PurpleAccount*>self.__acc.c_account, self.__name)
+        elif type == "MISC":
+            self.__conv =\
+            conversation.c_purple_conversation_new(conversation.PURPLE_CONV_TYPE_MISC,\
+                <account.PurpleAccount*>self.__acc.c_account, self.__name)
+        elif type == "ANY":
+            self.__conv =\
+            conversation.c_purple_conversation_new(conversation.PURPLE_CONV_TYPE_ANY,\
+                <account.PurpleAccount*>self.__acc.c_account, self.__name)
 
     def conversation_set_ui_ops(self):
         cdef conversation.PurpleConversationUiOps c_conv_ui_ops
@@ -49,16 +87,12 @@ cdef class Conversation:
 
         conversation.c_purple_conversation_set_ui_ops(self.__conv, &c_conv_ui_ops)
 
-    def conversation_write(self, char *message):
+    def write(self, char *message):
         conversation.c_purple_conv_im_send(conversation.c_purple_conversation_get_im_data(self.__conv), message)
 
-    def conversation_destroy(self):
-        conversation.c_purple_conversation_destroy(self.__conv)
-
-    def conversation_get_handle(self):
+    def get_handle(self):
         conversation.c_purple_conversations_get_handle()
 
-    def send_message(self, buddy, char *message):
-        self.conversation_new(1, buddy.account, buddy.name)
-        self.conversation_set_ui_ops()
-        self.conversation_write(message)
+    def destroy(self):
+        print "[DEBUG]: Destroy conversation: %s" % self.__name
+        conversation.c_purple_conversation_destroy(self.__conv)