X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=purple.pyx;h=5d87af3d3a7a4942c298c3d374312564b71f39c7;hp=cabbbae9e4dc066b20b0837a3dd849e5077be271;hb=fa83e5e05e62fa5c6707312d375b97195143e6b7;hpb=f0ff8c3ffbd828fbdc0963c8c4744c94363f40a7 diff --git a/purple.pyx b/purple.pyx index cabbbae..5d87af3 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. @@ -73,29 +75,34 @@ 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 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(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "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(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "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(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "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) @@ -106,11 +113,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.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) @@ -219,12 +226,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.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.purple_debug_fatal("main", "%s", "Another instance of " \ + "libpurple is already running.\n") core.c_purple_core_quit() return False @@ -240,8 +249,9 @@ cdef class Purple: return ret - def add_callback(self, type, name, func): - """ Adds a callback 'func' with given name 'name' inside type 'type'. + 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 @@ -256,11 +266,7 @@ cdef class Purple: "connection": connection_cbs, "conversation": conversation_cbs, "notify": notify_cbs, - "request": request_cbs }[type][name] = func - - def connect(self): - conn = Connection() - conn.connect() + "request": request_cbs }[type][name] = callback def signal_connect(self, name=None, cb=None): cdef int handle @@ -276,7 +282,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, @@ -302,20 +328,21 @@ cdef class Purple: 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: - 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) + 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[username] = acc - if not account.c_purple_accounts_find(username, protocol_id): + 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) @@ -329,8 +356,34 @@ cdef class Purple: else: return None + 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) + + if username != NULL and protocol_id != NULL: + account_list.append(Account(self, username, protocol_id)) + iter = iter.next + + return account_list + +include "protocol.pyx" +#include "plugin.pyx" include "proxy.pyx" +#include "protocol.pyx" include "account.pyx" include "buddy.pyx" -include "connection.pyx" +#include "connection.pyx" include "conversation.pyx" +