projects
/
python-purple
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added setup_dist.py.
[python-purple]
/
purple.pyx
diff --git
a/purple.pyx
b/purple.pyx
index
b984590
..
e69a966
100644
(file)
--- a/
purple.pyx
+++ b/
purple.pyx
@@
-86,16
+86,17
@@
cdef class Purple:
core.c_purple_core_quit()
cdef void __core_ui_ops_ui_prefs_init(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):
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):
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)
connection.c_purple_connections_set_ui_ops(&c_conn_ui_ops)
account.c_purple_accounts_set_ui_ops(&c_account_ui_ops)
connection.c_purple_connections_set_ui_ops(&c_conn_ui_ops)
@@
-108,7
+109,7
@@
cdef class Purple:
#roomlist.c_purple_roomlist_set_ui_ops(&c_rlist_ui_ops)
cdef void __core_ui_ops_quit(self):
#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
global c_ui_info
@@
-221,12
+222,14
@@
cdef class Purple:
# initialize purple core
ret = core.c_purple_core_init(__APP_NAME__)
if ret is False:
# 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:
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
core.c_purple_core_quit()
return False
@@
-242,8
+245,9
@@
cdef class Purple:
return ret
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
Example: add_callback("account", "notify-added", notify_added_cb)
"""
global account_cbs
@@
-258,7
+262,7
@@
cdef class Purple:
"connection": connection_cbs,
"conversation": conversation_cbs,
"notify": notify_cbs,
"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
def signal_connect(self, name=None, cb=None):
cdef int handle
@@
-347,6
+351,7
@@
cdef class Purple:
else:
return None
else:
return None
+include "plugin.pyx"
include "proxy.pyx"
include "account.pyx"
include "buddy.pyx"
include "proxy.pyx"
include "account.pyx"
include "buddy.pyx"