Adding function get_protocol_id to Account class

[python-purple] / purple.pyx

diff --git a/purple.pyx b/purple.pyx
index d4d5383..b984590 100644 (file)
--- 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.
 
@@ -63,10 +65,10 @@ cdef class Purple:
     @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
 
@@ -137,22 +139,9 @@ cdef class Purple:
         glib.g_main_context_iteration(NULL, False)
         return True
 
-    def purple_init(self, callbacks_dict=None):
+    def purple_init(self):
         """ Initializes libpurple """
 
-        if callbacks_dict is not None:
-            global blist_cbs
-            global connection_cbs
-            global conversation_cbs
-            global notify_cbs
-            global request_cbs
-
-            blist_cbs = callbacks_dict["blist"]
-            connection_cbs = callbacks_dict["connection"]
-            conversation_cbs = callbacks_dict["conversation"]
-            notify_cbs = callbacks_dict["notify"]
-            request_cbs = callbacks_dict["request"]
-
         c_account_ui_ops.notify_added = notify_added
         c_account_ui_ops.status_changed = status_changed
         c_account_ui_ops.request_add = request_add
@@ -248,15 +237,28 @@ cdef class Purple:
         # load pounces
         pounce.c_purple_pounces_load()
 
+        # initialize accounts
+        self.load_accounts()
+
         return ret
 
-    def add_account_cb(self, name, func):
+    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)
+        """
         global account_cbs
-        account_cbs[name] = func
-
-    def connect(self):
-        conn = Connection()
-        conn.connect()
+        global blist_cbs
+        global connection_cbs
+        global conversation_cbs
+        global notify_cbs
+        global request_cbs
+
+        { "account": account_cbs,
+          "blist": blist_cbs,
+          "connection": connection_cbs,
+          "conversation": conversation_cbs,
+          "notify": notify_cbs,
+          "request": request_cbs }[type][name] = func
 
     def signal_connect(self, name=None, cb=None):
         cdef int handle
@@ -272,7 +274,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,
+                    <signals.PurpleCallback> signal_signed_on_cb, NULL)
+        elif name == "signed-off":
+            signals.c_purple_signal_connect(
+                    connection.c_purple_connections_get_handle(),
+                    "signed-off", &handle,
+                    <signals.PurpleCallback> signal_signed_off_cb, NULL)
+        elif name == "connection-error":
+            signals.c_purple_signal_connect(
+                    connection.c_purple_connections_get_handle(),
+                    "connection-error", &handle,
+                    <signals.PurpleCallback> 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,
+                    <signals.PurpleCallback> 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,
@@ -287,47 +309,46 @@ cdef class Purple:
                     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"
 include "buddy.pyx"
-include "connection.pyx"
+#include "connection.pyx"
 include "conversation.pyx"