projects
/
python-purple
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing exception in purple.Purple.__core_ui_ops_ui_prefs_init.
[python-purple]
/
buddy.pyx
diff --git
a/buddy.pyx
b/buddy.pyx
index
29c56b8
..
9fa9ac3
100644
(file)
--- a/
buddy.pyx
+++ b/
buddy.pyx
@@
-27,25
+27,44
@@
cdef class Buddy:
def __init__(self):
self.c_buddy = NULL
def __init__(self):
self.c_buddy = NULL
- def new_buddy(self, acc, char *scr, char *alias):
+ def __get_account(self):
+ return self.__acc
+ def __set_account(self, acc):
self.__acc = acc
self.__acc = acc
- self.c_buddy = blist.c_purple_buddy_new(<account.PurpleAccount *>\
- self.__acc.c_account, scr, alias)
+ account = property(__get_account, __set_account)
def __get_alias(self):
def __get_alias(self):
- return <char *>blist.c_purple_buddy_get_alias_only(self.c_buddy)
+ if self.c_buddy:
+ return <char *>blist.purple_buddy_get_alias_only(self.c_buddy)
+ else:
+ return None
alias = property(__get_alias)
def __get_name(self):
alias = property(__get_alias)
def __get_name(self):
- return <char *>blist.c_purple_buddy_get_name(self.c_buddy)
+ if self.c_buddy:
+ return <char *>blist.purple_buddy_get_name(self.c_buddy)
+ else:
+ return None
name = property(__get_name)
name = property(__get_name)
- def __get_online(self):
+ """
+ def __get_online(self): # FIXME
name = self.name
name = self.name
- self.c_buddy = blist.c_purple_find_buddy(self.__acc.c_account, name)
- if status.c_purple_presence_is_online(blist.c_purple_buddy_get_presence(self.c_buddy)):
- return True
- else:
- return False
+ self.c_buddy = blist.purple_find_buddy(self.__acc.c_account, name)
+ return status.purple_presence_is_online(blist.purple_buddy_get_presence(self.c_buddy))
online = property(__get_online)
online = property(__get_online)
+ """
+
+ def new_buddy(self, acc, name, alias):
+ self.__acc = acc
+ cdef char *c_name = NULL
+ cdef char *c_alias = NULL
+
+ if name is not None:
+ c_name = name
+
+ if alias is not None:
+ c_alias = alias
+ self.c_buddy = blist.purple_buddy_new(<account.PurpleAccount *>\
+ self.__acc.c_account, c_name, c_alias)