Mercurial > pidgin
changeset 25485:62de664662b1
merge of '3b3526a039e213263905cee2579a5c7e8a99e4a7'
and 'e62c6f638c31e0b145d389c1a61c4aaf9fae0c5f'
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Wed, 18 Feb 2009 03:33:37 +0000 |
| parents | 163f103347f7 (current diff) 463d8501e4e0 (diff) |
| children | eebd46227f50 ba717632d0da |
| files | |
| diffstat | 3 files changed, 15 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Wed Feb 18 03:29:16 2009 +0000 +++ b/Makefile.am Wed Feb 18 03:33:37 2009 +0000 @@ -99,7 +99,7 @@ @echo "Not generating devhelp index: xsltproc was not found by configure" endif else - @echo "doxygen was not found during configure. Aborting." + @echo "doxygen was not found during configure. Unable to build documentation." @echo; endif
--- a/libpurple/plugins/perl/common/Server.xs Wed Feb 18 03:29:16 2009 +0000 +++ b/libpurple/plugins/perl/common/Server.xs Wed Feb 18 03:33:37 2009 +0000 @@ -122,29 +122,28 @@ Purple::Connection gc const char *name -void -serv_join_chat(con, components) - Purple::Connection con - SV * components -INIT: - HV * t_HV; - HE * t_HE; - SV * t_SV; - GHashTable * t_GHash; +void +serv_join_chat(conn, components) + Purple::Connection conn + HV * components +PREINIT: + HE *t_HE; + SV *t_SV; I32 len; + GHashTable *t_GHash; char *t_key, *t_value; CODE: - t_HV = (HV *)SvRV(components); t_GHash = g_hash_table_new(g_str_hash, g_str_equal); - for (t_HE = hv_iternext(t_HV); t_HE != NULL; t_HE = hv_iternext(t_HV) ) { + for (t_HE = hv_iternext(components); t_HE != NULL; + t_HE = hv_iternext(components)) { t_key = hv_iterkey(t_HE, &len); - t_SV = *hv_fetch(t_HV, t_key, len, 0); - t_value = SvPVutf8_nolen(t_SV); + t_SV = *hv_fetch(components, t_key, len, 0); + t_value = SvPVutf8_nolen(t_SV); g_hash_table_insert(t_GHash, t_key, t_value); } - serv_join_chat(con, t_GHash); + serv_join_chat(conn, t_GHash); void serv_move_buddy(buddy, group1, group2)
--- a/libpurple/util.h Wed Feb 18 03:29:16 2009 +0000 +++ b/libpurple/util.h Wed Feb 18 03:33:37 2009 +0000 @@ -1207,7 +1207,7 @@ G_CONST_RETURN gchar *purple_gai_strerror(gint errnum); /** - * Compares two UTF-8 strings case-insensitively. This string is + * Compares two UTF-8 strings case-insensitively. This comparison is * more expensive than a simple g_utf8_collate() comparison because * it calls g_utf8_casefold() on each string, which allocates new * strings.