X-Git-Url: http://git.maemo.org/git/?p=python-purple;a=blobdiff_plain;f=purple.pyx;h=94317e9d6390a4fa4c6bb3e24bbdd1718a6c3b70;hp=df17ba059f7ea71e27a639b5a20d0db83fbece97;hb=b78bc0997c89809be6986f4daf7ec162e0009c72;hpb=914326e7528712bb501aa9267b4156a4da4ee358

diff --git a/purple.pyx b/purple.pyx
index df17ba0..94317e9 100644
--- a/purple.pyx
+++ b/purple.pyx
@@ -28,14 +28,26 @@ __DEFAULT_PATH__ = "/tmp"
 __APP_NAME__ = "carman-purple-python"
 __APP_VERSION__ = "0.1"
 
-cdef core.PurpleCoreUiOps c_core_ui_ops
+cdef account.PurpleAccountUiOps c_account_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 roomlist.PurpleRoomlistUiOps c_rlist_ui_ops
+
 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 "notify_cbs.pxd"
 
 cdef class Purple:
     """ Purple class.
@@ -74,10 +86,14 @@ cdef class Purple:
     cdef void __core_ui_ops_ui_init(self):
         debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "ui_init\n")
 
-        global c_conv_ui_ops
-
+        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)
         conversation.c_purple_conversations_set_ui_ops(&c_conv_ui_ops)
-        # FIXME: Add core ui initialization here
+        notify.c_purple_notify_set_ui_ops(&c_notify_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)
 
     cdef void __core_ui_ops_quit(self):
         debug.c_purple_debug(debug.PURPLE_DEBUG_INFO, "core_ui_ops", "quit\n")
@@ -89,9 +105,9 @@ 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)
-        request.c_purple_request_set_ui_ops(NULL)
-        ft.c_purple_xfers_set_ui_ops(NULL)
-        roomlist.c_purple_roomlist_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)
 
         if c_ui_info:
             glib.g_hash_table_destroy(c_ui_info)
@@ -113,13 +129,44 @@ cdef class Purple:
     def purple_init(self, callbacks_dict=None):
         """ Initializes libpurple """
 
-        global c_conv_ui_ops
-        global c_core_ui_ops
-        global c_eventloop_ui_ops
-
         if callbacks_dict is not None:
-            global conversations_cbs
-            conversations_cbs = callbacks_dict["conversation"]
+            global account_cbs
+            global blist_cbs
+            global connection_cbs
+            global conversation_cbs
+            global notify_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"]
+
+        c_account_ui_ops.notify_added = notify_added
+        c_account_ui_ops.status_changed = status_changed
+        c_account_ui_ops.request_add = request_add
+        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
+        c_conn_ui_ops.notice = notice
+        c_conn_ui_ops.report_disconnect = report_disconnect
+        c_conn_ui_ops.network_connected = network_connected
+        c_conn_ui_ops.network_disconnected = network_disconnected
+        c_conn_ui_ops.report_disconnect_reason = report_disconnect_reason
 
         c_conv_ui_ops.create_conversation = create_conversation
         c_conv_ui_ops.destroy_conversation = destroy_conversation
@@ -137,6 +184,16 @@ 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_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