X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=purple.pyx;h=36865933c0d361916a909d4c704a925349ae7595;hp=6a269cd1a2c8de4a5f69e33ce40180bda1844d75;hb=83612fdb793155a5c800a226f8a719b04dfd41ab;hpb=90f6e43b25dd3932fcc71a4f7afa5ecfcf2e3dc4 diff --git a/purple.pyx b/purple.pyx index 6a269cd..3686593 100644 --- a/purple.pyx +++ b/purple.pyx @@ -65,63 +65,64 @@ cdef class Purple: @parm default_path: Full path for libpurple user files. """ - cdef object __accounts - def __init__(self, debug_enabled=True, app_name=__APP_NAME__, default_path=__DEFAULT_PATH__): - self.__accounts = {} if app_name is not __APP_NAME__: __APP_NAME__ = app_name 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) - plugin.c_purple_plugins_add_search_path(default_path) + debug.purple_debug_set_enabled(debug_enabled) + util.purple_util_set_user_dir(default_path) + plugin.purple_plugins_add_search_path(default_path) # adds glib iteration inside ecore main loop ecore.timer_add(0.001, self.__glib_iteration_when_idle) + def __get_ui_name(self): + return __APP_NAME__ + ui_name = property(__get_ui_name) + def destroy(self): - core.c_purple_core_quit() + core.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") - prefs.c_purple_prefs_load() + debug.purple_debug_info("core_ui_ops", "%s", "ui_prefs_init\n") + prefs.purple_prefs_load() - prefs.c_purple_prefs_add_none("/carman") + prefs.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) - blist.c_purple_blist_set_ui_ops(&c_blist_ui_ops) - conversation.c_purple_conversations_set_ui_ops(&c_conv_ui_ops) - notify.c_purple_notify_set_ui_ops(&c_notify_ui_ops) - #privacy.c_purple_privacy_set_ui_ops(&c_privacy_ui_ops) - request.c_purple_request_set_ui_ops(&c_request_ui_ops) - #ft.c_purple_xfers_set_ui_ops(&c_ft_ui_ops) - #roomlist.c_purple_roomlist_set_ui_ops(&c_rlist_ui_ops) + connection.purple_connections_set_ui_ops(&c_conn_ui_ops) + blist.purple_blist_set_ui_ops(&c_blist_ui_ops) + conversation.purple_conversations_set_ui_ops(&c_conv_ui_ops) + notify.purple_notify_set_ui_ops(&c_notify_ui_ops) + #privacy.purple_privacy_set_ui_ops(&c_privacy_ui_ops) + request.purple_request_set_ui_ops(&c_request_ui_ops) + #ft.purple_xfers_set_ui_ops(&c_ft_ui_ops) + #roomlist.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 account.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) - #privacy.c_purple_privacy_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) + connection.purple_connections_set_ui_ops(NULL) + blist.purple_blist_set_ui_ops(NULL) + conversation.purple_conversations_set_ui_ops(NULL) + notify.purple_notify_set_ui_ops(NULL) + #privacy.purple_privacy_set_ui_ops(NULL) + request.purple_request_set_ui_ops(NULL) + #ft.purple_xfers_set_ui_ops(NULL) + #roomlist.purple_roomlist_set_ui_ops(NULL) if c_ui_info: glib.g_hash_table_destroy(c_ui_info) @@ -216,39 +217,39 @@ cdef class Purple: c_eventloop_ui_ops.input_get_error = NULL c_eventloop_ui_ops.timeout_add_seconds = NULL - core.c_purple_core_set_ui_ops(&c_core_ui_ops) - eventloop.c_purple_eventloop_set_ui_ops(&c_eventloop_ui_ops) + core.purple_core_set_ui_ops(&c_core_ui_ops) + eventloop.purple_eventloop_set_ui_ops(&c_eventloop_ui_ops) # initialize purple core - ret = core.c_purple_core_init(__APP_NAME__) + ret = core.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 " \ + if core.purple_core_ensure_single_instance() == False: + debug.purple_debug_fatal("main", "%s", "Another instance of " \ "libpurple is already running.\n") - core.c_purple_core_quit() + core.purple_core_quit() return False # create and load the buddy list - blist.c_purple_set_blist(blist.c_purple_blist_new()) - blist.c_purple_blist_load() + blist.purple_set_blist(blist.purple_blist_new()) + blist.purple_blist_load() # load pounces - pounce.c_purple_pounces_load() - - # initialize accounts - self.load_accounts() + pounce.purple_pounces_load() return ret def add_callback(self, type, name, callback): """ Adds a callback with given name inside callback's type. - Example: add_callback("account", "notify-added", notify_added_cb) + + @param type Callback type (e.g. "account") + @param name Callback name (e.g. "notify-added") + @param callback Callback to be called """ global account_cbs global blist_cbs @@ -271,7 +272,7 @@ cdef class Purple: if name is None: return - jabber = prpl.c_purple_find_prpl("prpl-jabber") + jabber = prpl.purple_find_prpl("prpl-jabber") if jabber == NULL: return @@ -279,86 +280,70 @@ cdef class Purple: signal_cbs[name] = cb if name == "signed-on": - signals.c_purple_signal_connect( - connection.c_purple_connections_get_handle(), + signals.purple_signal_connect( + connection.purple_connections_get_handle(), "signed-on", &handle, signal_signed_on_cb, NULL) elif name == "signed-off": - signals.c_purple_signal_connect( - connection.c_purple_connections_get_handle(), + signals.purple_signal_connect( + connection.purple_connections_get_handle(), "signed-off", &handle, signal_signed_off_cb, NULL) elif name == "connection-error": - signals.c_purple_signal_connect( - connection.c_purple_connections_get_handle(), + signals.purple_signal_connect( + connection.purple_connections_get_handle(), "connection-error", &handle, signal_connection_error_cb, NULL) elif name == "buddy-signed-on": - signals.c_purple_signal_connect( - blist.c_purple_blist_get_handle(), + signals.purple_signal_connect( + blist.purple_blist_get_handle(), "buddy-signed-on", &handle, signal_buddy_signed_on_cb, NULL) elif name == "buddy-signed-off": - signals.c_purple_signal_connect( - blist.c_purple_blist_get_handle(), + signals.purple_signal_connect( + blist.purple_blist_get_handle(), "buddy-signed-off", &handle, signal_buddy_signed_off_cb, NULL) elif name == "receiving-im-msg": - signals.c_purple_signal_connect( - conversation.c_purple_conversations_get_handle(), + signals.purple_signal_connect( + conversation.purple_conversations_get_handle(), "receiving-im-msg", &handle, signal_receiving_im_msg_cb, NULL) elif name == "jabber-receiving-xmlnode": - signals.c_purple_signal_connect( + signals.purple_signal_connect( jabber, "jabber-receiving-xmlnode", &handle, jabber_receiving_xmlnode_cb, NULL) - def __get_accounts(self): - return self.__accounts - accounts = property(__get_accounts) - - def new_account(self, username, protocol_id): - acc = Account(username, protocol_id) - return acc - - def load_accounts(self): + def accounts_get_all(self): cdef glib.GList *iter cdef account.PurpleAccount *acc + cdef char *username + cdef char *protocol_id + iter = account.purple_accounts_get_all() + account_list = [] + while iter: acc = iter.data + if acc: username = account.purple_account_get_username(acc) protocol_id = account.purple_account_get_protocol_id(acc) - self.account_add(username.split("/")[0], protocol_id, \ - "172.18.216.211", 8080) + + if username != NULL and protocol_id != NULL: + account_list.append(Account(username, \ + Protocol(protocol_id), self)) iter = iter.next - def account_add(self, username, protocol_id, host, port): - if not self.account_verify(username): - acc = purple.Account(username, protocol_id) - self.__accounts[username] = acc - if not account.purple_accounts_find(username, protocol_id): - acc.proxy.set_type(purple.ProxyInfoType().HTTP) - acc.proxy.set_host(host) - acc.proxy.set_port(port) - acc.save_into_xml() - - def account_verify(self, acc_username): - if self.__accounts: - for username in self.__accounts.keys(): - if acc_username == username: - return self.__accounts[username] - else: - return None + return account_list - def accounts_get_all(self): + def accounts_get_all_active(self): cdef glib.GList *iter cdef account.PurpleAccount *acc cdef char *username cdef char *protocol_id - iter = account.purple_accounts_get_all() + iter = account.purple_accounts_get_all_active() account_list = [] while iter: @@ -369,16 +354,30 @@ cdef class Purple: protocol_id = account.purple_account_get_protocol_id(acc) if username != NULL and protocol_id != NULL: - account_list.append(Account(username, protocol_id)) + account_list.append(Account(username, \ + Protocol(protocol_id), self)) iter = iter.next return account_list -include "plugin.pyx" + def protocols_get_all(self): + cdef glib.GList *iter + cdef plugin.PurplePlugin *pp + + iter = plugin.purple_plugins_get_protocols() + protocol_list = [] + while iter: + pp = iter.data + if pp.info and pp.info.name: + protocol_list.append(Protocol(pp.info.id)) + iter = iter.next + return protocol_list + +include "protocol.pyx" +#include "plugin.pyx" include "proxy.pyx" #include "protocol.pyx" include "account.pyx" include "buddy.pyx" #include "connection.pyx" include "conversation.pyx" -