X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=conversation.pyx;h=c13578a75c582604cd322062a85ecc24edbdd740;hp=ecb00bcb93537e090ddf5ff7d00768790f0cefce;hb=7cb45fa563b2f0d0e9352373ab0e853188592dcf;hpb=7f9bbfa5e0f087ba5a5c1367ab1bea72f53573d0

diff --git a/conversation.pyx b/conversation.pyx
index ecb00bc..c13578a 100644
--- a/conversation.pyx
+++ b/conversation.pyx
@@ -17,18 +17,20 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+cimport purple
+
 cdef class Conversation:
     """ Conversation class """
-    cdef PurpleConversation *__conv
+    cdef conversation.PurpleConversation *__conv
 
-    def __cinit__(self):
-        purple_conversations_init()
+    def __init__(self):
+        conversation.c_purple_conversations_init()
 
-    def conversation_new(self, type, acc, const_char_ptr name):
-        self.__conv = purple_conversation_new(type, <PurpleAccount*>acc.__account, name)
+    def conversation_new(self, type, acc, char *name):
+        self.__conv = conversation.c_purple_conversation_new(type, <account.PurpleAccount*>acc.__account, name)
 
     def conversation_set_ui_ops(self):
-        cdef PurpleConversationUiOps c_conv_ui_ops
+        cdef conversation.PurpleConversationUiOps c_conv_ui_ops
         c_conv_ui_ops.create_conversation = NULL
         c_conv_ui_ops.destroy_conversation = NULL
         c_conv_ui_ops.write_chat = NULL
@@ -45,18 +47,18 @@ cdef class Conversation:
         c_conv_ui_ops.custom_smiley_close = NULL
         c_conv_ui_ops.send_confirm = NULL
 
-        purple_conversation_set_ui_ops(self.__conv, &c_conv_ui_ops)
+        conversation.c_purple_conversation_set_ui_ops(self.__conv, &c_conv_ui_ops)
 
-    def conversation_write(self, const_char_ptr message):
-        purple_conv_im_send(purple_conversation_get_im_data(self.__conv), message)
+    def conversation_write(self, char *message):
+        conversation.c_purple_conv_im_send(conversation.c_purple_conversation_get_im_data(self.__conv), message)
 
     def conversation_destroy(self):
-        purple_conversation_destroy(self.__conv)
+        conversation.c_purple_conversation_destroy(self.__conv)
 
     def conversation_get_handle(self):
-        purple_conversations_get_handle()
+        conversation.c_purple_conversations_get_handle()
 
-    def send_message(self, buddy, const_char_ptr message):
+    def send_message(self, buddy, char *message):
         self.conversation_new(1, buddy.account, buddy.name)
         self.conversation_set_ui_ops()
         self.conversation_write(message)