X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=account_cbs.pxd;h=2d8bf6836a1fadf66b63216a954eeb71926d4856;hp=d314040f6d910f5b602849b07a4b752396334bd6;hb=c2951f59ada56c74f666f005abd656d81e296593;hpb=7b635b4096c7de4b55ac0026be6b49be85f453a1

diff --git a/account_cbs.pxd b/account_cbs.pxd
index d314040..2d8bf68 100644
--- a/account_cbs.pxd
+++ b/account_cbs.pxd
@@ -58,7 +58,7 @@ cdef void notify_added(account.PurpleAccount *c_account, \
     their buddy list.
     """
     cdef connection.PurpleConnection *gc = \
-            account.purple_account_get_connection(c_account)
+        account.purple_account_get_connection(c_account)
 
     debug.purple_debug_info("account", "%s", "notify-added\n")
 
@@ -81,19 +81,27 @@ cdef void notify_added(account.PurpleAccount *c_account, \
     else:
         message = None
 
-    if account_cbs.has_key("notify-added"):
+    if "notify-added" in account_cbs:
         (<object> account_cbs["notify-added"])( \
-                (<char *> remote_user, remote_alias), \
-                (username, protocol_id), message)
+            (<char *> remote_user, remote_alias), \
+            (username, protocol_id), message)
 
-cdef void status_changed(account.PurpleAccount *account, \
-        status.PurpleStatus *status):
+cdef void status_changed(account.PurpleAccount *c_account, \
+        status.PurpleStatus *c_status):
     """
     This account's status changed.
     """
     debug.purple_debug_info("account", "%s", "status-changed\n")
-    if account_cbs.has_key("status-changed"):
-        (<object> account_cbs["status-changed"])("status-changed: TODO")
+
+    username = account.purple_account_get_username(c_account)
+    protocol_id = account.purple_account_get_protocol_id(c_account)
+
+    status_id = status.purple_status_get_id(c_status)
+    status_name = status.purple_status_get_name(c_status)
+
+    if "status-changed" in account_cbs:
+        (<object> account_cbs["status-changed"])( \
+            (username, protocol_id), status_id, status_name)
 
 cdef void request_add(account.PurpleAccount *c_account, \
         const_char *remote_user, const_char *id, const_char *alias, \
@@ -125,10 +133,10 @@ cdef void request_add(account.PurpleAccount *c_account, \
     else:
         message = None
 
-    if account_cbs.has_key("request-add"):
+    if "request-add" in account_cbs:
         (<object> account_cbs["request-add"])( \
-                (<char *> remote_user, remote_alias), \
-                (username, protocol_id), message)
+            (<char *> remote_user, remote_alias), \
+            (username, protocol_id), message)
 
 cdef void *request_authorize(account.PurpleAccount *c_account, \
         const_char *remote_user, const_char *id, const_char *alias, \
@@ -174,12 +182,12 @@ cdef void *request_authorize(account.PurpleAccount *c_account, \
     else:
         message = None
 
-    if account_cbs.has_key("request-authorize"):
+    if "request-authorize" in account_cbs:
         (<object> account_cbs["request-authorize"])( \
-                (<char *> remote_user, remote_alias), \
-                (username, protocol_id), \
-                message, on_list, \
-                call_authorize_cb, call_deny_cb)
+            (<char *> remote_user, remote_alias), \
+            (username, protocol_id), \
+            message, on_list, \
+            call_authorize_cb, call_deny_cb)
 
 cdef void close_account_request (void *ui_handle):
     """
@@ -190,5 +198,5 @@ cdef void close_account_request (void *ui_handle):
 
     request.purple_request_close(request.PURPLE_REQUEST_ACTION, ui_handle)
 
-    if account_cbs.has_key("close-account-request"):
+    if "close-account-request" in account_cbs:
         (<object> account_cbs["close-account-request"])()