From 824a5557c0aac16a1bde0f1c20505ace55f7805e Mon Sep 17 00:00:00 2001
From: Ragner Magalhaes <ragner.magalhaes@openbossa.org>
Date: Tue, 2 Dec 2008 21:01:34 +0000
Subject: [PATCH] Added sender alias to write-im callback.

FIXES:
 - Added sender alias to write-im callback.

Signed-off-by: Bruno Abinader <bruno.abinader@indt.org.br>

git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1391 596f6dd7-e928-0410-a184-9e12fd12cf7e
---
 conversation_cbs.pxd |   24 +++++++++++++++++++-----
 nullclient-ecore.py  |    4 ++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/conversation_cbs.pxd b/conversation_cbs.pxd
index 1a4aefe..b230d81 100644
--- a/conversation_cbs.pxd
+++ b/conversation_cbs.pxd
@@ -63,25 +63,39 @@ cdef void write_chat (conversation.PurpleConversation *conv, const_char *who,
         pass
 
 cdef void write_im (conversation.PurpleConversation *conv, const_char *who,
-                    const_char *message, conversation.PurpleMessageFlags flags,
+                    const_char *c_message, conversation.PurpleMessageFlags flags,
                     time_t mtime):
     debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "write-im\n")
     cdef account.PurpleAccount *acc = conversation.c_purple_conversation_get_account(conv)
+    cdef blist.PurpleBuddy *buddy = blist.c_purple_find_buddy(acc, <char *> who)
     cdef char *c_username = NULL
+    cdef char *c_sender_alias = NULL
 
     c_username = <char *> account.c_purple_account_get_username(acc)
-    if c_username == NULL:
-        username = None
-    else:
+    if c_username:
         username = c_username
+    else:
+        username = None
 
     if who:
         sender = <char *> who
+        c_sender_alias = <char *> blist.c_purple_buddy_get_alias_only(buddy)
     else:
         sender = None
 
+    if c_sender_alias:
+        sender_alias = c_sender_alias
+    else:
+        sender_alias = None
+
+    if c_message:
+        message = <char *> c_message
+    else:
+        message = None
+
     try:
-        (<object>conversation_cbs["write-im"])(username, sender, <char *> message)
+        (<object>conversation_cbs["write-im"])(username, sender, \
+                                               sender_alias, message)
     except KeyError:
         pass
 
diff --git a/nullclient-ecore.py b/nullclient-ecore.py
index fa7b1cd..4691910 100644
--- a/nullclient-ecore.py
+++ b/nullclient-ecore.py
@@ -192,12 +192,12 @@ class NullClientPurple(object):
         if self.window:
             self.window.lstatus.text = "Disconnected"
 
-    def __purple_write_im_cb(self, sender, alias, message):
+    def __purple_write_im_cb(self, username, name, alias, message):
         if self.window:
             if alias:
                 self.window.txt_area.text += alias + ": " + message + "<br> "
             else:
-                self.window.txt_area.text += sender + ": " + message + "<br> "
+                self.window.txt_area.text += name + ": " + message + "<br> "
             self.window.show()
 
     def __purple_signal_signed_on_cb(self, username, protocol_id):
-- 
1.7.9.5