X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=inline;f=purple.pyx;h=33854176ecbf17fe0f1778517565eae22bd9f7e2;hb=23bbccf4aeb7b092ae26a90f05c1ced78b512295;hp=0c4be9a33a222fb0a987b13a548725296d7eb784;hpb=3ac088be4b86dfb87718586f7a095f88b566ce42;p=python-purple

diff --git a/purple.pyx b/purple.pyx
index 0c4be9a..3385417 100644
--- a/purple.pyx
+++ b/purple.pyx
@@ -24,6 +24,8 @@ cdef extern from "c_purple.h":
 
 import ecore
 
+include "plugin.pyx"
+
 __DEFAULT_PATH__ = "/tmp"
 __APP_NAME__ = "carman-purple-python"
 __APP_VERSION__ = "0.1"
@@ -36,6 +38,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 +52,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"
@@ -61,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
@@ -71,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()
@@ -95,6 +102,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 +117,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 +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)
@@ -246,16 +255,7 @@ 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()