diff options
Diffstat (limited to 'libpurple/plugins')
-rw-r--r-- | libpurple/plugins/Makefile.mingw | 2 | ||||
-rw-r--r-- | libpurple/plugins/autoaccept.c | 2 | ||||
-rw-r--r-- | libpurple/plugins/perl/common/BuddyList.xs | 4 | ||||
-rw-r--r-- | libpurple/plugins/perl/common/Request.xs | 30 | ||||
-rw-r--r-- | libpurple/plugins/statenotify.c | 2 | ||||
-rw-r--r-- | libpurple/plugins/tcl/tcl_cmds.c | 4 |
6 files changed, 27 insertions, 17 deletions
diff --git a/libpurple/plugins/Makefile.mingw b/libpurple/plugins/Makefile.mingw index 5dc4d678c7..b3c80a078b 100644 --- a/libpurple/plugins/Makefile.mingw +++ b/libpurple/plugins/Makefile.mingw @@ -1,7 +1,7 @@ # # Makefile.mingw # -# Description: Makefile for win32 (mingw) version of LibPurple Plugins +# Description: Makefile for win32 (mingw) version of libpurple Plugins # PIDGIN_TREE_TOP := ../.. diff --git a/libpurple/plugins/autoaccept.c b/libpurple/plugins/autoaccept.c index e9f04db0b1..4112c34237 100644 --- a/libpurple/plugins/autoaccept.c +++ b/libpurple/plugins/autoaccept.c @@ -95,7 +95,7 @@ file_recv_request_cb(PurpleXfer *xfer, gpointer handle) char *dirname; account = xfer->account; - node = (PurpleBlistNode *)purple_find_buddy(account, xfer->who); + node = PURPLE_BLIST_NODE(purple_find_buddy(account, xfer->who)); if (!node) { diff --git a/libpurple/plugins/perl/common/BuddyList.xs b/libpurple/plugins/perl/common/BuddyList.xs index 5acb72af21..0f68d872a7 100644 --- a/libpurple/plugins/perl/common/BuddyList.xs +++ b/libpurple/plugins/perl/common/BuddyList.xs @@ -363,9 +363,9 @@ MODULE = Purple::BuddyList PACKAGE = Purple::BuddyList::Buddy PREFIX = purple_ PROTOTYPES: ENABLE Purple::BuddyList::Buddy -purple_buddy_new(account, screenname, alias) +purple_buddy_new(account, name, alias) Purple::Account account - const char *screenname + const char *name const char *alias const char * diff --git a/libpurple/plugins/perl/common/Request.xs b/libpurple/plugins/perl/common/Request.xs index 03ef5bfae6..3ba745c2fc 100644 --- a/libpurple/plugins/perl/common/Request.xs +++ b/libpurple/plugins/perl/common/Request.xs @@ -211,10 +211,11 @@ MODULE = Purple::Request PACKAGE = Purple::Request::Field PREFIX = purple_requ PROTOTYPES: ENABLE Purple::Request::Field -purple_request_field_account_new(id, text, account = NULL) +purple_request_field_account_new(class, id, text, account = NULL) const char *id const char *text Purple::Account account + C_ARGS: id, text, account Purple::Account purple_request_field_account_get_default_value(field) @@ -255,10 +256,11 @@ MODULE = Purple::Request PACKAGE = Purple::Request::Field PREFIX = purple_requ PROTOTYPES: ENABLE Purple::Request::Field -purple_request_field_bool_new(id, text, default_value = TRUE) +purple_request_field_bool_new(class, id, text, default_value = TRUE) const char *id const char *text gboolean default_value + C_ARGS: id, text, default_value gboolean purple_request_field_bool_get_default_value(field) @@ -282,10 +284,11 @@ MODULE = Purple::Request PACKAGE = Purple::Request::Field PREFIX = purple_requ PROTOTYPES: ENABLE Purple::Request::Field -purple_request_field_choice_new(id, text, default_value = 0) +purple_request_field_choice_new(class, id, text, default_value = 0) const char *id const char *text int default_value + C_ARGS: id, text, default_value void purple_request_field_choice_add(field, label) @@ -324,10 +327,11 @@ MODULE = Purple::Request PACKAGE = Purple::Request::Field PREFIX = purple_requ PROTOTYPES: ENABLE Purple::Request::Field -purple_request_field_int_new(id, text, default_value = 0) +purple_request_field_int_new(clas, id, text, default_value = 0) const char *id const char *text int default_value + C_ARGS: id, text, default_value int purple_request_field_int_get_default_value(field) @@ -355,17 +359,19 @@ MODULE = Purple::Request PACKAGE = Purple::Request::Field PREFIX = purple_requ PROTOTYPES: ENABLE Purple::Request::Field -purple_request_field_label_new(id, text) +purple_request_field_label_new(class, id, text) const char *id const char *text + C_ARGS: id, text MODULE = Purple::Request PACKAGE = Purple::Request::Field PREFIX = purple_request_field_ PROTOTYPES: ENABLE Purple::Request::Field -purple_request_field_list_new(id, text) +purple_request_field_list_new(class, id, text) const char *id const char *text + C_ARGS: id, text void purple_request_field_list_add(field, item, data) @@ -425,10 +431,11 @@ MODULE = Purple::Request PACKAGE = Purple::Request::Field PREFIX = purple_requ PROTOTYPES: ENABLE Purple::Request::Field -purple_request_field_new(id, text, type) +purple_request_field_new(class, id, text, type) const char *id const char *text Purple::RequestFieldType type + C_ARGS: id, text, type void purple_request_field_set_label(field, label) @@ -454,11 +461,12 @@ MODULE = Purple::Request PACKAGE = Purple::Request::Field PREFIX = purple_requ PROTOTYPES: ENABLE Purple::Request::Field -purple_request_field_string_new(id, text, default_value, multiline) +purple_request_field_string_new(class, id, text, default_value, multiline) const char *id const char *text const char *default_value gboolean multiline + C_ARGS: id, text, default_value, multiline const char * purple_request_field_string_get_default_value(field) @@ -527,8 +535,9 @@ purple_request_field_group_get_title(group) Purple::Request::Field::Group group Purple::Request::Field::Group -purple_request_field_group_new(title) +purple_request_field_group_new(class, title) const char *title + C_ARGS: title MODULE = Purple::Request PACKAGE = Purple::Request::Field PREFIX = purple_request_field_ PROTOTYPES: ENABLE @@ -561,7 +570,8 @@ MODULE = Purple::Request PACKAGE = Purple::Request::Fields PREFIX = purple_req PROTOTYPES: ENABLE Purple::Request::Fields -purple_request_fields_new() +purple_request_fields_new(class) + C_ARGS: /* void */ void purple_request_fields_add_group(fields, group) diff --git a/libpurple/plugins/statenotify.c b/libpurple/plugins/statenotify.c index dc25596f2b..7feeba9558 100644 --- a/libpurple/plugins/statenotify.c +++ b/libpurple/plugins/statenotify.c @@ -33,7 +33,7 @@ write_status(PurpleBuddy *buddy, const char *message) g_return_if_fail(conv->type == PURPLE_CONV_TYPE_IM); /* Prevent duplicate notifications for buddies in multiple groups */ - if (buddy != purple_find_buddy(buddy->account, buddy->name)) + if (buddy != purple_find_buddy(account, buddy_name)) return; who = purple_buddy_get_alias(buddy); diff --git a/libpurple/plugins/tcl/tcl_cmds.c b/libpurple/plugins/tcl/tcl_cmds.c index 222f05e08e..f6663096ef 100644 --- a/libpurple/plugins/tcl/tcl_cmds.c +++ b/libpurple/plugins/tcl/tcl_cmds.c @@ -401,9 +401,9 @@ static PurpleBlistNode *tcl_list_to_buddy(Tcl_Interp *interp, int count, Tcl_Obj return NULL; if (!strcmp(type, "buddy")) { - node = (PurpleBlistNode *)purple_find_buddy(account, name); + node = PURPLE_BLIST_NODE(purple_find_buddy(account, name)); } else if (!strcmp(type, "group")) { - node = (PurpleBlistNode *)purple_blist_find_chat(account, name); + node = PURPLE_BLIST_NODE(purple_blist_find_chat(account, name)); } return node; |