From 11fae5285905f05afb2030183b874333d64f91ee Mon Sep 17 00:00:00 2001 From: Ragner Magalhaes Date: Tue, 2 Dec 2008 20:07:23 +0000 Subject: [PATCH 1/1] Removed redundant cdef's, fixed structures declarations. FIXES: * Removed redundant cdef's, as functions declared within "cdef extern" block receives this automatically. * Fixed structures declarations, adding "pass" to them (this can be done only inside "cdef extern" blocks). Signed-off-by: Bruno Abinader git-svn-id: https://garage.maemo.org/svn/carman/branches/carman-0.7-beta2/python-purple@1271 596f6dd7-e928-0410-a184-9e12fd12cf7e --- core/account.pxd | 11 ++++++----- core/blist.pxd | 9 +++++---- core/connection.pxd | 5 +++-- core/debug.pxd | 2 +- core/eventloop.pxd | 5 +++-- core/idle.pxd | 5 +++-- core/plugin.pxd | 9 +++++---- core/pounce.pxd | 2 +- core/prefs.pxd | 6 +++--- core/util.pxd | 2 +- 10 files changed, 31 insertions(+), 25 deletions(-) diff --git a/core/account.pxd b/core/account.pxd index 93330a1..e07aa9f 100644 --- a/core/account.pxd +++ b/core/account.pxd @@ -18,12 +18,13 @@ # cdef extern from "libpurple/account.h": - ctypedef struct PurpleAccount + ctypedef struct PurpleAccount: + pass - cdef PurpleAccount *c_purple_account_new "purple_account_new" (const_char_ptr username, const_char_ptr protocol_id) - cdef void c_purple_account_set_username "purple_account_set_username" (PurpleAccount *account, const_char_ptr username) - cdef void c_purple_account_set_password "purple_account_set_password" (PurpleAccount *account, const_char_ptr password) - cdef void c_purple_account_set_enabled "purple_account_set_enabled" (PurpleAccount *account, const_char_ptr ui, gboolean value) + PurpleAccount *c_purple_account_new "purple_account_new" (const_char_ptr username, const_char_ptr protocol_id) + void c_purple_account_set_username "purple_account_set_username" (PurpleAccount *account, const_char_ptr username) + void c_purple_account_set_password "purple_account_set_password" (PurpleAccount *account, const_char_ptr password) + void c_purple_account_set_enabled "purple_account_set_enabled" (PurpleAccount *account, const_char_ptr ui, gboolean value) class Account(object): """ Account class """ diff --git a/core/blist.pxd b/core/blist.pxd index 4e37f7f..cb94f6b 100644 --- a/core/blist.pxd +++ b/core/blist.pxd @@ -18,11 +18,12 @@ # cdef extern from "libpurple/blist.h": - ctypedef struct PurpleBuddyList + ctypedef struct PurpleBuddyList: + pass - cdef void c_purple_set_blist "purple_set_blist" (PurpleBuddyList *list) - cdef void c_purple_blist_load "purple_blist_load" () - cdef PurpleBuddyList* purple_blist_new "purple_blist_new" () + void c_purple_set_blist "purple_set_blist" (PurpleBuddyList *list) + void c_purple_blist_load "purple_blist_load" () + PurpleBuddyList* purple_blist_new "purple_blist_new" () class BList(object): """ BList class """ diff --git a/core/connection.pxd b/core/connection.pxd index 665e21e..0504324 100644 --- a/core/connection.pxd +++ b/core/connection.pxd @@ -18,9 +18,10 @@ # cdef extern from "libpurple/connection.h": - ctypedef struct PurpleConnection + ctypedef struct PurpleConnection: + pass - cdef PurpleAccount* c_purple_connection_get_account "purple_connection_get_account" (PurpleConnection *gc) + PurpleAccount* c_purple_connection_get_account "purple_connection_get_account" (PurpleConnection *gc) class Connection(object): """ Connection class """ diff --git a/core/debug.pxd b/core/debug.pxd index e6d631b..183733e 100644 --- a/core/debug.pxd +++ b/core/debug.pxd @@ -18,7 +18,7 @@ # cdef extern from "libpurple/debug.h": - cdef void c_purple_debug_set_enabled "purple_debug_set_enabled" (gboolean debug_enabled) + void c_purple_debug_set_enabled "purple_debug_set_enabled" (gboolean debug_enabled) class Debug(object): """ Debug class """ diff --git a/core/eventloop.pxd b/core/eventloop.pxd index c508b75..013324f 100644 --- a/core/eventloop.pxd +++ b/core/eventloop.pxd @@ -18,9 +18,10 @@ # cdef extern from "libpurple/eventloop.h": - ctypedef struct PurpleEventLoopUiOps + ctypedef struct PurpleEventLoopUiOps: + pass - cdef void c_purple_eventloop_set_ui_ops "purple_eventloop_set_ui_ops" (PurpleEventLoopUiOps *ops) + void c_purple_eventloop_set_ui_ops "purple_eventloop_set_ui_ops" (PurpleEventLoopUiOps *ops) class EventLoop(object): """ EventLoop class """ diff --git a/core/idle.pxd b/core/idle.pxd index fa33e2d..7130f04 100644 --- a/core/idle.pxd +++ b/core/idle.pxd @@ -18,9 +18,10 @@ # cdef extern from "libpurple/idle.h": - ctypedef struct PurpleIdleUiOps + ctypedef struct PurpleIdleUiOps: + pass - cdef void c_purple_idle_set_ui_ops "purple_idle_set_ui_ops" (PurpleIdleUiOps *ops) + void c_purple_idle_set_ui_ops "purple_idle_set_ui_ops" (PurpleIdleUiOps *ops) class Idle(object): """ Idle class """ diff --git a/core/plugin.pxd b/core/plugin.pxd index aa8489d..0a9af58 100644 --- a/core/plugin.pxd +++ b/core/plugin.pxd @@ -18,11 +18,12 @@ # cdef extern from "libpurple/plugin.h": - ctypedef struct PurplePlugin + ctypedef struct PurplePlugin: + pass - cdef void c_purple_plugins_add_search_path "purple_plugins_add_search_path" (const_char_ptr path) - cdef void c_purple_plugins_load_saved "purple_plugins_load_saved" (const_char_ptr key) - cdef gboolean c_purple_plugin_register "purple_plugin_register" (PurplePlugin *plugin) + void c_purple_plugins_add_search_path "purple_plugins_add_search_path" (const_char_ptr path) + void c_purple_plugins_load_saved "purple_plugins_load_saved" (const_char_ptr key) + gboolean c_purple_plugin_register "purple_plugin_register" (PurplePlugin *plugin) class Plugin(object): """ Plugin class """ diff --git a/core/pounce.pxd b/core/pounce.pxd index bd99f24..2421569 100644 --- a/core/pounce.pxd +++ b/core/pounce.pxd @@ -18,7 +18,7 @@ # cdef extern from "libpurple/pounce.h": - cdef gboolean c_purple_pounces_load "purple_pounces_load" () + gboolean c_purple_pounces_load "purple_pounces_load" () class Pounce(object): """ Pounce class """ diff --git a/core/prefs.pxd b/core/prefs.pxd index 326749d..3e402dd 100644 --- a/core/prefs.pxd +++ b/core/prefs.pxd @@ -18,9 +18,9 @@ # cdef extern from "libpurple/prefs.h": - cdef void c_purple_prefs_rename "purple_prefs_rename" (const_char_ptr oldname, const_char_ptr newname) - cdef const_char_ptr c_purple_prefs_get_string "purple_prefs_get_string" (const_char_ptr name) - cdef gboolean c_purple_prefs_load "purple_prefs_load" () + void c_purple_prefs_rename "purple_prefs_rename" (const_char_ptr oldname, const_char_ptr newname) + const_char_ptr c_purple_prefs_get_string "purple_prefs_get_string" (const_char_ptr name) + gboolean c_purple_prefs_load "purple_prefs_load" () class Prefs(object): """ Prefs class """ diff --git a/core/util.pxd b/core/util.pxd index 1f2078c..b960fd1 100644 --- a/core/util.pxd +++ b/core/util.pxd @@ -18,7 +18,7 @@ # cdef extern from "libpurple/util.h": - cdef void c_purple_util_set_user_dir "purple_util_set_user_dir" (char *dir) + void c_purple_util_set_user_dir "purple_util_set_user_dir" (char *dir) class Utils(object): """ Utils class """ -- 1.7.9.5