if acc:
return acc
else:
- return "None"
+ return None
except:
- return "None"
+ return None
def _new_account(self, pointer):
if self.new_acc_bt_cbs.has_key("on_clicked"):
self.p.add_account_cb("request_authorize", account_callback)
self.p.add_account_cb("close_account_request", account_callback)
-
self.p.purple_init(cbs)
- self.p.accounts_init()
#Initializing UI
self.window.add_bt_conn_cb(self.connect)
b = purple.Buddy()
b.new_buddy(self.account, name, alias)
self.buddies[name] = b
- elif self.buddies[name].online is True:
+ elif self.buddies[name].online:
self.window.new_buddy(name)
def _purple_signal_sign_off_cb(self, name, bname):
def connect(self, password):
username_acc = self.window.selected_accs()
- self.account = self.p.account_verify(username_acc)
- self.account.get_protocol_options()
- self.account.set_enabled("carman-purple-python", True)
- self.account.password = password
- self.p.connect()
- self.p.signal_connect("buddy-signed-off", self._purple_signal_sign_off_cb)
+ if username_acc:
+ self.account = self.p.account_verify(username_acc)
+ self.account.get_protocol_options()
+ self.account.set_enabled("carman-purple-python", True)
+ self.account.password = password
+ self.p.connect()
+ self.p.signal_connect("buddy-signed-off", self._purple_signal_sign_off_cb)
def add_account(self):
username = "carmanplugintest@gmail.com"
host = "172.18.216.211"
port = 8080
self.p.account_add(username, self.protocol_id, host, port)
- self.accs = self.p.accounts_get_dict()
+ self.accs = self.p.accounts
for acc in self.accs.keys():
self.window.new_account(acc)
ecore.main_loop_quit()
if __name__ == '__main__':
-
nullpurple = NullClientPurple()
ecore.main_loop_begin()
@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
# load pounces
pounce.c_purple_pounces_load()
+ # initialize accounts
+ self.load_accounts()
+
return ret
def add_account_cb(self, name, func):
jabber, "jabber-receiving-xmlnode", &handle,
<signals.PurpleCallback> 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()
while iter:
acc = <account.PurpleAccount *> iter.data
if <account.PurpleAccount *>acc:
- self.account_add(acc.username.split("/")[0], acc.protocol_id, "172.18.216.211", 8080)
+ 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)
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)
+ 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()
- 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 "proxy.pyx"
include "account.pyx"