X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=purple.pyx;h=96a52416370cb6b6f169b8ab1098dbce328c50e0;hp=889a5092026f9506bf55d7f33634328e213ee89c;hb=33091059fda101f7c4105945a677db2632d4ffcc;hpb=0a6492a9288f6b1e6ec82e17ef0bbde9a014de6b diff --git a/purple.pyx b/purple.pyx index 889a509..96a5241 100644 --- a/purple.pyx +++ b/purple.pyx @@ -55,6 +55,8 @@ include "request_cbs.pxd" #include "roomlist_cbs.pxd" include "signal_cbs.pxd" +include "util.pxd" + cdef class Purple: """ Purple class. @@ -63,10 +65,10 @@ cdef class Purple: @parm default_path: Full path for libpurple user files. """ - cdef object accounts + cdef object __accounts def __init__(self, debug_enabled=True, app_name=__APP_NAME__, default_path=__DEFAULT_PATH__): - self.accounts = {} + self.__accounts = {} if app_name is not __APP_NAME__: __APP_NAME__ = app_name @@ -80,23 +82,23 @@ cdef class Purple: # adds glib iteration inside ecore main loop ecore.timer_add(0.001, self.__glib_iteration_when_idle) - def destroy(self): core.c_purple_core_quit() cdef void __core_ui_ops_ui_prefs_init(self): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "ui_prefs_init\n") + debug.c_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(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "debug_ui_init\n") + debug.c_purple_debug_info("core_ui_ops", "%s", "debug_ui_init\n") + pass cdef void __core_ui_ops_ui_init(self): - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "ui_init\n") + debug.c_purple_debug_info("core_ui_ops", "%s", "ui_init\n") - account.c_purple_accounts_set_ui_ops(&c_account_ui_ops) + 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) @@ -107,11 +109,11 @@ 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(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "quit\n") + debug.c_purple_debug_info("core_ui_ops", "%s", "quit\n") global c_ui_info - account.c_purple_accounts_set_ui_ops(NULL) + 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) @@ -138,24 +140,9 @@ cdef class Purple: glib.g_main_context_iteration(NULL, False) return True - def purple_init(self, callbacks_dict=None): + def purple_init(self): """ Initializes libpurple """ - if callbacks_dict is not None: - # global account_cbs - global blist_cbs - global connection_cbs - global conversation_cbs - global notify_cbs - global request_cbs - - # account_cbs = callbacks_dict["account"] - blist_cbs = callbacks_dict["blist"] - connection_cbs = callbacks_dict["connection"] - conversation_cbs = callbacks_dict["conversation"] - notify_cbs = callbacks_dict["notify"] - request_cbs = callbacks_dict["request"] - c_account_ui_ops.notify_added = notify_added c_account_ui_ops.status_changed = status_changed c_account_ui_ops.request_add = request_add @@ -235,12 +222,14 @@ cdef class Purple: # initialize purple core ret = core.c_purple_core_init(__APP_NAME__) if ret is False: - debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "main", "Exiting because libpurple initialization failed.\n") + debug.c_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(debug.PURPLE_DEBUG_INFO, "main", "Exiting because another instance of libpurple is already running.\n") + debug.c_purple_debug_fatal("main", "%s", "Another instance of " \ + "libpurple is already running.\n") core.c_purple_core_quit() return False @@ -251,15 +240,29 @@ cdef class Purple: # load pounces pounce.c_purple_pounces_load() + # initialize accounts + self.load_accounts() + return ret - def add_account_cb(self, name, func): + 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) + """ global account_cbs - account_cbs[name] = func - - def connect(self): - conn = Connection() - conn.connect() + global blist_cbs + global connection_cbs + global conversation_cbs + global notify_cbs + global request_cbs + + { "account": account_cbs, + "blist": blist_cbs, + "connection": connection_cbs, + "conversation": conversation_cbs, + "notify": notify_cbs, + "request": request_cbs }[type][name] = callback def signal_connect(self, name=None, cb=None): cdef int handle @@ -275,7 +278,27 @@ cdef class Purple: global signal_cbs signal_cbs[name] = cb - if name == "buddy-signed-off": + if name == "signed-on": + signals.c_purple_signal_connect( + connection.c_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(), + "signed-off", &handle, + signal_signed_off_cb, NULL) + elif name == "connection-error": + signals.c_purple_signal_connect( + connection.c_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(), + "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(), "buddy-signed-off", &handle, @@ -290,47 +313,50 @@ cdef class Purple: 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 accounts_init(self): + def load_accounts(self): cdef glib.GList *iter cdef account.PurpleAccount *acc - iter = account.c_purple_accounts_get_all() + iter = account.purple_accounts_get_all() while iter: acc = iter.data if acc: - self.account_add(acc.username.split("/")[0], acc.protocol_id, "172.18.216.211", 8080) + 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) 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_add_dict(username, acc) - if not account.c_purple_accounts_find(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() - else: - print "Exists account" def account_verify(self, acc_username): - if self.accounts: - for username in self.accounts.keys(): + if self.__accounts: + for username in self.__accounts.keys(): if acc_username == username: - return self.accounts[username] - return None - - def accounts_add_dict(self, username, acc): - self.accounts[username] = acc - - def accounts_get_dict(self): - return self.accounts + return self.__accounts[username] + else: + return None +include "plugin.pyx" include "proxy.pyx" +#include "protocol.pyx" include "account.pyx" include "buddy.pyx" -include "connection.pyx" +#include "connection.pyx" include "conversation.pyx" +