Added more properties to account and buddy.

[python-purple] / purple.pyx

diff --git a/purple.pyx b/purple.pyx
index 0c4be9a..b3ab8b1 100644 (file)
--- a/purple.pyx
+++ b/purple.pyx
@@ -36,6 +36,7 @@ cdef core.PurpleCoreUiOps c_core_ui_ops
 cdef eventloop.PurpleEventLoopUiOps c_eventloop_ui_ops
 #cdef ft.PurpleXferUiOps c_ft_ui_ops
 cdef notify.PurpleNotifyUiOps c_notify_ui_ops
+#cdef privacy.PurplePrivacyUiOps c_privacy_ui_ops
 cdef request.PurpleRequestUiOps c_request_ui_ops
 #cdef roomlist.PurpleRoomlistUiOps c_rlist_ui_ops
 
@@ -49,6 +50,7 @@ include "connection_cbs.pxd"
 include "conversation_cbs.pxd"
 #include "xfer_cbs.pxd"
 include "notify_cbs.pxd"
+#include "privacy_cbs.pxd"
 include "request_cbs.pxd"
 #include "roomlist_cbs.pxd"
 include "signal_cbs.pxd"
@@ -60,7 +62,6 @@ cdef class Purple:
     @parm app_name: Set application name.
     @parm default_path: Full path for libpurple user files.
     """
-
     def __init__(self, debug_enabled=True, app_name=__APP_NAME__, default_path=__DEFAULT_PATH__):
         if app_name is not __APP_NAME__:
             __APP_NAME__ = app_name
@@ -73,9 +74,9 @@ cdef class Purple:
         plugin.c_purple_plugins_add_search_path(default_path)
 
         # adds glib iteration inside ecore main loop
-        ecore.idler_add(self.__glib_iteration_when_idle)
+        ecore.timer_add(0.001, self.__glib_iteration_when_idle)
 
-    def __del__(self):
+    def destroy(self):
         core.c_purple_core_quit()
 
     cdef void __core_ui_ops_ui_prefs_init(self):
@@ -95,6 +96,7 @@ cdef class Purple:
         blist.c_purple_blist_set_ui_ops(&c_blist_ui_ops)
         conversation.c_purple_conversations_set_ui_ops(&c_conv_ui_ops)
         notify.c_purple_notify_set_ui_ops(&c_notify_ui_ops)
+        #privacy.c_purple_privacy_set_ui_ops(&c_privacy_ui_ops)
         request.c_purple_request_set_ui_ops(&c_request_ui_ops)
         #ft.c_purple_xfers_set_ui_ops(&c_ft_ui_ops)
         #roomlist.c_purple_roomlist_set_ui_ops(&c_rlist_ui_ops)
@@ -109,6 +111,7 @@ cdef class Purple:
         blist.c_purple_blist_set_ui_ops(NULL)
         conversation.c_purple_conversations_set_ui_ops(NULL)
         notify.c_purple_notify_set_ui_ops(NULL)
+        #privacy.c_purple_privacy_set_ui_ops(NULL)
         request.c_purple_request_set_ui_ops(NULL)
         #ft.c_purple_xfers_set_ui_ops(NULL)
         #roomlist.c_purple_roomlist_set_ui_ops(NULL)
@@ -219,7 +222,7 @@ cdef class Purple:
         c_eventloop_ui_ops.input_add = glib_input_add
         c_eventloop_ui_ops.input_remove = glib.g_source_remove
         c_eventloop_ui_ops.input_get_error = NULL
-        c_eventloop_ui_ops.timeout_add_seconds = glib.g_timeout_add_seconds
+        c_eventloop_ui_ops.timeout_add_seconds = NULL
 
         core.c_purple_core_set_ui_ops(&c_core_ui_ops)
         eventloop.c_purple_eventloop_set_ui_ops(&c_eventloop_ui_ops)
@@ -245,37 +248,42 @@ cdef class Purple:
 
         return ret
 
-    def get_protocols(self):
-        cdef glib.GList *iter
-        cdef plugin.PurplePlugin *__plugin
-        protocols = []
-        iter = plugin.c_purple_plugins_get_protocols()
-        while iter:
-            __plugin = <plugin.PurplePlugin*> iter.data
-            if __plugin.info and __plugin.info.name:
-                protocols += [(__plugin.info.id, __plugin.info.name)]
-            iter = iter.next
-        return protocols
-
     def connect(self):
         conn = Connection()
         conn.connect()
 
-    def attach_signals(self, __signal_cbs=None):
-        if __signal_cbs is not None:
-            global signal_cbs
-            signal_cbs = __signal_cbs
-
+    def signal_connect(self, name=None, cb=None):
         cdef int handle
-
-        signals.c_purple_signal_connect(blist.c_purple_blist_get_handle(),
-                "buddy-signed-off", &handle,
-                <signals.PurpleCallback> signal_buddy_signed_off_cb, NULL)
-
-        signals.c_purple_signal_connect(
-                conversation.c_purple_conversations_get_handle(),
-                "receiving-im-msg", &handle,
-                <signals.PurpleCallback> signal_receiving_im_msg_cb, NULL)
+        cdef plugin.PurplePlugin *jabber
+
+        if name is None:
+            return
+
+        jabber = prpl.c_purple_find_prpl("prpl-jabber")
+        if jabber == NULL:
+            return
+
+        global signal_cbs
+        signal_cbs[name] = cb
+
+        if name == "buddy-signed-off":
+            signals.c_purple_signal_connect(
+                    blist.c_purple_blist_get_handle(),
+                    "buddy-signed-off", &handle,
+                    <signals.PurpleCallback> signal_buddy_signed_off_cb, NULL)
+        elif name == "receiving-im-msg":
+            signals.c_purple_signal_connect(
+                    conversation.c_purple_conversations_get_handle(),
+                    "receiving-im-msg", &handle,
+                    <signals.PurpleCallback> signal_receiving_im_msg_cb, NULL)
+        elif name == "jabber-receiving-xmlnode":
+            signals.c_purple_signal_connect(
+                    jabber, "jabber-receiving-xmlnode", &handle,
+                    <signals.PurpleCallback> jabber_receiving_xmlnode_cb, NULL)
+
+    def new_account(self, username, protocol_id):
+        acc = Account(username, protocol_id)
+        return acc
 
 include "proxy.pyx"
 include "account.pyx"