X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=signal_cbs.pxd;h=14a7434f1af712d04e5763ad80b655f046f9f6fc;hp=64c66d18e9fbbc3f22225072b735257abdf19b47;hb=8876038da92fb092bab29fdc149b536d0aea1264;hpb=663e1ae7b7cea174e57405cde0018bf4a9e20bf8 diff --git a/signal_cbs.pxd b/signal_cbs.pxd index 64c66d1..14a7434 100644 --- a/signal_cbs.pxd +++ b/signal_cbs.pxd @@ -21,16 +21,91 @@ 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 = account.c_purple_account_get_username(acc) + if c_username == NULL: + username = None + else: + username = c_username + + c_protocol_id = account.c_purple_account_get_protocol_id(acc) + if c_protocol_id == NULL: + protocol_id = None + else: + protocol_id = c_protocol_id + + try: + ( 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 = account.c_purple_account_get_username(acc) + if c_username == NULL: + username = None + else: + username = c_username + + c_protocol_id = account.c_purple_account_get_protocol_id(acc) + if c_protocol_id == NULL: + protocol_id = None + else: + protocol_id = c_protocol_id + + try: + ( 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 = blist.c_purple_buddy_get_name(buddy) + if c_name == NULL: + name = None + else: + name = c_name + + c_alias = blist.c_purple_buddy_get_alias_only(buddy) + if c_alias == NULL: + alias = None + else: + alias = c_alias + + try: + ( signal_cbs["buddy-signed-on"])(name, alias) + except KeyError: + pass + cdef void signal_buddy_signed_off_cb (blist.PurpleBuddy *buddy): - if buddy.server_alias: - name = buddy.server_alias - elif buddy.alias: - name = buddy.alias + cdef char *c_name = NULL + cdef char *c_alias = NULL + + c_name = blist.c_purple_buddy_get_name(buddy) + if c_name == NULL: + name = None + else: + name = c_name + + c_alias = blist.c_purple_buddy_get_alias_only(buddy) + if c_alias == NULL: + alias = None else: - name = buddy.name + alias = c_alias try: - ( signal_cbs["buddy-signed-off"])(name, buddy.name) + ( signal_cbs["buddy-signed-off"])(name, alias) except KeyError: pass @@ -38,18 +113,18 @@ cdef glib.gboolean signal_receiving_im_msg_cb (account.PurpleAccount *account, 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 - elif buddy.alias: - name = buddy.alias + c_alias = blist.c_purple_buddy_get_alias_only(buddy) + if c_alias == NULL: + alias = None else: - name = buddy.name + alias = c_alias stripped = util.c_purple_markup_strip_html(message[0]) try: - return ( signal_cbs["receiving-im-msg"])(sender[0], name, stripped) + return ( signal_cbs["receiving-im-msg"])(sender[0], alias, stripped) except KeyError: return False