Mercurial > pidgin
changeset 27951:e5349d2cc7e5
merge of '249bb0ae011a3aacadd09bca9106b7ba41bf6b75'
and 'dbc7434de32f5fbc5c23e94da10bed56418bfeab'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Tue, 18 Aug 2009 14:59:24 +0000 |
| parents | ba57b7deb58a (diff) 3a3c4e063a41 (current diff) |
| children | c80c7274cda6 |
| files | ChangeLog.API |
| diffstat | 5 files changed, 45 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Tue Aug 18 03:45:33 2009 +0000 +++ b/ChangeLog.API Tue Aug 18 14:59:24 2009 +0000 @@ -154,6 +154,9 @@ * GntProgressBar and functions (Saleem Abdulrasool) perl: + Added: + * Purple::XMLNode::get_name() + Changed: * Made a bunch of functions act more perl-like. Call the new() functions as Class->new(...) instead of Class::new(...): @@ -167,7 +170,12 @@ * Purple::Request::Field::list_new * Purple::Request::Field::string_new * Purple::Request::Field::group_new - + * Make the XMLNode API more perl-like. Don't pass len + parameters and call them like: + * $xmlnode->copy() + * $xmlnode->to_str() + * $xmlnode->to_formatted_str() + * Purple::XMLNode::from_str(...) version 2.5.9 (08/18/2009): No changes
--- a/libpurple/plugins/perl/common/XMLNode.xs Tue Aug 18 03:45:33 2009 +0000 +++ b/libpurple/plugins/perl/common/XMLNode.xs Tue Aug 18 14:59:24 2009 +0000 @@ -4,21 +4,24 @@ PROTOTYPES: ENABLE Purple::XMLNode -xmlnode_copy(class, src) +xmlnode_copy(src) Purple::XMLNode src - C_ARGS: - src void xmlnode_free(node) Purple::XMLNode node Purple::XMLNode -xmlnode_from_str(class, str, size) - const char *str - gssize size - C_ARGS: - str, size +xmlnode_from_str(const char *str, gssize length(str)) + PROTOTYPE: $ + +const char * +xmlnode_get_name(node) + Purple::XMLNode node + CODE: + RETVAL = node->name; + OUTPUT: + RETVAL const char * xmlnode_get_attrib(node, attr) @@ -78,11 +81,17 @@ const char *value gchar_own * -xmlnode_to_formatted_str(node, len) +xmlnode_to_formatted_str(node) Purple::XMLNode node - int *len + CODE: + RETVAL = xmlnode_to_formatted_str(node, NULL); + OUTPUT: + RETVAL gchar_own * -xmlnode_to_str(node, len) +xmlnode_to_str(node) Purple::XMLNode node - int *len + CODE: + RETVAL = xmlnode_to_str(node, NULL); + OUTPUT: + RETVAL
--- a/libpurple/protocols/yahoo/libymsg.c Tue Aug 18 03:45:33 2009 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Tue Aug 18 14:59:24 2009 +0000 @@ -4271,7 +4271,7 @@ } } - msn = !g_strncasecmp(who, "msn/", 4); + msn = !g_ascii_strncasecmp(who, "msn/", 4); if( strncmp(who, "+", 1) == 0 ) { /* we have an sms to be sent */ @@ -4395,7 +4395,7 @@ { YahooData *yd = gc->proto_data; struct yahoo_p2p_data *p2p_data; - gboolean msn = !g_strncasecmp(who, "msn/", 4); + gboolean msn = !g_ascii_strncasecmp(who, "msn/", 4); struct yahoo_packet *pkt = NULL; /* Don't do anything if sms is being typed */ @@ -4668,7 +4668,7 @@ return; f = yahoo_friend_find(gc, bname); - msn = !g_strncasecmp(bname, "msn/", 4); + msn = !g_ascii_strncasecmp(bname, "msn/", 4); g = purple_buddy_get_group(buddy); if (g)
--- a/libpurple/status.h Tue Aug 18 03:45:33 2009 +0000 +++ b/libpurple/status.h Tue Aug 18 14:59:24 2009 +0000 @@ -50,25 +50,25 @@ * your accounts are saved so that the next time you start Purple, * your accounts will be set to their last known statuses. There * is also a list of saved statuses that are written to the - * status.xml file. Also, each PurpleStatus has a "savable" boolean. - * If "savable" is set to FALSE then the status is NEVER saved. + * status.xml file. Also, each PurpleStatus has a "saveable" boolean. + * If "saveable" is set to FALSE then the status is NEVER saved. * All PurpleStatuses should be inside a PurplePresence. * * - * A PurpleStatus is either "indepedent" or "exclusive." - * Independent statuses can be active or inactive and it doesn't + * A PurpleStatus is either "independent" or "exclusive." + * Independent statuses can be active or inactive and they don't * affect anything else. However, you can only have one exclusive - * status per PurplePresence. If you activate one exlusive status, + * status per PurplePresence. If you activate one exclusive status, * then the previous exclusive status is automatically deactivated. * * A PurplePresence is like a collection of PurpleStatuses (plus some * other random info). For any buddy, or for any one of your accounts, - * or for any person you're chatting with, you may know various + * or for any person with which you're chatting, you may know various * amounts of information. This information is all contained in * one PurplePresence. If one of your buddies is away and idle, * then the presence contains the PurpleStatus for their awayness, * and it contains their current idle time. PurplePresences are - * never saved to disk. The information they contain is only relevent + * never saved to disk. The information they contain is only relevant * for the current PurpleSession. */ @@ -80,7 +80,7 @@ /** * A context for a presence. * - * The context indicates what the presence applies to. + * The context indicates to what the presence applies. */ typedef enum { @@ -134,7 +134,7 @@ #endif /**************************************************************************/ -/** @name PurpleStatusPrimitive API */ +/** @name PurpleStatusPrimitive API */ /**************************************************************************/ /*@{*/ @@ -172,7 +172,7 @@ /*@}*/ /**************************************************************************/ -/** @name PurpleStatusType API */ +/** @name PurpleStatusType API */ /**************************************************************************/ /*@{*/
--- a/libpurple/util.c Tue Aug 18 03:45:33 2009 +0000 +++ b/libpurple/util.c Tue Aug 18 14:59:24 2009 +0000 @@ -3820,7 +3820,7 @@ /* Note: data is _not_ nul-terminated. */ if (data_len > header_len) { if (header[0] == '\n') - p = (g_strncasecmp(data, header + 1, header_len - 1) == 0) ? data : NULL; + p = (g_ascii_strncasecmp(data, header + 1, header_len - 1) == 0) ? data : NULL; if (!p) p = purple_strcasestr(data, header); if (p) @@ -3857,7 +3857,7 @@ content_is_chunked(const char *data, size_t data_len) { const char *p = find_header_content(data, data_len, "\nTransfer-Encoding: ", sizeof("\nTransfer-Encoding: ") - 1); - if (p && g_strncasecmp(p, "chunked", 7) == 0) + if (p && g_ascii_strncasecmp(p, "chunked", 7) == 0) return TRUE; return FALSE;