X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=purple.pyx;h=79e553a60eeb0f8ab41046f3e62f1fa7c6224574;hp=181b9a36fe087a9099fe7d3d38fadfbc5b7ab92a;hb=7cb45fa563b2f0d0e9352373ab0e853188592dcf;hpb=f0e073094010809e89170648a9316ee9e636758a diff --git a/purple.pyx b/purple.pyx index 181b9a3..79e553a 100644 --- a/purple.pyx +++ b/purple.pyx @@ -17,113 +17,30 @@ # along with this program. If not, see . # -include "glib.pxd" - -import ecore - -cdef extern from *: - ctypedef char* const_char_ptr "const char *" - ctypedef char* const_guchar_ptr "const guchar *" - -cdef extern from "time.h": - ctypedef long int time_t - -cdef extern from "libpurple/blist.h": - ctypedef struct PurpleBuddyList: - pass - - void c_purple_set_blist "purple_set_blist" (PurpleBuddyList *list) - void c_purple_blist_load "purple_blist_load" () - PurpleBuddyList* c_purple_blist_new "purple_blist_new" () - -cdef extern from "libpurple/core.h": - ctypedef struct PurpleCoreUiOps: - void (*ui_prefs_init) () - void (*debug_ui_init) () - void (*ui_init) () - void (*quit) () - GHashTable* (*get_ui_info) () - - gboolean c_purple_core_init "purple_core_init" (const_char_ptr ui_name) - void c_purple_core_quit "purple_core_quit" () - void c_purple_core_set_ui_ops "purple_core_set_ui_ops" (PurpleCoreUiOps *ops) - gboolean c_purple_core_ensure_single_instance "purple_core_ensure_single_instance" () - -cdef extern from "libpurple/debug.h": - ctypedef enum PurpleDebugLevel: - PURPLE_DEBUG_ALL - PURPLE_DEBUG_MISC - PURPLE_DEBUG_INFO - PURPLE_DEBUG_WARNING - PURPLE_DEBUG_ERROR - PURPLE_DEBUG_FATAL - - void c_purple_debug "purple_debug" (PurpleDebugLevel level, const_char_ptr category, const_char_ptr format) - void c_purple_debug_set_enabled "purple_debug_set_enabled" (gboolean debug_enabled) - -cdef extern from "libpurple/eventloop.h": - ctypedef enum PurpleInputCondition: - PURPLE_INPUT_READ - PURPLE_INPUT_WRITE - - ctypedef void (*PurpleInputFunction) (gpointer , gint, PurpleInputCondition) - - ctypedef struct PurpleEventLoopUiOps: - guint (*timeout_add) (guint interval, GSourceFunc function, gpointer data) - gboolean (*timeout_remove) (guint handle) - guint (*input_add) (int fd, PurpleInputCondition cond, PurpleInputFunction func, gpointer user_data) - gboolean (*input_remove) (guint handle) - int (*input_get_error) (int fd, int *error) - guint (*timeout_add_seconds)(guint interval, GSourceFunc function, gpointer data) - - void c_purple_eventloop_set_ui_ops "purple_eventloop_set_ui_ops" (PurpleEventLoopUiOps *ops) - -cdef extern from "libpurple/plugin.h": - ctypedef struct PurplePlugin - - cdef struct _PurplePluginInfo: - char *id - char *name - ctypedef _PurplePluginInfo PurplePluginInfo - - cdef struct _PurplePlugin: - PurplePluginInfo *info # The plugin information. - ctypedef _PurplePlugin PurplePlugin - - void c_purple_plugins_add_search_path "purple_plugins_add_search_path" (const_char_ptr path) - GList *c_purple_plugins_get_protocols "purple_plugins_get_protocols" () - -cdef extern from "libpurple/pounce.h": - gboolean c_purple_pounces_load "purple_pounces_load" () - -cdef extern from "libpurple/prefs.h": - void c_purple_prefs_add_none "purple_prefs_add_none" (const_char_ptr name) - void c_purple_prefs_rename "purple_prefs_rename" (const_char_ptr oldname, const_char_ptr newname) - const_char_ptr c_purple_prefs_get_string "purple_prefs_get_string" (const_char_ptr name) - gboolean c_purple_prefs_load "purple_prefs_load" () - -cdef extern from "libpurple/util.h": - void c_purple_util_set_user_dir "purple_util_set_user_dir" (char *dir) +cimport purple cdef extern from "c_purple.h": - guint glib_input_add(gint fd, PurpleInputCondition condition, PurpleInputFunction function, gpointer data) - void glib_main_loop() + glib.guint glib_input_add(glib.gint fd, eventloop.PurpleInputCondition condition, eventloop.PurpleInputFunction function, glib.gpointer data) + +import ecore __DEFAULT_PATH__ = "/tmp" __APP_NAME__ = "carman-purple-python" __APP_VERSION__ = "0.1" -global __DEFAULT_PATH__ -global __APP_NAME__ -global __APP_VERSION__ - cdef class Purple: - """ Purple class """ - cdef PurpleCoreUiOps c_core_ui_ops - cdef PurpleEventLoopUiOps c_eventloop_ui_ops - cdef GHashTable *c_ui_info + """ Purple class. - def __cinit__(self, debug_enabled=True, app_name=__APP_NAME__, default_path=__DEFAULT_PATH__): + @parm debug_enabled: Toggle debug messages. + @parm app_name: Set application name. + @parm default_path: Full path for libpurple user files. + """ + + cdef core.PurpleCoreUiOps c_core_ui_ops + cdef eventloop.PurpleEventLoopUiOps c_eventloop_ui_ops + cdef glib.GHashTable *c_ui_info + + def __init__(self, debug_enabled=True, app_name=__APP_NAME__, default_path=__DEFAULT_PATH__): self.c_ui_info = NULL if app_name is not __APP_NAME__: @@ -132,51 +49,56 @@ cdef class Purple: if default_path is not __DEFAULT_PATH__: __DEFAULT_PATH__ = default_path - c_purple_debug_set_enabled(debug_enabled) - c_purple_util_set_user_dir(default_path) - c_purple_plugins_add_search_path(default_path) + debug.c_purple_debug_set_enabled(debug_enabled) + util.c_purple_util_set_user_dir(default_path) + plugin.c_purple_plugins_add_search_path(default_path) # adds glib iteration inside ecore main loop ecore.idler_add(self.__glib_iteration_when_idle) - # __cinit__ def __del__(self): - c_purple_core_quit() - # __del__ + core.c_purple_core_quit() cdef void __core_ui_ops_ui_prefs_init(self): - c_purple_debug(PURPLE_DEBUG_INFO, "core_ui_ops", "ui_prefs_init\n") - c_purple_prefs_load() + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "ui_prefs_init\n") + prefs.c_purple_prefs_load() - c_purple_prefs_add_none("/carman") - c_purple_prefs_add_none("/carman/plugins") - # __core_ui_ops_ui_prefs_init + prefs.c_purple_prefs_add_none("/carman") cdef void __core_ui_ops_debug_init(self): - c_purple_debug(PURPLE_DEBUG_INFO, "core_ui_ops", "debug_ui_init\n") - # __core_ui_ops_debug_init + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "debug_ui_init\n") cdef void __core_ui_ops_ui_init(self): - c_purple_debug(PURPLE_DEBUG_INFO, "core_ui_ops", "ui_init\n") - # __core_ui_ops_ui_init + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "ui_init\n") + + # FIXME: Add core ui initialization here cdef void __core_ui_ops_quit(self): - c_purple_debug(PURPLE_DEBUG_INFO, "core_ui_ops", "quit\n") - # __core_ui_ops_quit + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "quit\n") - cdef GHashTable *__core_ui_ops_get_ui_info(self): + account.c_purple_accounts_set_ui_ops(NULL) + connection.c_purple_connections_set_ui_ops(NULL) + blist.c_purple_blist_set_ui_ops(NULL) + conversation.c_purple_conversations_set_ui_ops(NULL) + notify.c_purple_notify_set_ui_ops(NULL) + request.c_purple_request_set_ui_ops(NULL) + ft.c_purple_xfers_set_ui_ops(NULL) + roomlist.c_purple_roomlist_set_ui_ops(NULL) + + if self.c_ui_info: + glib.g_hash_table_destroy(self.c_ui_info) + + cdef glib.GHashTable *__core_ui_ops_get_ui_info(self): if self.c_ui_info == NULL: - self.c_ui_info = g_hash_table_new(g_str_hash, g_str_equal) + self.c_ui_info = glib.g_hash_table_new(glib.g_str_hash, glib.g_str_equal) - g_hash_table_insert(self.c_ui_info, "name", __APP_NAME__) - g_hash_table_insert(self.c_ui_info, "version", __APP_VERSION__) + glib.g_hash_table_insert(self.c_ui_info, "name", __APP_NAME__) + glib.g_hash_table_insert(self.c_ui_info, "version", __APP_VERSION__) return self.c_ui_info - # __core_ui_ops_get_ui_info def __glib_iteration_when_idle(self): - g_main_context_iteration(NULL, False) + glib.g_main_context_iteration(NULL, False) return True - # __glib_iteration_when_idle def purple_init(self): """ Initializes libpurple """ @@ -185,53 +107,50 @@ cdef class Purple: self.c_core_ui_ops.debug_ui_init = self.__core_ui_ops_debug_init self.c_core_ui_ops.ui_init = self.__core_ui_ops_ui_init self.c_core_ui_ops.quit = self.__core_ui_ops_quit - self.c_core_ui_ops.get_ui_info = self.__core_ui_ops_get_ui_info + self.c_core_ui_ops.get_ui_info = self.__core_ui_ops_get_ui_info - c_purple_core_set_ui_ops(&self.c_core_ui_ops) + core.c_purple_core_set_ui_ops(&self.c_core_ui_ops) # initialize c_eventloop_ui_ops structure - self.c_eventloop_ui_ops.timeout_add = g_timeout_add - self.c_eventloop_ui_ops.timeout_remove = g_source_remove + self.c_eventloop_ui_ops.timeout_add = glib.g_timeout_add + self.c_eventloop_ui_ops.timeout_remove = glib.g_source_remove self.c_eventloop_ui_ops.input_add = glib_input_add - self.c_eventloop_ui_ops.input_remove = g_source_remove + self.c_eventloop_ui_ops.input_remove = glib.g_source_remove self.c_eventloop_ui_ops.input_get_error = NULL - self.c_eventloop_ui_ops.timeout_add_seconds = g_timeout_add_seconds + self.c_eventloop_ui_ops.timeout_add_seconds = glib.g_timeout_add_seconds - c_purple_eventloop_set_ui_ops(&self.c_eventloop_ui_ops) + eventloop.c_purple_eventloop_set_ui_ops(&self.c_eventloop_ui_ops) # initialize purple core - ret = c_purple_core_init(__APP_NAME__) + ret = core.c_purple_core_init(__APP_NAME__) if ret is False: - c_purple_debug(PURPLE_DEBUG_INFO, "main", "Exiting because libpurple initialization failed.\n") + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "main", "Exiting because libpurple initialization failed.\n") return False # check if there is another instance of libpurple running - if c_purple_core_ensure_single_instance() == False: - c_purple_debug(PURPLE_DEBUG_INFO, "main", "Exiting because another instance of libpurple is already running.\n") - c_purple_core_quit() + if core.c_purple_core_ensure_single_instance() == False: + debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "main", "Exiting because another instance of libpurple is already running.\n") + core.c_purple_core_quit() return False # create and load the buddy list - c_purple_set_blist(c_purple_blist_new()) - c_purple_blist_load() + blist.c_purple_set_blist(blist.c_purple_blist_new()) + blist.c_purple_blist_load() # load pounces - c_purple_pounces_load() + pounce.c_purple_pounces_load() return ret - # core_init - -# Purple def get_protocols(self): - cdef GList *iter - cdef PurplePlugin *plugin + cdef glib.GList *iter + cdef plugin.PurplePlugin *__plugin protocols = [] - iter = c_purple_plugins_get_protocols() + iter = plugin.c_purple_plugins_get_protocols() while iter: - plugin = iter.data - if plugin.info and plugin.info.name: - protocols += [(plugin.info.id, plugin.info.name)] + __plugin = iter.data + if __plugin.info and __plugin.info.name: + protocols += [(__plugin.info.id, __plugin.info.name)] iter = iter.next return protocols @@ -239,15 +158,8 @@ cdef class Purple: conn = Connection() conn.connect() - def run_loop(self): - glib_main_loop() - -include "core/account.pxd" -include "core/buddy.pxd" -include "glib.pxd" -#include "core/blist.pxd" -include "core/connection.pxd" -#include "core/core.pxd" -#include "core/idle.pxd" -#include "core/pounce.pxd" -include "core/conversation.pxd" +include "proxy.pyx" +include "account.pyx" +include "buddy.pyx" +include "connection.pyx" +include "conversation.pyx"