More cosmetics.
[python-purple] / purple.pyx
index 29594c0..b02c69c 100644 (file)
@@ -28,6 +28,25 @@ __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 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 "connection_cbs.pxd"
+include "conversation_cbs.pxd"
+
 cdef class Purple:
     """ Purple class.
 
@@ -36,13 +55,7 @@ cdef class Purple:
     @parm default_path: Full path for libpurple user files.
     """
 
-    cdef core.PurpleCoreUiOps c_core_ui_ops
-    cdef eventloop.PurpleEventLoopUiOps c_eventloop_ui_ops
-    cdef glib.GHashTable *c_ui_info
-
     def __init__(self, debug_enabled=True, app_name=__APP_NAME__, default_path=__DEFAULT_PATH__):
-        self.c_ui_info = NULL
-
         if app_name is not __APP_NAME__:
             __APP_NAME__ = app_name
 
@@ -71,11 +84,20 @@ 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")
 
-        # FIXME: Add core ui initialization here
+        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)
+        #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")
 
+        global c_ui_info
+
         account.c_purple_accounts_set_ui_ops(NULL)
         connection.c_purple_connections_set_ui_ops(NULL)
         blist.c_purple_blist_set_ui_ops(NULL)
@@ -85,41 +107,81 @@ cdef class Purple:
         ft.c_purple_xfers_set_ui_ops(NULL)
         roomlist.c_purple_roomlist_set_ui_ops(NULL)
 
-        if self.c_ui_info:
-            glib.g_hash_table_destroy(self.c_ui_info)
+        if c_ui_info:
+            glib.g_hash_table_destroy(c_ui_info)
 
     cdef glib.GHashTable *__core_ui_ops_get_ui_info(self):
-        if self.c_ui_info == NULL:
-            self.c_ui_info = glib.g_hash_table_new(glib.g_str_hash, glib.g_str_equal)
+        global c_ui_info
+
+        if c_ui_info == NULL:
+            c_ui_info = glib.g_hash_table_new(glib.g_str_hash, glib.g_str_equal)
 
-            glib.g_hash_table_insert(self.c_ui_info, "name", <glib.gpointer> __APP_NAME__)
-            glib.g_hash_table_insert(self.c_ui_info, "version", <glib.gpointer> __APP_VERSION__)
-        return self.c_ui_info
+            glib.g_hash_table_insert(c_ui_info, "name", <glib.gpointer> __APP_NAME__)
+            glib.g_hash_table_insert(c_ui_info, "version", <glib.gpointer> __APP_VERSION__)
+        return c_ui_info
 
     def __glib_iteration_when_idle(self):
         glib.g_main_context_iteration(NULL, False)
         return True
 
-    def purple_init(self):
+    def purple_init(self, callbacks_dict=None):
         """ Initializes libpurple """
-        # initialize c_core_ui_ops structure
-        self.c_core_ui_ops.ui_prefs_init = <void (*)()> self.__core_ui_ops_ui_prefs_init
-        self.c_core_ui_ops.debug_ui_init = <void (*)()> self.__core_ui_ops_debug_init
-        self.c_core_ui_ops.ui_init = <void (*)()> self.__core_ui_ops_ui_init
-        self.c_core_ui_ops.quit = <void (*)()> self.__core_ui_ops_quit
-        self.c_core_ui_ops.get_ui_info = <glib.GHashTable* (*)()> self.__core_ui_ops_get_ui_info
-
-        core.c_purple_core_set_ui_ops(&self.c_core_ui_ops)
-
-        # initialize c_eventloop_ui_ops structure
-        self.c_eventloop_ui_ops.timeout_add = glib.g_timeout_add
-        self.c_eventloop_ui_ops.timeout_remove = glib.g_source_remove
-        self.c_eventloop_ui_ops.input_add = glib_input_add
-        self.c_eventloop_ui_ops.input_remove = glib.g_source_remove
-        self.c_eventloop_ui_ops.input_get_error = NULL
-        self.c_eventloop_ui_ops.timeout_add_seconds = glib.g_timeout_add_seconds
 
-        eventloop.c_purple_eventloop_set_ui_ops(&self.c_eventloop_ui_ops)
+        if callbacks_dict is not None:
+            global account_cbs
+            global connection_cbs
+            global conversation_cbs
+
+            account_cbs = callbacks_dict["account"]
+            connection_cbs = callbacks_dict["connection"]
+            conversation_cbs = callbacks_dict["conversation"]
+
+        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_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
+        c_conv_ui_ops.write_chat = write_chat
+        c_conv_ui_ops.write_im = write_im
+        c_conv_ui_ops.write_conv = write_conv
+        c_conv_ui_ops.chat_add_users = chat_add_users
+        c_conv_ui_ops.chat_rename_user = chat_rename_user
+        c_conv_ui_ops.chat_remove_users = chat_remove_users
+        c_conv_ui_ops.chat_update_user = chat_update_user
+        c_conv_ui_ops.present = present
+        c_conv_ui_ops.has_focus = has_focus
+        c_conv_ui_ops.custom_smiley_add = custom_smiley_add
+        c_conv_ui_ops.custom_smiley_write = custom_smiley_write
+        c_conv_ui_ops.custom_smiley_close = custom_smiley_close
+        c_conv_ui_ops.send_confirm = send_confirm
+
+        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
+        c_core_ui_ops.quit = <void (*)()> self.__core_ui_ops_quit
+        c_core_ui_ops.get_ui_info = <glib.GHashTable* (*)()> self.__core_ui_ops_get_ui_info
+
+        c_eventloop_ui_ops.timeout_add = glib.g_timeout_add
+        c_eventloop_ui_ops.timeout_remove = glib.g_source_remove
+        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
+
+        core.c_purple_core_set_ui_ops(&c_core_ui_ops)
+        eventloop.c_purple_eventloop_set_ui_ops(&c_eventloop_ui_ops)
 
         # initialize purple core
         ret = core.c_purple_core_init(__APP_NAME__)
@@ -158,6 +220,7 @@ cdef class Purple:
         conn = Connection()
         conn.connect()
 
+include "proxy.pyx"
 include "account.pyx"
 include "buddy.pyx"
 include "connection.pyx"