Removind Account's dependency and adding _get_structure() function
[python-purple] / purple.pyx
index 6a269cd..26a972f 100644 (file)
@@ -65,38 +65,39 @@ cdef class Purple:
     @parm default_path: Full path for libpurple user files.
     """
 
-    cdef object __accounts
-
     def __init__(self, debug_enabled=True, app_name=__APP_NAME__, default_path=__DEFAULT_PATH__):
-        self.__accounts = {}
         if app_name is not __APP_NAME__:
             __APP_NAME__ = app_name
 
         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_info("core_ui_ops", "%s", "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_info("core_ui_ops", "%s", "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_info("core_ui_ops", "%s", "ui_init\n")
+        debug.purple_debug_info("core_ui_ops", "%s", "ui_init\n")
 
         account.purple_accounts_set_ui_ops(&c_account_ui_ops)
         connection.c_purple_connections_set_ui_ops(&c_conn_ui_ops)
@@ -109,7 +110,7 @@ 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_info("core_ui_ops", "%s", "quit\n")
+        debug.purple_debug_info("core_ui_ops", "%s", "quit\n")
 
         global c_ui_info
 
@@ -222,13 +223,13 @@ cdef class Purple:
         # initialize purple core
         ret = core.c_purple_core_init(__APP_NAME__)
         if ret is False:
-            debug.c_purple_debug_fatal("main", "%s", "libpurple " \
+            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_fatal("main", "%s", "Another instance of " \
+            debug.purple_debug_fatal("main", "%s", "Another instance of " \
                                       "libpurple is already running.\n")
             core.c_purple_core_quit()
             return False
@@ -240,15 +241,15 @@ cdef class Purple:
         # load pounces
         pounce.c_purple_pounces_load()
 
-        # initialize accounts
-        self.load_accounts()
-
         return ret
 
     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)
+
+        @param type     Callback type (e.g. "account")
+        @param name     Callback name (e.g. "notify-added")
+        @param callback Callback to be called
         """
         global account_cbs
         global blist_cbs
@@ -313,45 +314,6 @@ 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 load_accounts(self):
-        cdef glib.GList *iter
-        cdef account.PurpleAccount *acc
-        iter = account.purple_accounts_get_all()
-        while iter:
-            acc = <account.PurpleAccount *> iter.data
-            if <account.PurpleAccount *>acc:
-                username = <char *> account.purple_account_get_username(acc)
-                protocol_id = <char *> 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.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()
-
-    def account_verify(self, acc_username):
-        if self.__accounts:
-            for username in self.__accounts.keys():
-                if acc_username == username:
-                    return self.__accounts[username]
-        else:
-            return None
-
     def accounts_get_all(self):
         cdef glib.GList *iter
         cdef account.PurpleAccount *acc
@@ -369,16 +331,29 @@ cdef class Purple:
                 protocol_id = <char *> account.purple_account_get_protocol_id(acc)
 
                 if username != NULL and protocol_id != NULL:
-                    account_list.append(Account(username, protocol_id))
+                    account_list.append(Account(self, username, protocol_id))
             iter = iter.next
 
         return account_list
 
-include "plugin.pyx"
+    def protocols_get_all(self):
+        cdef glib.GList *iter
+        cdef plugin.PurplePlugin *pp
+
+        iter = plugin.c_purple_plugins_get_protocols()
+        protocol_list = []
+        while iter:
+            pp = <plugin.PurplePlugin*> iter.data
+            if pp.info and pp.info.name:
+                protocol_list.append[Protocol(pp.info.id)]
+            iter = iter.next
+        return protocol_list
+
+include "protocol.pyx"
+#include "plugin.pyx"
 include "proxy.pyx"
 #include "protocol.pyx"
 include "account.pyx"
 include "buddy.pyx"
 #include "connection.pyx"
 include "conversation.pyx"
-