X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=purple.pyx;h=26a972fa49733504e05b58b51381b2bb158ca9ef;hp=f0989fd0698eb58f9e7d8cee3f09c2b19335a1b8;hb=d5b85c24f1ac2d3fb582e79c995396c4043e7763;hpb=5fe506a5d23d5f7ba01599247a58bd03ca9eb7da diff --git a/purple.pyx b/purple.pyx index f0989fd..26a972f 100644 --- a/purple.pyx +++ b/purple.pyx @@ -65,40 +65,41 @@ 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) + 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 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() 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.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) @@ -109,11 +110,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_info("core_ui_ops", "%s", "quit\n") + debug.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) @@ -222,13 +223,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 @@ -240,14 +241,15 @@ cdef class Purple: # load pounces pounce.c_purple_pounces_load() - # initialize accounts - self.load_accounts() - return ret - def add_callback(self, type, name, func): - """ Adds a callback 'func' with given name 'name' inside type 'type'. - Example: add_callback("account", "notify-added", notify_added_cb) + def add_callback(self, type, name, callback): + """ + Adds a callback with given name inside callback's type. + + @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 @@ -261,7 +263,7 @@ cdef class Purple: "connection": connection_cbs, "conversation": conversation_cbs, "notify": notify_cbs, - "request": request_cbs }[type][name] = func + "request": request_cbs }[type][name] = callback def signal_connect(self, name=None, cb=None): cdef int handle @@ -312,46 +314,45 @@ 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 load_accounts(self): + def accounts_get_all(self): cdef glib.GList *iter cdef account.PurpleAccount *acc - iter = account.c_purple_accounts_get_all() + cdef char *username + cdef char *protocol_id + + iter = account.purple_accounts_get_all() + account_list = [] + while iter: acc = iter.data + if acc: - username = account.c_purple_account_get_username(acc) - protocol_id = account.c_purple_account_get_protocol_id(acc) - self.account_add(username.split("/")[0], protocol_id, "172.18.216.211", 8080) + username = account.purple_account_get_username(acc) + protocol_id = account.purple_account_get_protocol_id(acc) + + if username != NULL and protocol_id != NULL: + account_list.append(Account(self, username, protocol_id)) + iter = iter.next + + return account_list + + def protocols_get_all(self): + cdef glib.GList *iter + cdef plugin.PurplePlugin *pp + + iter = plugin.c_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 - 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.c_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 - -include "plugin.pyx" +include "protocol.pyx" +#include "plugin.pyx" include "proxy.pyx" +#include "protocol.pyx" include "account.pyx" include "buddy.pyx" #include "connection.pyx"