Small cleanups.
[python-purple] / purple.pyx
index b02c69c..3385417 100644 (file)
@@ -24,19 +24,22 @@ cdef extern from "c_purple.h":
 
 import ecore
 
+include "plugin.pyx"
+
 __DEFAULT_PATH__ = "/tmp"
 __APP_NAME__ = "carman-purple-python"
 __APP_VERSION__ = "0.1"
 
 cdef account.PurpleAccountUiOps c_account_ui_ops
-#cdef blist.PurpleBlistUiOps c_blist_ui_ops
+cdef blist.PurpleBlistUiOps c_blist_ui_ops
 cdef connection.PurpleConnectionUiOps c_conn_ui_ops
 cdef conversation.PurpleConversationUiOps c_conv_ui_ops
 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 request.PurpleRequestUiOps c_request_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
 
 cdef glib.GHashTable *c_ui_info
@@ -44,8 +47,15 @@ cdef glib.GHashTable *c_ui_info
 c_ui_info = NULL
 
 include "account_cbs.pxd"
+include "blist_cbs.pxd"
 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"
 
 cdef class Purple:
     """ Purple class.
@@ -55,6 +65,8 @@ cdef class Purple:
     @parm default_path: Full path for libpurple user files.
     """
 
+    cdef Plugins plugins
+
     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
@@ -65,9 +77,10 @@ cdef class Purple:
         debug.c_purple_debug_set_enabled(debug_enabled)
         util.c_purple_util_set_user_dir(default_path)
         plugin.c_purple_plugins_add_search_path(default_path)
+        self.plugins = Plugins()
 
         # 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):
         core.c_purple_core_quit()
@@ -86,10 +99,11 @@ cdef class Purple:
 
         account.c_purple_accounts_set_ui_ops(&c_account_ui_ops)
         connection.c_purple_connections_set_ui_ops(&c_conn_ui_ops)
-        #blist.c_purple_blist_set_ui_ops(&c_blist_ui_ops)
+        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)
-        #request.c_purple_request_set_ui_ops(&c_request_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)
 
@@ -103,9 +117,10 @@ 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)
+        #ft.c_purple_xfers_set_ui_ops(NULL)
+        #roomlist.c_purple_roomlist_set_ui_ops(NULL)
 
         if c_ui_info:
             glib.g_hash_table_destroy(c_ui_info)
@@ -129,12 +144,18 @@ cdef class Purple:
 
         if callbacks_dict is not None:
             global account_cbs
+            global blist_cbs
             global connection_cbs
             global conversation_cbs
+            global notify_cbs
+            global request_cbs
 
             account_cbs = callbacks_dict["account"]
+            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
@@ -142,6 +163,17 @@ cdef class Purple:
         c_account_ui_ops.request_authorize = request_authorize
         c_account_ui_ops.close_account_request = close_account_request
 
+        c_blist_ui_ops.new_list = new_list
+        c_blist_ui_ops.new_node = new_node
+        c_blist_ui_ops.show = show
+        c_blist_ui_ops.update = update
+        c_blist_ui_ops.remove = remove
+        c_blist_ui_ops.destroy = destroy
+        c_blist_ui_ops.set_visible = set_visible
+        c_blist_ui_ops.request_add_buddy = request_add_buddy
+        c_blist_ui_ops.request_add_chat = request_add_chat
+        c_blist_ui_ops.request_add_group = request_add_group
+
         c_conn_ui_ops.connect_progress = connect_progress
         c_conn_ui_ops.connected = connected
         c_conn_ui_ops.disconnected = disconnected
@@ -167,6 +199,24 @@ cdef class Purple:
         c_conv_ui_ops.custom_smiley_close = custom_smiley_close
         c_conv_ui_ops.send_confirm = send_confirm
 
+        c_notify_ui_ops.notify_message = notify_message
+        c_notify_ui_ops.notify_email = notify_email
+        c_notify_ui_ops.notify_emails = notify_emails
+        c_notify_ui_ops.notify_formatted = notify_formatted
+        c_notify_ui_ops.notify_searchresults = notify_searchresults
+        c_notify_ui_ops.notify_searchresults_new_rows = notify_searchresults_new_rows
+        c_notify_ui_ops.notify_userinfo = notify_userinfo
+        c_notify_ui_ops.notify_uri = notify_uri
+        c_notify_ui_ops.close_notify = close_notify
+
+        c_request_ui_ops.request_input = request_input
+        c_request_ui_ops.request_choice = request_choice
+        c_request_ui_ops.request_action = request_action
+        c_request_ui_ops.request_fields = request_fields
+        c_request_ui_ops.request_file = request_file
+        c_request_ui_ops.close_request = close_request
+        c_request_ui_ops.request_folder = request_folder
+
         c_core_ui_ops.ui_prefs_init = <void (*)()> self.__core_ui_ops_ui_prefs_init
         c_core_ui_ops.debug_ui_init = <void (*)()> self.__core_ui_ops_debug_init
         c_core_ui_ops.ui_init = <void (*)()> self.__core_ui_ops_ui_init
@@ -178,7 +228,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)
@@ -205,21 +255,28 @@ 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
+        return self.plugins.get_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
+
+        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)
+
 include "proxy.pyx"
 include "account.pyx"
 include "buddy.pyx"