From 1573bd38c9b67133e8db05196651f5e036329333 Mon Sep 17 00:00:00 2001 From: Ragner Magalhaes Date: Tue, 2 Dec 2008 21:05:57 +0000 Subject: [PATCH] Updated request_cbs.pxd. FIXES: - Replace try/except with has_key. - Added comments for each callback. - Cosmetics. Signed-off-by: Bruno Abinader git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1404 596f6dd7-e928-0410-a184-9e12fd12cf7e --- request_cbs.pxd | 142 +++++++++++++++++++++++++++---------------------------- 1 file changed, 69 insertions(+), 73 deletions(-) diff --git a/request_cbs.pxd b/request_cbs.pxd index 9c7c960..2c7b7ba 100644 --- a/request_cbs.pxd +++ b/request_cbs.pxd @@ -26,89 +26,85 @@ cdef extern from *: request_cbs = {} -cdef void *request_input (const_char *title, const_char *primary, - const_char *secondary, const_char *default_value, - glib.gboolean multiline, glib.gboolean masked, - glib.gchar *hint, const_char *ok_text, - glib.GCallback ok_cb, const_char *cancel_text, - glib.GCallback cancel_cb, - account.PurpleAccount *account, const_char *who, - conversation.PurpleConversation *conv, - void *user_data): +cdef void *request_input(const_char *title, const_char *primary, \ + const_char *secondary, const_char *default_value, \ + glib.gboolean multiline, glib.gboolean masked, glib.gchar *hint, \ + const_char *ok_text, glib.GCallback ok_cb, const_char *cancel_text, \ + glib.GCallback cancel_cb, \ + account.PurpleAccount *account, const_char *who, \ + conversation.PurpleConversation *conv, void *user_data): + """ + @see purple_request_input(). + """ debug.c_purple_debug_info("request", "%s", "request-input\n") - try: - (request_cbs["request-input"])("request-input: TODO") - except KeyError: - pass + if request_cbs.has_key("request-input"): + ( request_cbs["request-input"])("request-input: TODO") -cdef void *request_choice (const_char *title, const_char *primary, - const_char *secondary, int default_value, - const_char *ok_text, glib.GCallback ok_cb, - const_char *cancel_text, - glib.GCallback cancel_cb, - account.PurpleAccount *account, const_char *who, - conversation.PurpleConversation *conv, - void *user_data, va_list choices): +cdef void *request_choice(const_char *title, const_char *primary, \ + const_char *secondary, int default_value, const_char *ok_text, \ + glib.GCallback ok_cb, const_char *cancel_text, \ + glib.GCallback cancel_cb, account.PurpleAccount *account, \ + const_char *who, conversation.PurpleConversation *conv, \ + void *user_data, va_list choices): + """ + @see purple_request_choice_varg(). + """ debug.c_purple_debug_info("request", "%s", "request-choice\n") - try: - (request_cbs["request-choice"])("request-choice: TODO") - except KeyError: - pass + if request_cbs.has_key("request-choice"): + ( request_cbs["request-choice"])("request-choice: TODO") -cdef void *request_action (const_char *title, const_char *primary, - const_char *secondary, int default_action, - account.PurpleAccount *account, const_char *who, - conversation.PurpleConversation *conv, - void *user_data, size_t action_count, - va_list actions): +cdef void *request_action(const_char *title, const_char *primary, \ + const_char *secondary, int default_action, \ + account.PurpleAccount *account, const_char *who, \ + conversation.PurpleConversation *conv, void *user_data, \ + size_t action_count, va_list actions): + """ + @see purple_request_action_varg(). + """ debug.c_purple_debug_info("request", "%s", "request-action\n") - try: - (request_cbs["request-action"])("request-action: TODo") - except KeyError: - pass + if request_cbs.has_key("request-action"): + ( request_cbs["request-action"])("request-action: TODo") -cdef void *request_fields (const_char *title, const_char *primary, - const_char *secondary, - request.PurpleRequestFields *fields, - const_char *ok_text, glib.GCallback ok_cb, - const_char *cancel_text, glib.GCallback cancel_cb, - account.PurpleAccount *account, const_char *who, - conversation.PurpleConversation *conv, - void *user_data): +cdef void *request_fields(const_char *title, const_char *primary, \ + const_char *secondary, request.PurpleRequestFields *fields, \ + const_char *ok_text, glib.GCallback ok_cb, const_char *cancel_text, \ + glib.GCallback cancel_cb, account.PurpleAccount *account, \ + const_char *who, conversation.PurpleConversation *conv, \ + void *user_data): + """ + @see purple_request_fields(). + """ debug.c_purple_debug_info("request", "%s", "request-fields\n") - try: - (request_cbs["request-fields"])("request-fields: TODO") - except KeyError: - pass + if request_cbs.has_key("request-fields"): + ( request_cbs["request-fields"])("request-fields: TODO") -cdef void *request_file (const_char *title, const_char *filename, - glib.gboolean savedialog, glib.GCallback ok_cb, - glib.GCallback cancel_cb, - account.PurpleAccount *account, const_char *who, - conversation.PurpleConversation *conv, - void *user_data): +cdef void *request_file(const_char *title, const_char *filename, \ + glib.gboolean savedialog, glib.GCallback ok_cb, \ + glib.GCallback cancel_cb, account.PurpleAccount *account, \ + const_char *who, conversation.PurpleConversation *conv, \ + void *user_data): + """ + @see purple_request_file(). + """ debug.c_purple_debug_info("request", "%s", "request-file\n") - try: - (request_cbs["request-file"])("request-file: TODO") - except KeyError: - pass + if request_cbs.has_key("request-file"): + ( request_cbs["request-file"])("request-file: TODO") -cdef void close_request (request.PurpleRequestType type, void *ui_handle): +cdef void close_request(request.PurpleRequestType type, void *ui_handle): + """ + TODO + """ debug.c_purple_debug_info("request", "%s", "close-request\n") - try: - (request_cbs["close-request"])("close-request: TODO") - except KeyError: - pass + if request_cbs.has_key("close-request"): + ( request_cbs["close-request"])("close-request: TODO") -cdef void *request_folder (const_char *title, const_char *dirname, - glib.GCallback ok_cb, - glib.GCallback cancel_cb, - account.PurpleAccount *account, - const_char *who, - conversation.PurpleConversation *conv, - void *user_data): +cdef void *request_folder(const_char *title, const_char *dirname, \ + glib.GCallback ok_cb, glib.GCallback cancel_cb, \ + account.PurpleAccount *account, const_char *who, \ + conversation.PurpleConversation *conv, void *user_data): + """ + @see purple_request_folder(). + """ debug.c_purple_debug_info("request", "%s", "request-folder\n") - try: - (request_cbs["request-folder"])("request-folder: TODO") - except KeyError: - pass + if request_cbs.has_key("request-folder"): + ( request_cbs["request-folder"])("request-folder: TODO") -- 1.7.9.5