Mercurial > pidgin
changeset 27146:3cd831d4915f
merge of 'bfb17183fbbf44cc19720d4d11594a7fdaad25de'
and 'f525448585711b2790cb6158b85897a15b546241'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 22 Jun 2009 16:39:58 +0000 |
| parents | 454d46e9cbb7 (diff) 14baa6cb1c2b (current diff) |
| children | ef9e68020265 |
| files | |
| diffstat | 3 files changed, 44 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/myspace/markup.c Mon Jun 22 16:39:22 2009 +0000 +++ b/libpurple/protocols/myspace/markup.c Mon Jun 22 16:39:58 2009 +0000 @@ -112,8 +112,10 @@ } } -/** Convert typographical font point size to HTML font size. - * Based on libpurple/gtkimhtml.c */ +/** + * Convert typographical font point size to HTML font size. + * Based on libpurple/gtkimhtml.c + */ static guint msim_point_to_purple_size(MsimSession *session, guint point) { @@ -135,7 +137,9 @@ return this_point; } -/** Convert HTML font size to point size. */ +/** + * Convert HTML font size to point size. + */ static guint msim_purple_size_to_point(MsimSession *session, guint size) { @@ -155,7 +159,9 @@ return point; } -/** Convert a msim markup font pixel height to the more usual point size, for incoming messages. */ +/** + * Convert a msim markup font pixel height to the more usual point size, for incoming messages. + */ static guint msim_height_to_point(MsimSession *session, guint height) { @@ -169,7 +175,9 @@ * _font_size_ichat_to_purple */ } -/** Convert point size to msim pixel height font size specification, for outgoing messages. */ +/** + * Convert point size to msim pixel height font size specification, for outgoing messages. + */ static guint msim_point_to_height(MsimSession *session, guint point) { @@ -180,7 +188,9 @@ return (guint)msim_round((dpi * 1. / POINTS_PER_INCH) * point); } -/** Convert the msim markup <f> (font) tag into HTML. */ +/** + * Convert the msim markup <f> (font) tag into HTML. + */ static void msim_markup_f_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar **end) { @@ -244,7 +254,8 @@ *end = g_string_free(gs_end, FALSE); } -/** Convert a msim markup color to a color suitable for libpurple. +/** + * Convert a msim markup color to a color suitable for libpurple. * * @param msim Either a color name, or an rgb(x,y,z) code. * @@ -268,7 +279,9 @@ return g_strdup_printf("#%.2x%.2x%.2x", red, green, blue); } -/** Convert the msim markup <a> (anchor) tag into HTML. */ +/** + * Convert the msim markup <a> (anchor) tag into HTML. + */ static void msim_markup_a_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar **end) { @@ -283,7 +296,9 @@ *end = g_strdup("</a>"); } -/** Convert the msim markup <p> (paragraph) tag into HTML. */ +/** + * Convert the msim markup <p> (paragraph) tag into HTML. + */ static void msim_markup_p_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar **end) { @@ -356,7 +371,9 @@ g_free(purple_color); } -/** Convert the msim markup <i> tag (emoticon image) into HTML. */ +/** + * Convert the msim markup <i> tag (emoticon image) into HTML. + */ static void msim_markup_i_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar **end) { @@ -387,7 +404,9 @@ *end = g_strdup(""); } -/** Convert an individual msim markup tag to HTML. */ +/** + * Convert an individual msim markup tag to HTML. + */ static int msim_markup_tag_to_html(MsimSession *session, xmlnode *root, gchar **begin, gchar **end) @@ -416,7 +435,9 @@ return 0; } -/** Convert an individual HTML tag to msim markup. */ +/** + * Convert an individual HTML tag to msim markup. + */ static int html_tag_to_msim_markup(MsimSession *session, xmlnode *root, gchar **begin, gchar **end) @@ -568,7 +589,8 @@ return ret; } -/** Convert an xmlnode of msim markup or HTML to an HTML string or msim markup. +/** + * Convert an xmlnode of msim markup or HTML to an HTML string or msim markup. * * @param f Function to convert tags. * @@ -635,7 +657,9 @@ g_free(end); } -/** Convert XML to something based on MSIM_XMLNODE_CONVERT. */ +/** + * Convert XML to something based on MSIM_XMLNODE_CONVERT. + */ static gchar * msim_convert_xml(MsimSession *session, const gchar *raw, MSIM_XMLNODE_CONVERT f) { @@ -669,7 +693,8 @@ return g_string_free(str, FALSE); } -/** Convert plaintext smileys to <i> markup tags. +/** + * Convert plaintext smileys to <i> markup tags. * * @param before Original text with ASCII smileys. Will be freed. * @return A new string with <i> tags, if applicable. Must be g_free()'d.
--- a/libpurple/protocols/oscar/flap_connection.c Mon Jun 22 16:39:22 2009 +0000 +++ b/libpurple/protocols/oscar/flap_connection.c Mon Jun 22 16:39:58 2009 +0000 @@ -46,7 +46,7 @@ FlapFrame *frame; frame = flap_frame_new(od, 0x01, 4); - byte_stream_put32(&frame->data, 0x00000001); + byte_stream_put32(&frame->data, 0x00000001); /* FLAP Version */ flap_connection_send(conn, frame); } @@ -64,7 +64,7 @@ GSList *tlvlist = NULL; frame = flap_frame_new(od, 0x01, 4 + 2 + 2 + length); - byte_stream_put32(&frame->data, 0x00000001); + byte_stream_put32(&frame->data, 0x00000001); /* FLAP Version */ aim_tlvlist_add_raw(&tlvlist, 0x0006, length, chipsahoy); aim_tlvlist_write(&frame->data, &tlvlist); aim_tlvlist_free(tlvlist);
--- a/libpurple/protocols/oscar/oscar.c Mon Jun 22 16:39:22 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Jun 22 16:39:58 2009 +0000 @@ -1872,7 +1872,8 @@ /* size of icbmui.ocm, the largest module in AIM 3.5 */ #define AIM_MAX_FILE_SIZE 98304 -int purple_memrequest(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) { +static int purple_memrequest(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) +{ va_list ap; struct pieceofcrap *pos; guint32 offset, len;