Replaced c_purple* with purple* for most files.

FIXES:
 - Replaced c_purple* with purple* for most files.

Signed-off-by: Bruno Abinader <bruno.abinader@indt.org.br>
Acked-by: Ragner Magalhaes <ragner.magalhaes@indt.org.br>

git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1428 596f6dd7-e928-0410-a184-9e12fd12cf7e

blist_cbs.pxd

@@ -28,23 +28,23 @@ cdef void __group_node_cb(blist.PurpleBlistNode *node, object callback):
     cdef blist.PurpleGroup *group = <blist.PurpleGroup *>node
     cdef char *c_name = NULL
 
-    c_name = <char *> blist.c_purple_group_get_name(group)
+    c_name = <char *> blist.purple_group_get_name(group)
     if c_name == NULL:
         name = None
     else:
         name = c_name
 
-    currentsize = blist.c_purple_blist_get_group_size(group, False)
-    totalsize = blist.c_purple_blist_get_group_size(group, True)
-    online = blist.c_purple_blist_get_group_online_count(group)
+    currentsize = blist.purple_blist_get_group_size(group, False)
+    totalsize = blist.purple_blist_get_group_size(group, True)
+    online = blist.purple_blist_get_group_online_count(group)
 
     callback(node.type, name, totalsize, currentsize, online)
 
 cdef void __contact_node_cb(blist.PurpleBlistNode *node, object callback):
     cdef blist.PurpleContact *contact = <blist.PurpleContact *>node
     cdef char *c_alias = NULL
 
-    c_alias = <char *> blist.c_purple_contact_get_alias(contact)
+    c_alias = <char *> blist.purple_contact_get_alias(contact)
     if c_alias == NULL:
         alias = None
     else:
@@ -58,13 +58,13 @@ cdef void __buddy_node_cb(blist.PurpleBlistNode *node, object callback):
     cdef char *c_name = NULL
     cdef char *c_alias = NULL
 
-    c_name = <char *> blist.c_purple_buddy_get_name(buddy)
+    c_name = <char *> blist.purple_buddy_get_name(buddy)
     if c_name == NULL:
         name = None
     else:
         name = c_name
 
-    c_alias = <char *> blist.c_purple_buddy_get_alias_only(buddy)
+    c_alias = <char *> blist.purple_buddy_get_alias_only(buddy)
     if c_alias == NULL:
         alias = None
     else:
@@ -76,7 +76,7 @@ cdef void __chat_node_cb(blist.PurpleBlistNode *node, object callback):
     cdef blist.PurpleChat *chat = <blist.PurpleChat *>node
     cdef char *c_name = NULL
 
-    c_name = <char *> blist.c_purple_chat_get_name(chat)
+    c_name = <char *> blist.purple_chat_get_name(chat)
     if c_name == NULL:
         name = None
     else:

buddy.pyx

@@ -35,23 +35,23 @@ cdef class Buddy:
 
     def __get_alias(self):
         if self.c_buddy:
-            return <char *>blist.c_purple_buddy_get_alias_only(self.c_buddy)
+            return <char *>blist.purple_buddy_get_alias_only(self.c_buddy)
         else:
             return None
     alias = property(__get_alias)
 
     def __get_name(self):
         if self.c_buddy:
-            return <char *>blist.c_purple_buddy_get_name(self.c_buddy)
+            return <char *>blist.purple_buddy_get_name(self.c_buddy)
         else:
             return None
     name = property(__get_name)
 
     """
     def __get_online(self): # FIXME
         name = self.name
-        self.c_buddy = blist.c_purple_find_buddy(self.__acc.c_account, name)
-        return status.c_purple_presence_is_online(blist.c_purple_buddy_get_presence(self.c_buddy))
+        self.c_buddy = blist.purple_find_buddy(self.__acc.c_account, name)
+        return status.purple_presence_is_online(blist.purple_buddy_get_presence(self.c_buddy))
     online = property(__get_online)
     """
 
@@ -66,5 +66,5 @@ cdef class Buddy:
         if alias is not None:
             c_alias = alias
 
-        self.c_buddy = blist.c_purple_buddy_new(<account.PurpleAccount *>\
+        self.c_buddy = blist.purple_buddy_new(<account.PurpleAccount *>\
                 self.__acc.c_account, c_name, c_alias)

conversation.pyx

@@ -27,7 +27,7 @@ cdef class Conversation:
     cdef object __name
 
     def __init__(self):
-        conversation.c_purple_conversations_init()
+        conversation.purple_conversations_init()
         self.__name = None
         self.__acc = None
 
@@ -54,23 +54,23 @@ cdef class Conversation:
 
         if type == "UNKNOWN":
             self.__conv =\
-            conversation.c_purple_conversation_new(conversation.PURPLE_CONV_TYPE_UNKNOWN,\
+            conversation.purple_conversation_new(conversation.PURPLE_CONV_TYPE_UNKNOWN,\
                 c_account, self.__name)
         elif type == "IM":
             self.__conv =\
-            conversation.c_purple_conversation_new(conversation.PURPLE_CONV_TYPE_IM,\
+            conversation.purple_conversation_new(conversation.PURPLE_CONV_TYPE_IM,\
                 <account.PurpleAccount*> c_account, self.__name)
         elif type == "CHAT":
             self.__conv =\
-            conversation.c_purple_conversation_new(conversation.PURPLE_CONV_TYPE_CHAT,\
+            conversation.purple_conversation_new(conversation.PURPLE_CONV_TYPE_CHAT,\
                 c_account, self.__name)
         elif type == "MISC":
             self.__conv =\
-            conversation.c_purple_conversation_new(conversation.PURPLE_CONV_TYPE_MISC,\
+            conversation.purple_conversation_new(conversation.PURPLE_CONV_TYPE_MISC,\
                 c_account, self.__name)
         elif type == "ANY":
             self.__conv =\
-            conversation.c_purple_conversation_new(conversation.PURPLE_CONV_TYPE_ANY,\
+            conversation.purple_conversation_new(conversation.PURPLE_CONV_TYPE_ANY,\
                 c_account, self.__name)
 
     def conversation_set_ui_ops(self):
@@ -91,16 +91,16 @@ cdef class Conversation:
         c_conv_ui_ops.custom_smiley_close = NULL
         c_conv_ui_ops.send_confirm = NULL
 
-        conversation.c_purple_conversation_set_ui_ops(self.__conv, &c_conv_ui_ops)
+        conversation.purple_conversation_set_ui_ops(self.__conv, &c_conv_ui_ops)
 
     def write(self, char *message):
         if self.__conv:
-            conversation.c_purple_conv_im_send(conversation.c_purple_conversation_get_im_data(self.__conv), message)
+            conversation.purple_conv_im_send(conversation.purple_conversation_get_im_data(self.__conv), message)
 
     def get_handle(self):
-        conversation.c_purple_conversations_get_handle()
+        conversation.purple_conversations_get_handle()
 
     def destroy(self):
         print "[DEBUG]: Destroy conversation: %s" % self.__name
         if self.__conv:
-            conversation.c_purple_conversation_destroy(self.__conv)
+            conversation.purple_conversation_destroy(self.__conv)

conversation_cbs.pxd

@@ -34,13 +34,13 @@ cdef void create_conversation(conversation.PurpleConversation *conv):
     debug.purple_debug_info("conversation", "%s", "create-conversation\n")
     cdef char *c_name = NULL
 
-    c_name = <char *> conversation.c_purple_conversation_get_name(conv)
+    c_name = <char *> conversation.purple_conversation_get_name(conv)
     if c_name == NULL:
         name = None
     else:
         name = c_name
 
-    type = conversation.c_purple_conversation_get_type(conv)
+    type = conversation.purple_conversation_get_type(conv)
 
     if conversation_cbs.has_key("create-conversation"):
         (<object> conversation_cbs["create-conversation"])(name, type)
@@ -74,7 +74,7 @@ cdef void write_im(conversation.PurpleConversation *conv, const_char *who, \
     @see purple_conv_im_write()
     """
     debug.purple_debug_info("conversation", "%s", "write-im\n")
-    cdef account.PurpleAccount *acc = conversation.c_purple_conversation_get_account(conv)
+    cdef account.PurpleAccount *acc = conversation.purple_conversation_get_account(conv)
     cdef blist.PurpleBuddy *buddy = NULL
     cdef char *c_username = NULL
     cdef char *c_sender_alias = NULL
@@ -87,8 +87,8 @@ cdef void write_im(conversation.PurpleConversation *conv, const_char *who, \
 
     if who:
         sender = <char *> who
-        buddy = blist.c_purple_find_buddy(acc, <char *> who)
-        c_sender_alias = <char *> blist.c_purple_buddy_get_alias_only(buddy)
+        buddy = blist.purple_find_buddy(acc, <char *> who)
+        c_sender_alias = <char *> blist.purple_buddy_get_alias_only(buddy)
     else:
         sender = None
 

libpurple/blist.pxd

@@ -22,13 +22,10 @@ cimport glib
 cimport account
 cimport buddyicon
 
-cdef extern from *:
-    ctypedef char const_char "const char"
-
 # hack to avoid recursive loops by cython
 cdef extern from "libpurple/status.h":
-    ctypedef struct PurplePresence:
-        pass
+    ctypedef struct PurpleStatus
+    ctypedef struct PurplePresence
 
 cdef extern from "libpurple/blist.h":
     ctypedef struct PurpleBuddyList
@@ -103,29 +100,119 @@ cdef extern from "libpurple/blist.h":
         void (*remove) (PurpleBuddyList *list, PurpleBlistNode *node)
         void (*destroy) (PurpleBuddyList *list)
         void (*set_visible) (PurpleBuddyList *list, glib.gboolean show)
-        void (*request_add_buddy) (account.PurpleAccount *account, const_char *username, const_char *group, const_char *alias)
-        void (*request_add_chat) (account.PurpleAccount *account, PurpleGroup *group, const_char *alias, const_char *name)
+        void (*request_add_buddy) (account.PurpleAccount *account, char *username, char *group, char *alias)
+        void (*request_add_chat) (account.PurpleAccount *account, PurpleGroup *group, char *alias, char *name)
         void (*request_add_group) ()
 
-    void *c_purple_blist_get_handle "purple_blist_get_handle" ()
-    void c_purple_blist_load "purple_blist_load" ()
-    PurpleBuddyList* c_purple_blist_new "purple_blist_new" ()
-    PurpleBlistNodeType c_purple_blist_node_get_type \
-            "purple_blist_node_get_type" (PurpleBlistNode *node)
-    int c_purple_blist_get_group_size "purple_blist_get_group_size" \
-            (PurpleGroup *group, glib.gboolean offline)
-    int c_purple_blist_get_group_online_count \
-            "purple_blist_get_group_online_count" (PurpleGroup *group)
-    void c_purple_blist_set_ui_ops "purple_blist_set_ui_ops" (PurpleBlistUiOps *ops)
-    const_char *c_purple_chat_get_name "purple_chat_get_name" (PurpleChat *chat)
-    const_char *c_purple_contact_get_alias "purple_contact_get_alias" (PurpleContact *contact)
-    const_char *c_purple_group_get_name "purple_group_get_name" (PurpleGroup *group)
-    PurpleBuddy *c_purple_buddy_new "purple_buddy_new" (account.PurpleAccount *account,
+    # Buddy List API
+    PurpleBuddyList *purple_blist_new()
+    void purple_set_blist(PurpleBuddyList *blist)
+    PurpleBuddyList *purple_get_blist()
+    PurpleBlistNode *purple_blist_get_root()
+    PurpleBlistNode *purple_blist_node_next(PurpleBlistNode *node, \
+            glib.gboolean offline)
+    PurpleBlistNode *purple_blist_node_get_parent(PurpleBlistNode *node)
+    PurpleBlistNode *purple_blist_node_get_first_child(PurpleBlistNode *node)
+    PurpleBlistNode *purple_blist_node_get_sibling_next(PurpleBlistNode *node)
+    PurpleBlistNode *purple_blist_node_get_sibling_prev(PurpleBlistNode *node)
+    void purple_blist_show()
+    void purple_blist_destroy()
+    void purple_blist_set_visible(glib.gboolean show)
+    void purple_blist_update_buddy_status(PurpleBuddy *buddy, \
+            PurpleStatus *old_status)
+    void purple_blist_update_node_icon(PurpleBlistNode *node)
+    void purple_blist_rename_buddy(PurpleBuddy *buddy, char *name)
+    void purple_blist_alias_contact(PurpleContact *contact, char *alias)
+    void purple_blist_alias_buddy(PurpleBuddy *buddy, char *alias)
+    void purple_blist_server_alias_buddy(PurpleBuddy *buddy, char *alias)
+    void purple_blist_alias_chat(PurpleChat *chat, char *alias)
+    void purple_blist_rename_group(PurpleGroup *group, char *name)
+    PurpleChat *purple_chat_new(account.PurpleAccount *account, char *alias, \
+            glib.GHashTable *components)
+    void purple_blist_add_chat(PurpleChat *chat, PurpleGroup *group, \
+            PurpleBlistNode *node)
+    PurpleBuddy *purple_buddy_new(account.PurpleAccount *account, \
             char *screenname, char *alias)
-    const_char *c_purple_buddy_get_alias_only "purple_buddy_get_alias_only" (PurpleBuddy *buddy)
-    const_char *c_purple_buddy_get_name "purple_buddy_get_name" (PurpleBuddy *buddy)
-    PurpleBuddy *c_purple_find_buddy "purple_find_buddy" (account.PurpleAccount *account, char *name)
-    void c_purple_set_blist "purple_set_blist" (PurpleBuddyList *list)
-    glib.GSList *c_purple_find_buddies "purple_find_buddies" (account.PurpleAccount *account, char *name)
-    account.PurpleAccount *c_purple_buddy_get_account "purple_buddy_get_account" (PurpleBuddy *buddy)
-    PurplePresence *c_purple_buddy_get_presence "purple_buddy_get_presence" (PurpleBuddy *buddy)
+    void purple_buddy_set_icon(PurpleBuddy *buddy, \
+            buddyicon.PurpleBuddyIcon *icon)
+    account.PurpleAccount *purple_buddy_get_account(PurpleBuddy *buddy)
+    char *purple_buddy_get_name(PurpleBuddy *buddy)
+    buddyicon.PurpleBuddyIcon *purple_buddy_get_icon(PurpleBuddy *buddy)
+    PurpleContact *purple_buddy_get_contact(PurpleBuddy *buddy)
+    PurplePresence *purple_buddy_get_presence(PurpleBuddy *buddy)
+    void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, \
+            PurpleGroup *group, PurpleBlistNode *node)
+    PurpleGroup *purple_group_new(char *name)
+    void purple_blist_add_group(PurpleGroup *group, PurpleBlistNode *node)
+    PurpleContact *purple_contact_new()
+    void purple_blist_add_contact(PurpleContact *contact, PurpleGroup *group, \
+            PurpleBlistNode *node)
+    void purple_blist_merge_contact(PurpleContact *source, \
+            PurpleBlistNode *node)
+    PurpleBuddy *purple_contact_get_priority_buddy(PurpleContact *contact)
+    char *purple_contact_get_alias(PurpleContact *contact)
+    glib.gboolean purple_contact_on_account(PurpleContact *contact, \
+            account.PurpleAccount *account)
+    void purple_contact_invalidate_priority_buddy(PurpleContact *contact)
+    void purple_blist_remove_buddy(PurpleBuddy *buddy)
+    void purple_blist_remove_contact(PurpleContact *contact)
+    void purple_blist_remove_chat(PurpleChat *chat)
+    void purple_blist_remove_group(PurpleGroup *group)
+    char *purple_buddy_get_alias_only(PurpleBuddy *buddy)
+    char *purple_buddy_get_server_alias(PurpleBuddy *buddy)
+    char *purple_buddy_get_contact_alias(PurpleBuddy *buddy)
+    char *purple_buddy_get_local_alias(PurpleBuddy *buddy)
+    char *purple_buddy_get_alias(PurpleBuddy *buddy)
+    char *purple_chat_get_name(PurpleChat *chat)
+    PurpleBuddy *purple_find_buddy(account.PurpleAccount *account, char *name)
+    PurpleBuddy *purple_find_buddy_in_group(account.PurpleAccount *account, \
+            char *name, PurpleGroup *group)
+    glib.GSList *purple_find_buddies(account.PurpleAccount *account, \
+            char *name)
+    PurpleGroup *purple_find_group(char *name)
+    PurpleChat *purple_blist_find_chat(account.PurpleAccount *account, \
+            char *name)
+    PurpleGroup *purple_chat_get_group(PurpleChat *chat)
+    account.PurpleAccount *purple_chat_get_account(PurpleChat *chat)
+    glib.GHashTable *purple_chat_get_components(PurpleChat *chat)
+    PurpleGroup *purple_buddy_get_group(PurpleBuddy *buddy)
+    glib.GSList *purple_group_get_accounts(PurpleGroup *g)
+    glib.gboolean purple_group_on_account(PurpleGroup *g, \
+            account.PurpleAccount *account)
+    char *purple_group_get_name(PurpleGroup *group)
+    void purple_blist_add_account(account.PurpleAccount *account)
+    void purple_blist_remove_account(account.PurpleAccount *account)
+    int purple_blist_get_group_size(PurpleGroup *group, glib.gboolean offline)
+    int purple_blist_get_group_online_count(PurpleGroup *group)
+
+    # Buddy list file management API
+    void purple_blist_load()
+    void purple_blist_schedule_save()
+    void purple_blist_request_add_buddy(account.PurpleAccount *account, \
+            char *username, char *group, char *alias)
+    void purple_blist_request_add_chat(account.PurpleAccount *account, \
+            PurpleGroup *group, char *alias, char *name)
+    void purple_blist_request_add_group()
+    void purple_blist_node_set_bool(PurpleBlistNode *node, char *key, \
+            glib.gboolean value)
+    glib.gboolean purple_blist_node_get_bool(PurpleBlistNode *node, char *key)
+    void purple_blist_node_set_int(PurpleBlistNode *node, char *key, int value)
+    int purple_blist_node_get_int(PurpleBlistNode *node, char *key)
+    void purple_blist_node_set_string(PurpleBlistNode *node, char *key, \
+            char *value)
+    char *purple_blist_node_get_string(PurpleBlistNode *node, char *key)
+    void purple_blist_node_remove_setting(PurpleBlistNode *node, char *key)
+    void purple_blist_node_set_flags(PurpleBlistNode *node, \
+            PurpleBlistNodeFlags flags)
+    PurpleBlistNodeFlags purple_blist_node_get_flags(PurpleBlistNode *node)
+    PurpleBlistNodeType purple_blist_node_get_type(PurpleBlistNode *node)
+    glib.GList *purple_blist_node_get_extended_menu(PurpleBlistNode *n)
+
+    # UI Registration Functions
+    void purple_blist_set_ui_ops(PurpleBlistUiOps *ops)
+    PurpleBlistUiOps *purple_blist_get_ui_ops()
+
+    # Buddy List Subsystem
+    void *purple_blist_get_handle()
+    void purple_blist_init()
+    void purple_blist_uninit()