X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=signal_cbs.pxd;h=14a7434f1af712d04e5763ad80b655f046f9f6fc;hp=41ff95f32a7ecfabb670c9756f6bda3c83687e84;hb=8876038da92fb092bab29fdc149b536d0aea1264;hpb=4c0c79b5e686d123a21bd4b4cdc356782f0b24c8

diff --git a/signal_cbs.pxd b/signal_cbs.pxd
index 41ff95f..14a7434 100644
--- a/signal_cbs.pxd
+++ b/signal_cbs.pxd
@@ -21,44 +21,119 @@ cimport purple
 
 signal_cbs = {}
 
+cdef void signal_signed_on_cb (connection.PurpleConnection *gc, \
+                               glib.gpointer null):
+    cdef account.PurpleAccount *acc = connection.c_purple_connection_get_account(gc)
+    cdef char *c_username = NULL
+    cdef char *c_protocol_id = NULL
+
+    c_username = <char *> account.c_purple_account_get_username(acc)
+    if c_username == NULL:
+        username = None
+    else:
+        username = c_username
+
+    c_protocol_id = <char *> account.c_purple_account_get_protocol_id(acc)
+    if c_protocol_id == NULL:
+        protocol_id = None
+    else:
+        protocol_id = c_protocol_id
+
+    try:
+        (<object> signal_cbs["signed-on"])(username, protocol_id)
+    except KeyError:
+        pass
+
+cdef void signal_signed_off_cb (connection.PurpleConnection *gc, \
+                               glib.gpointer null):
+    cdef account.PurpleAccount *acc = connection.c_purple_connection_get_account(gc)
+    cdef char *c_username = NULL
+    cdef char *c_protocol_id = NULL
+
+    c_username = <char *> account.c_purple_account_get_username(acc)
+    if c_username == NULL:
+        username = None
+    else:
+        username = c_username
+
+    c_protocol_id = <char *> account.c_purple_account_get_protocol_id(acc)
+    if c_protocol_id == NULL:
+        protocol_id = None
+    else:
+        protocol_id = c_protocol_id
+
+    try:
+        (<object> signal_cbs["signed-off"])(username, protocol_id)
+    except KeyError:
+        pass
+
+cdef void signal_buddy_signed_on_cb (blist.PurpleBuddy *buddy):
+    cdef char *c_name = NULL
+    cdef char *c_alias = NULL
+
+    c_name = <char *> blist.c_purple_buddy_get_name(buddy)
+    if c_name == NULL:
+        name = None
+    else:
+        name = c_name
+
+    c_alias = <char *> blist.c_purple_buddy_get_alias_only(buddy)
+    if c_alias == NULL:
+        alias = None
+    else:
+        alias = c_alias
+
+    try:
+        (<object> signal_cbs["buddy-signed-on"])(name, alias)
+    except KeyError:
+        pass
+
 cdef void signal_buddy_signed_off_cb (blist.PurpleBuddy *buddy):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "signal",
-                         "buddy_signed_off\n")
+    cdef char *c_name = NULL
+    cdef char *c_alias = NULL
 
-    if buddy.server_alias:
-        name = buddy.server_alias
+    c_name = <char *> blist.c_purple_buddy_get_name(buddy)
+    if c_name == NULL:
+        name = None
     else:
-        if buddy.alias:
-            name = buddy.alias
-        else:
-            name = buddy.name
+        name = c_name
+
+    c_alias = <char *> blist.c_purple_buddy_get_alias_only(buddy)
+    if c_alias == NULL:
+        alias = None
+    else:
+        alias = c_alias
 
     try:
-        (<object>signal_cbs["buddy_signed_off"])(name)
+        (<object> signal_cbs["buddy-signed-off"])(name, alias)
     except KeyError:
         pass
 
 cdef glib.gboolean signal_receiving_im_msg_cb (account.PurpleAccount *account,
-                                        char **sender,
-                                        char **message,
-                                        conversation.PurpleConversation *conv,
-                                        conversation.PurpleMessageFlags *flags):
-    debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "signal",
-                         "receivinv_im_msg_cb\n")
-
+        char **sender, char **message, conversation.PurpleConversation *conv,
+        conversation.PurpleMessageFlags *flags):
     cdef blist.PurpleBuddy *buddy = blist.c_purple_find_buddy(account, sender[0])
+    cdef char *c_alias = NULL
 
-    if buddy.server_alias:
-        name = buddy.server_alias
+    c_alias = <char *> blist.c_purple_buddy_get_alias_only(buddy)
+    if c_alias == NULL:
+        alias = None
     else:
-        if buddy.alias:
-            name = buddy.alias
-        else:
-            name = buddy.name
+        alias = c_alias
 
-    stripped_msg = util.c_purple_markup_strip_html(message[0])
+    stripped = util.c_purple_markup_strip_html(message[0])
 
     try:
-        return (<object>signal_cbs["receiving_im_msg"])(sender[0], name, stripped_msg)
+        return (<object> signal_cbs["receiving-im-msg"])(sender[0], alias, stripped)
     except KeyError:
         return False
+
+cdef void jabber_receiving_xmlnode_cb (connection.PurpleConnection *gc,
+        xmlnode.xmlnode **packet, glib.gpointer null):
+
+    message = xmlnode.xmlnode_to_str(packet[0], NULL)
+
+    try:
+        (<object> signal_cbs["jabber-receiving-xmlnode"])(message)
+    except KeyError:
+        pass