From: Ragner Magalhaes Date: Tue, 2 Dec 2008 20:27:07 +0000 (+0000) Subject: More cosmetics. X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=commitdiff_plain;h=62769c0cf399d5f1755998dbeb62e81696634b7a;ds=sidebyside More cosmetics. FIXES: - Removed redundant global defintions. - Fixed identation. Signed-off-by: Bruno Abinader git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1305 596f6dd7-e928-0410-a184-9e12fd12cf7e --- diff --git a/account_cbs.pxd b/account_cbs.pxd index e0f767a..e2c2d7b 100644 --- a/account_cbs.pxd +++ b/account_cbs.pxd @@ -24,33 +24,44 @@ cdef extern from *: account_cbs = {} -cdef void notify_added (account.PurpleAccount *account, const_char *remote_user, const_char *id, const_char *alias, const_char *message): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "account", "notify_added\n") - global account_cbs +cdef void notify_added (account.PurpleAccount *account, + const_char *remote_user, const_char *id, + const_char *alias, const_char *message): + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "account", + "notify_added\n") try: (account_cbs["notify_added"])("notify_added") except KeyError: pass -cdef void status_changed (account.PurpleAccount *account, status.PurpleStatus *status): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "account", "status_changed\n") - global account_cbs +cdef void status_changed (account.PurpleAccount *account, + status.PurpleStatus *status): + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "account", + "status_changed\n") try: (account_cbs["status_changed"])("status_changed") except KeyError: pass -cdef void request_add (account.PurpleAccount *account, const_char *remote_user, const_char *id, const_char *alias, const_char *message): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "account", "request_add\n") - global account_cbs +cdef void request_add (account.PurpleAccount *account, + const_char *remote_user, const_char *id, + const_char *alias, const_char *message): + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "account", + "request_add\n") try: (account_cbs["request_add"])("request_add") except KeyError: pass -cdef void *request_authorize (account.PurpleAccount *account, const_char *remote_user, const_char *id, const_char *alias, const_char *message, glib.gboolean on_list, account.PurpleAccountRequestAuthorizationCb authorize_cb, account.PurpleAccountRequestAuthorizationCb deny_cb, void *user_data): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "account", "request_authorize\n") - global account_cbs +cdef void *request_authorize (account.PurpleAccount *account, + const_char *remote_user, const_char *id, + const_char *alias, const_char *message, + glib.gboolean on_list, + account.PurpleAccountRequestAuthorizationCb authorize_cb, + account.PurpleAccountRequestAuthorizationCb deny_cb, + void *user_data): + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "account", + "request_authorize\n") try: (account_cbs["request_authorize"])("request_authorize") return NULL @@ -58,8 +69,8 @@ cdef void *request_authorize (account.PurpleAccount *account, const_char *remote pass cdef void close_account_request (void *ui_handle): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "account", "close_account_request\n") - global account_cbs + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "account", + "close_account_request\n") try: (account_cbs["close_account_request"])("close_account_request") except KeyError: diff --git a/connection_cbs.pxd b/connection_cbs.pxd index ca39432..58b58ad 100644 --- a/connection_cbs.pxd +++ b/connection_cbs.pxd @@ -28,7 +28,6 @@ cdef void connect_progress (connection.PurpleConnection *gc, const_char *text, size_t step, size_t step_count): debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "connection", "connect_progress\n") - global connection_cbs try: (connection_cbs["connect_progress"])("connect_progress") except KeyError: @@ -37,7 +36,6 @@ cdef void connect_progress (connection.PurpleConnection *gc, const_char *text, cdef void connected (connection.PurpleConnection *gc): debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "connection", "connected\n") - global connection_cbs try: (connection_cbs["connected"])("connected") except KeyError: @@ -46,7 +44,6 @@ cdef void connected (connection.PurpleConnection *gc): cdef void disconnected (connection.PurpleConnection *gc): debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "connection", "disconnected\n") - global connection_cbs try: (connection_cbs["disconnected"])("disconnected") except KeyError: @@ -55,7 +52,6 @@ cdef void disconnected (connection.PurpleConnection *gc): cdef void notice (connection.PurpleConnection *gc, const_char *text): debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "connection", "notice\n") - global connection_cbs try: (connection_cbs["notice"])("notice") except KeyError: @@ -65,7 +61,6 @@ cdef void report_disconnect (connection.PurpleConnection *gc, const_char *text): debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "connection", "report_disconnect\n") - global connection_cbs try: (connection_cbs["report_disconnect"])("report_disconnect") except KeyError: @@ -74,7 +69,6 @@ cdef void report_disconnect (connection.PurpleConnection *gc, cdef void network_connected (): debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "connection", "network_connected\n") - global connection_cbs try: (connection_cbs["network_connected"])("network_connected") except KeyError: @@ -83,7 +77,6 @@ cdef void network_connected (): cdef void network_disconnected (): debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "connection", "network_disconnected\n") - global connection_cbs try: (connection_cbs["network_disconnected"])("network_disconnected") except KeyError: @@ -94,7 +87,6 @@ cdef void report_disconnect_reason (connection.PurpleConnection *gc, const_char *text): debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "connection", "report_disconnect_reason\n") - global connection_cbs try: (connection_cbs["report_disconnect_reason"])("report_disconnect_reason") except KeyError: diff --git a/conversation_cbs.pxd b/conversation_cbs.pxd index a0aa262..4688985 100644 --- a/conversation_cbs.pxd +++ b/conversation_cbs.pxd @@ -22,23 +22,21 @@ cimport purple cdef extern from *: ctypedef char const_char "const char" ctypedef glib.guchar const_guchar "const guchar" - -cdef extern from "time.h": ctypedef long int time_t conversation_cbs = {} cdef void create_conversation (conversation.PurpleConversation *conv): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "create_conversation\n") - global conversation_cbs + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "create_conversation\n") try: (conversation_cbs["create_conversation"])("create_conversation") except KeyError: pass cdef void destroy_conversation (conversation.PurpleConversation *conv): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "destroy_conversation\n") - global conversation_cbs + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "destroy_conversation\n") try: (conversation_cbs["destroy_conversation"])("destroy_conversation") except KeyError: @@ -47,8 +45,8 @@ cdef void destroy_conversation (conversation.PurpleConversation *conv): cdef void write_chat (conversation.PurpleConversation *conv, const_char *who, const_char *message, conversation.PurpleMessageFlags flags, time_t mtime): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "write_chat\n") - global conversation_cbs + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "write_chat\n") try: (conversation_cbs["write_chat"])("write_chat") except KeyError: @@ -58,7 +56,6 @@ cdef void write_im (conversation.PurpleConversation *conv, const_char *who, const_char *message, conversation.PurpleMessageFlags flags, time_t mtime): debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "write_im\n") - global conversation_cbs try: (conversation_cbs["write_im"])("write_im") except KeyError: @@ -67,8 +64,8 @@ cdef void write_im (conversation.PurpleConversation *conv, const_char *who, cdef void write_conv (conversation.PurpleConversation *conv, const_char *name, const_char *alias, const_char *message, conversation.PurpleMessageFlags flags, time_t mtime): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "write_conv\n") - global conversation_cbs + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "write_conv\n") try: (conversation_cbs["write_conv"])("write_conv") except KeyError: @@ -76,8 +73,8 @@ cdef void write_conv (conversation.PurpleConversation *conv, const_char *name, cdef void chat_add_users (conversation.PurpleConversation *conv, glib.GList *cbuddies, glib.gboolean new_arrivals): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "chat_add_users\n") - global conversation_cbs + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "chat_add_users\n") try: (conversation_cbs["chat_add_users"])("chat_add_users") except KeyError: @@ -86,8 +83,8 @@ cdef void chat_add_users (conversation.PurpleConversation *conv, cdef void chat_rename_user (conversation.PurpleConversation *conv, const_char *old_name, const_char *new_name, const_char *new_alias): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "chat_rename_user\n") - global conversation_cbs + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "chat_rename_user\n") try: (conversation_cbs["chat_rename_user"])("chat_rename_user") except KeyError: @@ -95,32 +92,33 @@ cdef void chat_rename_user (conversation.PurpleConversation *conv, cdef void chat_remove_users (conversation.PurpleConversation *conv, glib.GList *users): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "chat_remove_users\n") - global conversation_cbs + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "chat_remove_users\n") try: (conversation_cbs["chat_remove_users"])("chat_remove_users") except KeyError: pass -cdef void chat_update_user (conversation.PurpleConversation *conv, const_char *user): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "chat_update_user\n") - global conversation_cbs +cdef void chat_update_user (conversation.PurpleConversation *conv, + const_char *user): + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "chat_update_user\n") try: (conversation_cbs["chat_update_user"])("chat_update_user") except KeyError: pass cdef void present (conversation.PurpleConversation *conv): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "present\n") - global conversation_cbs + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "present\n") try: (conversation_cbs["present"])("present") except KeyError: pass cdef glib.gboolean has_focus (conversation.PurpleConversation *conv): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "has_focus\n") - global conversation_cbs + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "has_focus\n") try: (conversation_cbs["has_focus"])("has_focus") return False @@ -129,8 +127,8 @@ cdef glib.gboolean has_focus (conversation.PurpleConversation *conv): cdef glib.gboolean custom_smiley_add (conversation.PurpleConversation *conv, const_char *smile, glib.gboolean remote): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "custom_smiley_add\n") - global conversation_cbs + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "custom_smiley_add\n") try: (conversation_cbs["custom_smiley_add"])("custom_smiley_add") return False @@ -140,7 +138,8 @@ cdef glib.gboolean custom_smiley_add (conversation.PurpleConversation *conv, cdef void custom_smiley_write (conversation.PurpleConversation *conv, const_char *smile, const_guchar *data, glib.gsize size): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "custom_smiley_write\n") + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "custom_smiley_write\n") try: (conversation_cbs["custom_smiley_write"])("custom_smiley_write") except KeyError: @@ -149,14 +148,17 @@ cdef void custom_smiley_write (conversation.PurpleConversation *conv, cdef void custom_smiley_close (conversation.PurpleConversation *conv, const_char *smile): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "custom_smiley_close\n") + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "custom_smiley_close\n") try: (conversation_cbs["custom_smiley_close"])("custom_smiley_close") except KeyError: pass -cdef void send_confirm (conversation.PurpleConversation *conv, const_char *message): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", "send_confirm\n") +cdef void send_confirm (conversation.PurpleConversation *conv, + const_char *message): + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "conversation", + "send_confirm\n") try: (conversation_cbs["send_confirm"])("send_confirm") except KeyError: diff --git a/purple.pyx b/purple.pyx index 4738762..b02c69c 100644 --- a/purple.pyx +++ b/purple.pyx @@ -28,11 +28,16 @@ __DEFAULT_PATH__ = "/tmp" __APP_NAME__ = "carman-purple-python" __APP_VERSION__ = "0.1" -cdef core.PurpleCoreUiOps c_core_ui_ops cdef account.PurpleAccountUiOps c_account_ui_ops +#cdef blist.PurpleBlistUiOps c_blist_ui_ops cdef connection.PurpleConnectionUiOps c_conn_ui_ops cdef conversation.PurpleConversationUiOps c_conv_ui_ops +cdef core.PurpleCoreUiOps c_core_ui_ops cdef eventloop.PurpleEventLoopUiOps c_eventloop_ui_ops +#cdef ft.PurpleXferUiOps c_ft_ui_ops +#cdef notify.PurpleNotifyUiOps c_notify_ui_ops +#cdef request.PurpleRequestUiOps c_request_ui_ops +#cdef roomlist.PurpleRoomlistUiOps c_rlist_ui_ops cdef glib.GHashTable *c_ui_info @@ -79,9 +84,6 @@ cdef class Purple: cdef void __core_ui_ops_ui_init(self): debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "ui_init\n") - global c_account_ui_ops - global c_conv_ui_ops - account.c_purple_accounts_set_ui_ops(&c_account_ui_ops) connection.c_purple_connections_set_ui_ops(&c_conn_ui_ops) #blist.c_purple_blist_set_ui_ops(&c_blist_ui_ops) @@ -125,12 +127,6 @@ cdef class Purple: def purple_init(self, callbacks_dict=None): """ Initializes libpurple """ - global c_account_ui_ops - global c_conn_ui_ops - global c_conv_ui_ops - global c_core_ui_ops - global c_eventloop_ui_ops - if callbacks_dict is not None: global account_cbs global connection_cbs