X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=account_cbs.pxd;h=06cd2cafd0586be0de017eb7c76244aee63333f4;hp=e6bdee8c5cd1656c34480de9e3d234e9d3a75ed0;hb=refs%2Fheads%2Fmaster;hpb=8c0353cd18905a1e49fc3116b5a98b319ba3a380

diff --git a/account_cbs.pxd b/account_cbs.pxd
index e6bdee8..06cd2ca 100644
--- a/account_cbs.pxd
+++ b/account_cbs.pxd
@@ -17,8 +17,6 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-cimport purple
-
 cdef extern from *:
     ctypedef char const_char "const char"
 
@@ -58,7 +56,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,10 +79,10 @@ 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 *c_account, \
         status.PurpleStatus *c_status):
@@ -99,9 +97,9 @@ cdef void status_changed(account.PurpleAccount *c_account, \
     status_id = status.purple_status_get_id(c_status)
     status_name = status.purple_status_get_name(c_status)
 
-    if account_cbs.has_key("status-changed"):
+    if "status-changed" in account_cbs:
         (<object> account_cbs["status-changed"])( \
-                (username, protocol_id), status_id, status_name)
+            (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, \
@@ -133,10 +131,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, \
@@ -182,12 +180,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):
     """
@@ -198,5 +196,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"])()