From: Ragner Magalhaes Date: Tue, 2 Dec 2008 21:09:27 +0000 (+0000) Subject: Removed aliases for C-libpurple functions. X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=commitdiff_plain;h=e2eef524bf0c883406b15674eac0769c017d35c6 Removed aliases for C-libpurple functions. FIXES: - Removed aliases for C-libpurple functions from debug and util. - Updated function names inside *_cbs.pxd. Signed-off-by: Bruno Abinader Acked-by: Ragner Magalhaes git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1413 596f6dd7-e928-0410-a184-9e12fd12cf7e --- diff --git a/account_cbs.pxd b/account_cbs.pxd index 904a358..4f2e4be 100644 --- a/account_cbs.pxd +++ b/account_cbs.pxd @@ -31,7 +31,7 @@ cdef void notify_added(account.PurpleAccount *account, \ A buddy who is already on this account's buddy list added this account to their buddy list. """ - debug.c_purple_debug_info("account", "%s", "notify-added\n") + debug.purple_debug_info("account", "%s", "notify-added\n") if account_cbs.has_key("notify-added"): ( account_cbs["notify-added"])("notify-added: TODO") @@ -40,7 +40,7 @@ cdef void status_changed(account.PurpleAccount *account, \ """ This account's status changed. """ - debug.c_purple_debug_info("account", "%s", "status-changed\n") + debug.purple_debug_info("account", "%s", "status-changed\n") if account_cbs.has_key("status-changed"): ( account_cbs["status-changed"])("status-changed: TODO") @@ -50,7 +50,7 @@ cdef void request_add(account.PurpleAccount *account, \ """ Someone we don't have on our list added us; prompt to add them. """ - debug.c_purple_debug_info("account", "%s", "request-add\n") + debug.purple_debug_info("account", "%s", "request-add\n") if account_cbs.has_key("request-add"): ( account_cbs["request-add"])("request-add: TODO") @@ -66,7 +66,7 @@ cdef void *request_authorize(account.PurpleAccount *account, \ authorize_cb(user_data) otherwise call deny_cb(user_data). @return a UI-specific handle, as passed to #close_account_request. """ - debug.c_purple_debug_info("account", "%s", "request-authorize\n") + debug.purple_debug_info("account", "%s", "request-authorize\n") if account_cbs.has_key("request-authorize"): ( account_cbs["request-authorize"])("request-authorize: TODO") @@ -75,6 +75,6 @@ cdef void close_account_request (void *ui_handle): Close a pending request for authorization. ui_handle is a handle as returned by request_authorize. """ - debug.c_purple_debug_info("account", "%s", "close-account-request\n") + debug.purple_debug_info("account", "%s", "close-account-request\n") if account_cbs.has_key("close-account-request"): ( account_cbs["close-account-request"])("close-account-request: TODO") diff --git a/blist_cbs.pxd b/blist_cbs.pxd index 7031426..3622ce1 100644 --- a/blist_cbs.pxd +++ b/blist_cbs.pxd @@ -91,7 +91,7 @@ cdef void new_list(blist.PurpleBuddyList *list): """ Sets UI-specific data on a buddy list. """ - debug.c_purple_debug_info("blist", "%s", "new-list\n") + debug.purple_debug_info("blist", "%s", "new-list\n") if blist_cbs.has_key("new-list"): ( blist_cbs["new-list"])("new-list: TODO") @@ -99,7 +99,7 @@ cdef void new_node(blist.PurpleBlistNode *node): """ Sets UI-specific data on a node. """ - debug.c_purple_debug_info("blist", "%s", "new-node\n") + debug.purple_debug_info("blist", "%s", "new-node\n") if blist_cbs.has_key("new-node"): if node.type == blist.PURPLE_BLIST_GROUP_NODE: __group_node_cb(node, blist_cbs["new-node"]) @@ -116,7 +116,7 @@ cdef void show(blist.PurpleBuddyList *list): """ The core will call this when it's finished doing its core stuff. """ - debug.c_purple_debug_info("blist", "%s", "show\n") + debug.purple_debug_info("blist", "%s", "show\n") if blist_cbs.has_key("show"): ( blist_cbs["show"])("show: TODO") @@ -124,7 +124,7 @@ cdef void update(blist.PurpleBuddyList *list, blist.PurpleBlistNode *node): """ This will update a node in the buddy list. """ - debug.c_purple_debug_info("blist", "%s", "update\n") + debug.purple_debug_info("blist", "%s", "update\n") if blist_cbs.has_key("update"): if node.type == blist.PURPLE_BLIST_GROUP_NODE: __group_node_cb(node, blist_cbs["update"]) @@ -141,7 +141,7 @@ cdef void remove(blist.PurpleBuddyList *list, blist.PurpleBlistNode *node): """ This removes a node from the list. """ - debug.c_purple_debug_info("blist", "%s", "remove\n") + debug.purple_debug_info("blist", "%s", "remove\n") if blist_cbs.has_key("remove"): if node.type == blist.PURPLE_BLIST_GROUP_NODE: __group_node_cb(node, blist_cbs["remove"]) @@ -158,7 +158,7 @@ cdef void destroy(blist.PurpleBuddyList *list): """ When the list gets destroyed, this gets called to destroy the UI. """ - debug.c_purple_debug_info("blist", "%s", "destroy\n") + debug.purple_debug_info("blist", "%s", "destroy\n") if blist_cbs.has_key("destroy"): ( blist_cbs["destroy"])("destroy: TODO") @@ -166,7 +166,7 @@ cdef void set_visible(blist.PurpleBuddyList *list, glib.gboolean show): """ Hides or unhides the buddy list. """ - debug.c_purple_debug_info("blist", "%s", "set-visible\n") + debug.purple_debug_info("blist", "%s", "set-visible\n") if blist_cbs.has_key("set-visible"): ( blist_cbs["set-visible"])("set-visible: TODO") @@ -175,7 +175,7 @@ cdef void request_add_buddy(account.PurpleAccount *acc, \ """ TODO """ - debug.c_purple_debug_info("blist", "%s", "request-add-buddy\n") + debug.purple_debug_info("blist", "%s", "request-add-buddy\n") if blist_cbs.has_key("request-add-buddy"): ( blist_cbs["request-add-buddy"])("request-add-buddy: TODO") @@ -184,7 +184,7 @@ cdef void request_add_chat(account.PurpleAccount *acc, \ """ TODO """ - debug.c_purple_debug_info("blist", "%s", "request-add-chat\n") + debug.purple_debug_info("blist", "%s", "request-add-chat\n") if blist_cbs.has_key("request-add-chat"): ( blist_cbs["request-add-chat"])("request-add-chat: TODO") @@ -192,6 +192,6 @@ cdef void request_add_group(): """ TODO """ - debug.c_purple_debug_info("blist", "%s", "request-add-group\n") + debug.purple_debug_info("blist", "%s", "request-add-group\n") if blist_cbs.has_key("request-add-chat"): (blist_cbs["request-add-chat"])("request-add-group: TODO") diff --git a/connection_cbs.pxd b/connection_cbs.pxd index b30016e..463b17a 100644 --- a/connection_cbs.pxd +++ b/connection_cbs.pxd @@ -34,7 +34,7 @@ cdef void connect_progress(connection.PurpleConnection *gc, const_char *text, \ of what is happening, as well as which a step out of step_count has been reached (which might be displayed as a progress bar). """ - debug.c_purple_debug_info("connection", "%s", "connect-progress\n") + debug.purple_debug_info("connection", "%s", "connect-progress\n") if connection_cbs.has_key("connect-progress"): ( connection_cbs["connect-progress"])( text, step, step_count) @@ -42,7 +42,7 @@ cdef void connected(connection.PurpleConnection *gc): """ Called when a connection is established (just before the signed-on signal). """ - debug.c_purple_debug_info("connection", "%s", "connected\n") + debug.purple_debug_info("connection", "%s", "connected\n") if connection_cbs.has_key("connected"): ( connection_cbs["connected"])("connected: TODO") @@ -51,7 +51,7 @@ cdef void disconnected(connection.PurpleConnection *gc): Called when a connection is ended (between the signing-off and signed-off signal). """ - debug.c_purple_debug_info("connection", "%s", "disconnected\n") + debug.purple_debug_info("connection", "%s", "disconnected\n") if connection_cbs.has_key("disconnected"): ( connection_cbs["disconnected"])("disconnected: TODO") @@ -61,7 +61,7 @@ cdef void notice(connection.PurpleConnection *gc, const_char *text): implements this as a no-op; purple_connection_notice(), which uses this operation, is not used by any of the protocols shipped with libpurple.) """ - debug.c_purple_debug_info("connection", "%s", "notice\n") + debug.purple_debug_info("connection", "%s", "notice\n") if connection_cbs.has_key("notice"): ( connection_cbs["notice"])("notice: TODO") @@ -74,7 +74,7 @@ cdef void report_disconnect(connection.PurpleConnection *gc, const_char *text): @deprecated in favour of PurpleConnectionUiOps.report_disconnect_reason. """ - debug.c_purple_debug_info("connection", "%s", "report-disconnect\n") + debug.purple_debug_info("connection", "%s", "report-disconnect\n") if connection_cbs.has_key("report-disconnect"): ( connection_cbs["report-disconnect"])( text) @@ -84,7 +84,7 @@ cdef void network_connected(): is active. On Linux, this uses Network Manager if available; on Windows, it uses Win32's network change notification infrastructure. """ - debug.c_purple_debug_info("connection", "%s", "network-connected\n") + debug.purple_debug_info("connection", "%s", "network-connected\n") if connection_cbs.has_key("network-connected"): ( connection_cbs["network-connected"])() @@ -93,7 +93,7 @@ cdef void network_disconnected(): Called when libpurple discovers that the computer's network connection has gone away. """ - debug.c_purple_debug_info("connection", "%s", "network-disconnected\n") + debug.purple_debug_info("connection", "%s", "network-disconnected\n") if connection_cbs.has_key("network-disconnected"): ( connection_cbs["network-disconnected"])() @@ -111,7 +111,7 @@ cdef void report_disconnect_reason(connection.PurpleConnection *gc, \ @see purple_connection_error_reason @since 2.3.0 """ - debug.c_purple_debug_info("connection", "%s", "report-disconnect-reason\n") + debug.purple_debug_info("connection", "%s", "report-disconnect-reason\n") reason_string = { 0: 'Network error', diff --git a/conversation_cbs.pxd b/conversation_cbs.pxd index 731eaa1..1d0c76a 100644 --- a/conversation_cbs.pxd +++ b/conversation_cbs.pxd @@ -31,7 +31,7 @@ cdef void create_conversation(conversation.PurpleConversation *conv): Called when a conv is created (but before the conversation-created signal is emitted). """ - debug.c_purple_debug_info("conversation", "%s", "create-conversation\n") + debug.purple_debug_info("conversation", "%s", "create-conversation\n") cdef char *c_name = NULL c_name = conversation.c_purple_conversation_get_name(conv) @@ -49,7 +49,7 @@ cdef void destroy_conversation(conversation.PurpleConversation *conv): """ Called just before a conv is freed. """ - debug.c_purple_debug_info("conversation", "%s", "destroy-conversation\n") + debug.purple_debug_info("conversation", "%s", "destroy-conversation\n") if conversation_cbs.has_key("destroy-conversation"): ( conversation_cbs["destroy-conversation"])("destroy-conversation: TODO") @@ -61,7 +61,7 @@ cdef void write_chat(conversation.PurpleConversation *conv, const_char *who, \ back to using write_conv. @see purple_conv_chat_write() """ - debug.c_purple_debug_info("conversation", "%s", "write-chat\n") + debug.purple_debug_info("conversation", "%s", "write-chat\n") if conversation_cbs.has_key("write-chat"): ( conversation_cbs["write-chat"])("write-chat: TODO") @@ -73,7 +73,7 @@ cdef void write_im(conversation.PurpleConversation *conv, const_char *who, \ will fall back to using write_conv. @see purple_conv_im_write() """ - debug.c_purple_debug_info("conversation", "%s", "write-im\n") + debug.purple_debug_info("conversation", "%s", "write-im\n") cdef account.PurpleAccount *acc = conversation.c_purple_conversation_get_account(conv) cdef blist.PurpleBuddy *buddy = NULL cdef char *c_username = NULL @@ -117,7 +117,7 @@ cdef void write_conv(conversation.PurpleConversation *conv, const_char *name, \ and your users will hate you. @see purple_conversation_write() """ - debug.c_purple_debug_info("conversation", "%s", "write-conv\n") + debug.purple_debug_info("conversation", "%s", "write-conv\n") if conversation_cbs.has_key("write-conv"): ( conversation_cbs["write-conv"])("write-conv: TODO") @@ -131,7 +131,7 @@ cdef void chat_add_users(conversation.PurpleConversation *conv, \ conversation by purple_conv_chat_add_users().) @see purple_conv_chat_add_users() """ - debug.c_purple_debug_info("conversation", "%s", "chat-add-users\n") + debug.purple_debug_info("conversation", "%s", "chat-add-users\n") if conversation_cbs.has_key("chat-add-users"): ( conversation_cbs["chat-add-users"])("chat-add-users: TODO") @@ -144,7 +144,7 @@ cdef void chat_rename_user(conversation.PurpleConversation *conv, \ @param new_alias new_name's new_alias, if they have one. @see purple_conv_chat_rename_user() """ - debug.c_purple_debug_info("conversation", "%s", "chat-rename-user\n") + debug.purple_debug_info("conversation", "%s", "chat-rename-user\n") if conversation_cbs.has_key("chat-rename-user"): ( conversation_cbs["chat-rename-user"])("chat-rename-user: TODO") @@ -154,7 +154,7 @@ cdef void chat_remove_users(conversation.PurpleConversation *conv, \ Remove users from a chat. @param users A GList of const char *s. """ - debug.c_purple_debug_info("conversation", "%s", "chat-remove-users\n") + debug.purple_debug_info("conversation", "%s", "chat-remove-users\n") if conversation_cbs.has_key("chat-remove-users"): ( conversation_cbs["chat-remove-users"])("chat-remove-users: TODO") @@ -164,7 +164,7 @@ cdef void chat_update_user(conversation.PurpleConversation *conv, \ Called when a user's flags are changed. @see purple_conv_chat_user_set_flags() """ - debug.c_purple_debug_info("conversation", "%s", "chat-update-user\n") + debug.purple_debug_info("conversation", "%s", "chat-update-user\n") if conversation_cbs.has_key("chat-update-user"): ( conversation_cbs["chat-update-user"])("chat-update-user: TODO") @@ -173,7 +173,7 @@ cdef void present(conversation.PurpleConversation *conv): Present this conversation to the user; for example, by displaying the IM dialog. """ - debug.c_purple_debug_info("conversation", "%s", "present\n") + debug.purple_debug_info("conversation", "%s", "present\n") if conversation_cbs.has_key("present"): ( conversation_cbs["present"])("present: TODO") @@ -182,7 +182,7 @@ cdef glib.gboolean has_focus(conversation.PurpleConversation *conv): If this UI has a concept of focus (as in a windowing system) and this conversation has the focus, return TRUE; otherwise, return FALSE. """ - debug.c_purple_debug_info("conversation", "%s", "has-focus\n") + debug.purple_debug_info("conversation", "%s", "has-focus\n") if conversation_cbs.has_key("has-focus"): ( conversation_cbs["has-focus"])("has-focus: TODO") return False @@ -192,7 +192,7 @@ cdef glib.gboolean custom_smiley_add(conversation.PurpleConversation *conv, \ """ Custom smileys (add). """ - debug.c_purple_debug_info("conversation", "%s", "custom-smiley-add\n") + debug.purple_debug_info("conversation", "%s", "custom-smiley-add\n") if conversation_cbs.has_key("custom-smiley-add"): ( conversation_cbs["custom-smiley-add"])("custom-smiley-add: TODO") return False @@ -202,7 +202,7 @@ cdef void custom_smiley_write(conversation.PurpleConversation *conv, \ """ Custom smileys (write). """ - debug.c_purple_debug_info("conversation", "%s", "custom-smiley-write\n") + debug.purple_debug_info("conversation", "%s", "custom-smiley-write\n") if conversation_cbs.has_key("custom-smiley-write"): ( conversation_cbs["custom-smiley-write"])("custom-smiley-write: TODO") @@ -211,7 +211,7 @@ cdef void custom_smiley_close(conversation.PurpleConversation *conv, \ """ Custom smileys (close). """ - debug.c_purple_debug_info("conversation", "%s", "custom-smiley-close\n") + debug.purple_debug_info("conversation", "%s", "custom-smiley-close\n") if conversation_cbs.has_key("custom-smiley-close"): ( conversation_cbs["custom-smiley-close"])("custom-smiley-close: TODO") @@ -222,6 +222,6 @@ cdef void send_confirm(conversation.PurpleConversation *conv, \ arrange for the message to be sent if the user accepts. If this field is NULL, libpurple will fall back to using purple_request_action(). """ - debug.c_purple_debug_info("conversation", "%s", "send-confirm\n") + debug.purple_debug_info("conversation", "%s", "send-confirm\n") if conversation_cbs.has_key("send-confirm"): ( conversation_cbs["send-confirm"])("send-confirm: TODO") diff --git a/libpurple/debug.pxd b/libpurple/debug.pxd index 751ed67..3ea5179 100644 --- a/libpurple/debug.pxd +++ b/libpurple/debug.pxd @@ -21,6 +21,7 @@ cimport glib cdef extern from "libpurple/debug.h": + # Debug levels ctypedef enum PurpleDebugLevel: PURPLE_DEBUG_ALL = 0 PURPLE_DEBUG_MISC @@ -29,19 +30,30 @@ cdef extern from "libpurple/debug.h": PURPLE_DEBUG_ERROR PURPLE_DEBUG_FATAL - void c_purple_debug "purple_debug" (PurpleDebugLevel level, \ - char *category, char *format_type, char *format) - void c_purple_debug_misc "purple_debug_misc" (char *category, \ - char *format_type, char *format) - void c_purple_debug_info "purple_debug_info" (char *category, \ - char *format_type, char *format) - void c_purple_debug_warning "purple_debug_warning" (char *category, \ - char *format_type, char *format) - void c_purple_debug_error "purple_debug_error" (char *category, \ - char *format_type, char *format) - void c_purple_debug_fatal "purple_debug_fatal" (char *category, \ + # Debug UI operations FIXME + #ctypedef struct PurpleDebugUiOps: + #void (*print)(PurpleDebugLevel level, char *category, char *arg_s) + #glib.gboolean (*is_enabled)(PurpleDebugLevel level, char *category) + + # Debug API + void purple_debug(PurpleDebugLevel level, char *category, \ char *format_type, char *format) + void purple_debug_misc(char *category, char *format_type, \ + char *format) + void purple_debug_info(char *category, char *format_type, \ + char *format) + void purple_debug_warning(char *category, char *format_type, \ + char *format) + void purple_debug_error (char *category, char *format_type, \ + char *format) + void purple_debug_fatal (char *category, char *format_type, \ + char *format) + void purple_debug_set_enabled(glib.gboolean enabled) + glib.gboolean purple_debug_is_enabled() + + # UI Registration Functions FIXME + #void purple_debug_set_ui_ops(PurpleDebugUiOps *ops) + #PurpleDebugUiOps *purple_debug_get_ui_ops(void) - void c_purple_debug_set_enabled "purple_debug_set_enabled" \ - (glib.gboolean debug_enabled) - glib.gboolean c_purple_debug_is_enabled "purple_debug_is_enabled" () + # Debug Subsystem + void purple_debug_init() diff --git a/libpurple/util.pxd b/libpurple/util.pxd index 3ee6083..325d1c6 100644 --- a/libpurple/util.pxd +++ b/libpurple/util.pxd @@ -17,6 +17,167 @@ # along with this program. If not, see . # +cimport account +cimport notify +cimport glib +cimport signals +cimport xmlnode + +cdef extern from *: + ctypedef int size_t + cdef extern from "libpurple/util.h": - char *c_purple_markup_strip_html "purple_markup_strip_html" (char *str) - void c_purple_util_set_user_dir "purple_util_set_user_dir" (char *dir) + ctypedef struct PurpleUtilFetchUrlData: + pass + + ctypedef struct PurpleMenuAction: + char *label + signals.PurpleCallback callback + glib.gpointer data + glib.GList *children + + ctypedef char *(*PurpleInfoFieldFormatCallback)(char *field, size_t len) + + ctypedef struct PurpleKeyValuePair: + glib.gchar *key + void *value + + PurpleMenuAction *purple_menu_action_new(char *label, \ + signals.PurpleCallback callback, glib.gpointer data, \ + glib.GList *children) + void purple_menu_action_free(PurpleMenuAction *act) + + void purple_util_set_current_song(char *title, char *artist, char *album) + + char *purple_util_format_song_info(char *title, char *artist, \ + char *album, glib.gpointer unused) + + # Utility Subsystem + void purple_util_init() + void purple_util_uninit() + + # Base16 Functions + glib.gchar *purple_base16_encode(glib.guchar *data, glib.gsize len) + glib.guchar *purple_base16_decode(char *str, glib.gsize *ret_len) + glib.gchar *purple_base16_encode_chunked(glib.guchar *data, glib.gsize len) + + # Base64 Functions + glib.gchar *purple_base64_encode(glib.guchar *data, glib.gsize len) + glib.guchar *purple_base64_decode(char *str, glib.gsize *ret_len) + + # Quoted Printable Functions + glib.guchar *purple_quotedp_decode(char *str, glib.gsize *ret_len) + + # MIME Functions + char *purple_mime_decode_field(char *str) + + # Date/Time Functions FIXME + #char *purple_utf8_strftime(char *format, struct tm *tm) + #char *purple_get_tzoff_str(struct tm *tm, glib.gboolean iso) + #char *purple_date_format_short(struct tm *tm) + #char *purple_date_format_long(struct tm *tm) + #char *purple_date_format_full(struct tm *tm) + #char *purple_time_format(struct tm *tm) + #time_t purple_time_build(int year, int month, int day, int hour, int min, \ + #int sec) + #time_t purple_str_to_time(char *timestamp, glib.gboolean utc, \ + #struct tm *tm, long *tz_off, char **rest); + + # Markup Functions FIXME +# glib.gboolean purple_markup_find_tag(char *needle, char *haystack, \ +# char **start, char **end, glib.GData **attributes) + glib.gboolean purple_markup_extract_info_field(char *str, int len, \ + notify.PurpleNotifyUserInfo *user_info, char *start_token, \ + int skip, char *end_token, char check_value, \ + char *no_value_token, char *display_name, glib.gboolean is_link, \ + char *link_prefix, PurpleInfoFieldFormatCallback format_cb) + void purple_markup_html_to_xhtml(char *html, char **dest_xhtml, char **dest_plain) + char *purple_markup_strip_html(char *str) + char *purple_markup_linkify(char *str) + char *purple_unescape_html(char *html) + char *purple_markup_slice(char *str, glib.guint x, glib.guint y) + char *purple_markup_get_tag_name(char *tag) + char *purple_markup_unescape_entity(char *text, int *length) + char *purple_markup_get_css_property(glib.gchar *style, glib.gchar *opt) + + # Path/Filename Functions + glib.gchar *purple_home_dir() + glib.gchar *purple_user_dir() + void purple_util_set_user_dir(char *dir) + int purple_build_dir(char *path, int mode) + glib.gboolean purple_util_write_data_to_file(char *filename, char *data, \ + glib.gssize size) + glib.gboolean purple_util_write_data_to_file_absolute(char *filename_full, char *data, glib.gssize size) + xmlnode.xmlnode *purple_util_read_xml_from_file(char *filename, char *description) + #FILE *purple_mkstemp(char **path, glib.gboolean binary) + #char *purple_util_get_image_extension(glib.gconstpointer data, size_t len) + #char *purple_util_get_image_checksum(glib.gconstpointer image_data, size_t image_len) + #char *purple_util_get_image_filename(glib.gconstpointer image_data, size_t image_len) + + # Environment Detection Functions + glib.gboolean purple_program_is_valid(char *program) + glib.gboolean purple_running_gnome() + glib.gboolean purple_running_kde() + glib.gboolean purple_running_osx() + char *purple_fd_get_ip(int fd) + + # String Functions FIXME + char *purple_normalize(account.PurpleAccount *account, char *str) + char *purple_normalize_nocase(account.PurpleAccount *account, char *str) + glib.gboolean purple_str_has_prefix(char *s, char *p) + glib.gboolean purple_str_has_suffix(char *s, char *x) + glib.gchar *purple_strdup_withhtml(glib.gchar *src) + char *purple_str_add_cr(char *str) + void purple_str_strip_char(char *str, char thechar) + void purple_util_chrreplace(char *string, char delimiter, char replacement) + glib.gchar *purple_strreplace(char *string, char *delimiter, \ + char *replacement) + #char *purple_utf8_ncr_encode(char *in) + #char *purple_utf8_ncr_decode(char *in) + glib.gchar *purple_strcasereplace(char *string, char *delimiter, \ + char *replacement) + char *purple_strcasestr(char *haystack, char *needle) + #char *purple_str_size_to_units(size_t size) + char *purple_str_seconds_to_string(glib.guint sec) + char *purple_str_binary_to_ascii(unsigned char *binary, glib.guint len) + + # URI/URL Functions FIXME + void purple_got_protocol_handler_uri(char *uri) + glib.gboolean purple_url_parse(char *url, char **ret_host, int *ret_port, \ + char **ret_path, char **ret_user, char **ret_passwd) + + #ctypedef void (*PurpleUtilFetchUrlCallback)( \ + #PurpleUtilFetchUrlData *url_data, glib.gpointer user_data, \ + #glib.gchar *url_text, glib.gsize len, glib.gchar *error_message) + + #PurpleUtilFetchUrlData *purple_util_fetch_url_request(glib.gchar *url, \ + # glib.gboolean full, glib.gchar *user_agent, glib.gboolean http11, \ + # glib.gchar *request, glib.gboolean include_headers, \ + # PurpleUtilFetchUrlCallback callback, glib.gpointer data) + #PurpleUtilFetchUrlData *purple_util_fetch_url_request_len(glib.gchar *url, \ + # glib.gboolean full, glib.gchar *user_agent, glib.gboolean http11, \ + # glib.gchar *request, glib.gboolean include_headers, \ + # glib.gssize max_len, PurpleUtilFetchUrlCallback callback, \ + # glib.gpointer data) + #void purple_util_fetch_url_cancel(PurpleUtilFetchUrlData *url_data) + char *purple_url_decode(char *str) + char *purple_url_encode(char *str) + glib.gboolean purple_email_is_valid(char *address) + glib.gboolean purple_ip_address_is_valid(char *ip) + glib.GList *purple_uri_list_extract_uris(glib.gchar *uri_list) + glib.GList *purple_uri_list_extract_filenames(glib.gchar *uri_list) + + # UTF8 String Functions FIXME + glib.gchar *purple_utf8_try_convert(char *str) + glib.gchar *purple_utf8_salvage(char *str) + glib.gchar *purple_gai_strerror(glib.gint errnum) + int purple_utf8_strcasecmp(char *a, char *b) + glib.gboolean purple_utf8_has_word(char *haystack, char *needle) + #void purple_print_utf8_to_console(FILE *filestream, char *message) + glib.gboolean purple_message_meify(char *message, glib.gssize len) + #char *purple_text_strip_mnemonic(char *in) + char *purple_unescape_filename(char *str) + char *purple_escape_filename(char *str) + char *_purple_oscar_convert(char *act, char *protocol) + void purple_restore_default_signal_handlers() + glib.gchar *purple_get_host_name() diff --git a/notify_cbs.pxd b/notify_cbs.pxd index 6180ed9..f23bb0e 100644 --- a/notify_cbs.pxd +++ b/notify_cbs.pxd @@ -30,7 +30,7 @@ cdef void *notify_message(notify.PurpleNotifyMsgType type, \ """ TODO """ - debug.c_purple_debug_info("notify", "%s", "notify-message\n") + debug.purple_debug_info("notify", "%s", "notify-message\n") if notify_cbs.has_key("notif-message"): ( notify_cbs["notify-message"])("notify-message: TODO") @@ -40,7 +40,7 @@ cdef void *notify_email(connection.PurpleConnection *gc, \ """ TODO """ - debug.c_purple_debug_info("notify", "%s", "notify-email\n") + debug.purple_debug_info("notify", "%s", "notify-email\n") if notify_cbs.has_key("notify-email"): ( notify_cbs["notify-email"])("notify-email: TODO") @@ -50,7 +50,7 @@ cdef void *notify_emails(connection.PurpleConnection *gc, size_t count, \ """ TODO """ - debug.c_purple_debug_info("notify", "%s", "notify-emails\n") + debug.purple_debug_info("notify", "%s", "notify-emails\n") if notify_cbs.has_key("notify-emails"): ( notify_cbs["notify-emails"])("notify-emails: TODO") @@ -59,7 +59,7 @@ cdef void *notify_formatted(const_char *title, const_char *primary, \ """ TODO """ - debug.c_purple_debug_info("notify", "%s", "notify-formatted\n") + debug.purple_debug_info("notify", "%s", "notify-formatted\n") if notify_cbs.has_key("notify-formatted"): ( notify_cbs["notify-formatted"])("notify-formatted: TODO") @@ -69,7 +69,7 @@ cdef void *notify_searchresults(connection.PurpleConnection *gc, \ """ TODO """ - debug.c_purple_debug_info("notify", "%s", "notify-searchresults\n") + debug.purple_debug_info("notify", "%s", "notify-searchresults\n") if notify_cbs.has_key("notify-searchresults"): ( notify_cbs["notify-searchresults"])("notify-searchresults: TODO") @@ -78,7 +78,7 @@ cdef void notify_searchresults_new_rows(connection.PurpleConnection *gc, \ """ TODO """ - debug.c_purple_debug_info("notify", "%s", "notify-searchresults-new-rows\n") + debug.purple_debug_info("notify", "%s", "notify-searchresults-new-rows\n") if notify_cbs.has_key("notify-searchresults-new-rows"): ( notify_cbs["notify-searchresults-new-rows"])("notify-searchresults-new-rows: TODO") @@ -87,7 +87,7 @@ cdef void *notify_userinfo(connection.PurpleConnection *gc, const_char *who, \ """ TODO """ - debug.c_purple_debug_info("notify", "%s", "notify-userinfo\n") + debug.purple_debug_info("notify", "%s", "notify-userinfo\n") if notify_cbs.has_key("notify-userinfo"): ( notify_cbs["notify-userinfo"])("notify-userinfo: TODO") @@ -95,7 +95,7 @@ cdef void *notify_uri(const_char *uri): """ TODO """ - debug.c_purple_debug_info("notify", "%s", "notify-uri\n") + debug.purple_debug_info("notify", "%s", "notify-uri\n") if notify_cbs.has_key("notify-uri"): ( notify_cbs["notify-uri"])("notify-uri: TODO") @@ -103,6 +103,6 @@ cdef void close_notify(notify.PurpleNotifyType type, void *ui_handle): """ TODO """ - debug.c_purple_debug_info("notify", "%s", "close-notify\n") + debug.purple_debug_info("notify", "%s", "close-notify\n") if notify_cbs.has_key("close-notify"): ( notify_cbs["close-notify"])("close-notify: TODO") diff --git a/purple.pyx b/purple.pyx index 6a269cd..c91acdc 100644 --- a/purple.pyx +++ b/purple.pyx @@ -75,8 +75,8 @@ cdef class Purple: if default_path is not __DEFAULT_PATH__: __DEFAULT_PATH__ = default_path - debug.c_purple_debug_set_enabled(debug_enabled) - util.c_purple_util_set_user_dir(default_path) + debug.purple_debug_set_enabled(debug_enabled) + util.purple_util_set_user_dir(default_path) plugin.c_purple_plugins_add_search_path(default_path) # adds glib iteration inside ecore main loop @@ -86,17 +86,17 @@ cdef class Purple: core.c_purple_core_quit() cdef void __core_ui_ops_ui_prefs_init(self): - debug.c_purple_debug_info("core_ui_ops", "%s", "ui_prefs_init\n") + debug.purple_debug_info("core_ui_ops", "%s", "ui_prefs_init\n") prefs.c_purple_prefs_load() prefs.c_purple_prefs_add_none("/carman") cdef void __core_ui_ops_debug_init(self): - debug.c_purple_debug_info("core_ui_ops", "%s", "debug_ui_init\n") + debug.purple_debug_info("core_ui_ops", "%s", "debug_ui_init\n") pass cdef void __core_ui_ops_ui_init(self): - debug.c_purple_debug_info("core_ui_ops", "%s", "ui_init\n") + debug.purple_debug_info("core_ui_ops", "%s", "ui_init\n") account.purple_accounts_set_ui_ops(&c_account_ui_ops) connection.c_purple_connections_set_ui_ops(&c_conn_ui_ops) @@ -109,7 +109,7 @@ cdef class Purple: #roomlist.c_purple_roomlist_set_ui_ops(&c_rlist_ui_ops) cdef void __core_ui_ops_quit(self): - debug.c_purple_debug_info("core_ui_ops", "%s", "quit\n") + debug.purple_debug_info("core_ui_ops", "%s", "quit\n") global c_ui_info @@ -222,13 +222,13 @@ cdef class Purple: # initialize purple core ret = core.c_purple_core_init(__APP_NAME__) if ret is False: - debug.c_purple_debug_fatal("main", "%s", "libpurple " \ + debug.purple_debug_fatal("main", "%s", "libpurple " \ "initialization failed.\n") return False # check if there is another instance of libpurple running if core.c_purple_core_ensure_single_instance() == False: - debug.c_purple_debug_fatal("main", "%s", "Another instance of " \ + debug.purple_debug_fatal("main", "%s", "Another instance of " \ "libpurple is already running.\n") core.c_purple_core_quit() return False diff --git a/request_cbs.pxd b/request_cbs.pxd index 2c7b7ba..46af219 100644 --- a/request_cbs.pxd +++ b/request_cbs.pxd @@ -36,7 +36,7 @@ cdef void *request_input(const_char *title, const_char *primary, \ """ @see purple_request_input(). """ - debug.c_purple_debug_info("request", "%s", "request-input\n") + debug.purple_debug_info("request", "%s", "request-input\n") if request_cbs.has_key("request-input"): ( request_cbs["request-input"])("request-input: TODO") @@ -49,7 +49,7 @@ cdef void *request_choice(const_char *title, const_char *primary, \ """ @see purple_request_choice_varg(). """ - debug.c_purple_debug_info("request", "%s", "request-choice\n") + debug.purple_debug_info("request", "%s", "request-choice\n") if request_cbs.has_key("request-choice"): ( request_cbs["request-choice"])("request-choice: TODO") @@ -61,7 +61,7 @@ cdef void *request_action(const_char *title, const_char *primary, \ """ @see purple_request_action_varg(). """ - debug.c_purple_debug_info("request", "%s", "request-action\n") + debug.purple_debug_info("request", "%s", "request-action\n") if request_cbs.has_key("request-action"): ( request_cbs["request-action"])("request-action: TODo") @@ -74,7 +74,7 @@ cdef void *request_fields(const_char *title, const_char *primary, \ """ @see purple_request_fields(). """ - debug.c_purple_debug_info("request", "%s", "request-fields\n") + debug.purple_debug_info("request", "%s", "request-fields\n") if request_cbs.has_key("request-fields"): ( request_cbs["request-fields"])("request-fields: TODO") @@ -86,7 +86,7 @@ cdef void *request_file(const_char *title, const_char *filename, \ """ @see purple_request_file(). """ - debug.c_purple_debug_info("request", "%s", "request-file\n") + debug.purple_debug_info("request", "%s", "request-file\n") if request_cbs.has_key("request-file"): ( request_cbs["request-file"])("request-file: TODO") @@ -94,7 +94,7 @@ cdef void close_request(request.PurpleRequestType type, void *ui_handle): """ TODO """ - debug.c_purple_debug_info("request", "%s", "close-request\n") + debug.purple_debug_info("request", "%s", "close-request\n") if request_cbs.has_key("close-request"): ( request_cbs["close-request"])("close-request: TODO") @@ -105,6 +105,6 @@ cdef void *request_folder(const_char *title, const_char *dirname, \ """ @see purple_request_folder(). """ - debug.c_purple_debug_info("request", "%s", "request-folder\n") + debug.purple_debug_info("request", "%s", "request-folder\n") if request_cbs.has_key("request-folder"): ( request_cbs["request-folder"])("request-folder: TODO")