projects / python-purple / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Better handling of c/python strings.
[python-purple] / conversation_cbs.pxd
diff --git a/conversation_cbs.pxd b/conversation_cbs.pxd
index a0aa262..9cbb6ba 100644 (file)
--- a/conversation_cbs.pxd
+++ b/conversation_cbs.pxd
@@ -22,23 +22,31 @@ cimport purple
 cdef extern from *:
     ctypedef char const_char "const char"
     ctypedef glib.guchar const_guchar "const guchar"
-
-cdef extern from "time.h":
     ctypedef long int time_t
 
 conversation_cbs = {}
 
 cdef void create_conversation (conversation.PurpleConversation *conv):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "create_conversation\n")
-    global conversation_cbs
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "create_conversation\n")
+    cdef char *c_name = NULL
+
+    c_name = <char *> conversation.c_purple_conversation_get_name(conv)
+    if c_name == NULL:
+        name = None
+    else:
+        name = c_name
+
+    type = conversation.c_purple_conversation_get_type(conv)
+
     try:
-        (<object>conversation_cbs["create_conversation"])("create_conversation")
+        (<object>conversation_cbs["create_conversation"])(name, type)
     except KeyError:
         pass
 
 cdef void destroy_conversation (conversation.PurpleConversation *conv):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "destroy_conversation\n")
-    global conversation_cbs
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "destroy_conversation\n")
     try:
         (<object>conversation_cbs["destroy_conversation"])("destroy_conversation")
     except KeyError:
@@ -47,8 +55,8 @@ cdef void destroy_conversation (conversation.PurpleConversation *conv):
 cdef void write_chat (conversation.PurpleConversation *conv, const_char *who,
                       const_char *message, conversation.PurpleMessageFlags flags,
                       time_t mtime):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "write_chat\n")
-    global conversation_cbs
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "write_chat\n")
     try:
         (<object>conversation_cbs["write_chat"])("write_chat")
     except KeyError:
@@ -58,17 +66,30 @@ cdef void write_im (conversation.PurpleConversation *conv, const_char *who,
                     const_char *message, conversation.PurpleMessageFlags flags,
                     time_t mtime):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "write_im\n")
-    global conversation_cbs
+    cdef account.PurpleAccount *acc = conversation.c_purple_conversation_get_account(conv)
+    cdef char *c_username = NULL
+
+    c_username = <char *> account.c_purple_account_get_username(acc)
+    if c_username == NULL:
+        username = None
+    else:
+        username = c_username
+
+    if who:
+        sender = <char *> who
+    else:
+        sender = None
+
     try:
-        (<object>conversation_cbs["write_im"])("write_im")
+        (<object>conversation_cbs["write_im"])(username, sender, <char *> message)
     except KeyError:
         pass
 
 cdef void write_conv (conversation.PurpleConversation *conv, const_char *name,
                       const_char *alias, const_char *message,
                       conversation.PurpleMessageFlags flags, time_t mtime):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "write_conv\n")
-    global conversation_cbs
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "write_conv\n")
     try:
         (<object>conversation_cbs["write_conv"])("write_conv")
     except KeyError:
@@ -76,8 +97,8 @@ cdef void write_conv (conversation.PurpleConversation *conv, const_char *name,
 
 cdef void chat_add_users (conversation.PurpleConversation *conv,
                           glib.GList *cbuddies, glib.gboolean new_arrivals):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "chat_add_users\n")
-    global conversation_cbs
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "chat_add_users\n")
     try:
         (<object>conversation_cbs["chat_add_users"])("chat_add_users")
     except KeyError:
@@ -86,8 +107,8 @@ cdef void chat_add_users (conversation.PurpleConversation *conv,
 cdef void chat_rename_user (conversation.PurpleConversation *conv,
                             const_char *old_name, const_char *new_name,
                             const_char *new_alias):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "chat_rename_user\n")
-    global conversation_cbs
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "chat_rename_user\n")
     try:
         (<object>conversation_cbs["chat_rename_user"])("chat_rename_user")
     except KeyError:
@@ -95,32 +116,33 @@ cdef void chat_rename_user (conversation.PurpleConversation *conv,
 
 cdef void chat_remove_users (conversation.PurpleConversation *conv,
                              glib.GList *users):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "chat_remove_users\n")
-    global conversation_cbs
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "chat_remove_users\n")
     try:
         (<object>conversation_cbs["chat_remove_users"])("chat_remove_users")
     except KeyError:
         pass
 
-cdef void chat_update_user (conversation.PurpleConversation *conv, const_char *user):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "chat_update_user\n")
-    global conversation_cbs
+cdef void chat_update_user (conversation.PurpleConversation *conv,
+                            const_char *user):
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "chat_update_user\n")
     try:
         (<object>conversation_cbs["chat_update_user"])("chat_update_user")
     except KeyError:
         pass
 
 cdef void present (conversation.PurpleConversation *conv):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "present\n")
-    global conversation_cbs
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "present\n")
     try:
         (<object>conversation_cbs["present"])("present")
     except KeyError:
         pass
 
 cdef glib.gboolean has_focus (conversation.PurpleConversation *conv):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "has_focus\n")
-    global conversation_cbs
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "has_focus\n")
     try:
         (<object>conversation_cbs["has_focus"])("has_focus")
         return False
@@ -129,8 +151,8 @@ cdef glib.gboolean has_focus (conversation.PurpleConversation *conv):
 
 cdef glib.gboolean custom_smiley_add (conversation.PurpleConversation *conv,
                                       const_char *smile, glib.gboolean remote):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "custom_smiley_add\n")
-    global conversation_cbs
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "custom_smiley_add\n")
     try:
         (<object>conversation_cbs["custom_smiley_add"])("custom_smiley_add")
         return False
@@ -140,7 +162,8 @@ cdef glib.gboolean custom_smiley_add (conversation.PurpleConversation *conv,
 cdef void custom_smiley_write (conversation.PurpleConversation *conv,
                                const_char *smile, const_guchar *data,
                                glib.gsize size):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "custom_smiley_write\n")
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "custom_smiley_write\n")
     try:
         (<object>conversation_cbs["custom_smiley_write"])("custom_smiley_write")
     except KeyError:
@@ -149,14 +172,17 @@ cdef void custom_smiley_write (conversation.PurpleConversation *conv,
 
 cdef void custom_smiley_close (conversation.PurpleConversation *conv,
                                const_char *smile):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "custom_smiley_close\n")
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "custom_smiley_close\n")
     try:
         (<object>conversation_cbs["custom_smiley_close"])("custom_smiley_close")
     except KeyError:
         pass
 
-cdef void send_confirm (conversation.PurpleConversation *conv, const_char *message):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "send_confirm\n")
+cdef void send_confirm (conversation.PurpleConversation *conv,
+                        const_char *message):
+    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation",
+                         "send_confirm\n")
     try:
         (<object>conversation_cbs["send_confirm"])("send_confirm")
     except KeyError:
Unnamed repository; edit this file to name it for gitweb.