Mercurial > pidgin.yaz
changeset 9307:2138b3a07cb8
[gaim-migrate @ 10115]
[02:32] <grim> http://www.reaperworld.com/code/gaim/gaim-0.79cvs-doc_fixes_and_some_extended_null_checking_in_plugin_structs.diff
[02:32] <grim> longest diff name EVER!!
committer: Tailor Script <tailor@pidgin.im>
| author | Tim Ringenbach <marv@pidgin.im> |
|---|---|
| date | Fri, 18 Jun 2004 07:39:02 +0000 |
| parents | 04a3e9e869ee |
| children | b3bda982996b |
| files | src/gtkimhtml.h src/gtkprefs.c src/util.h |
| diffstat | 3 files changed, 13 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkimhtml.h Fri Jun 18 07:28:25 2004 +0000 +++ b/src/gtkimhtml.h Fri Jun 18 07:39:02 2004 +0000 @@ -289,8 +289,8 @@ * @param text The formatted text to append. * @param options A GtkIMHtmlOptions object indicating insert behavior. */ -#define gtk_imhtml_append_text(x, y, z) \ - gtk_imhtml_append_text_with_images(x, y, z, NULL) +#define gtk_imhtml_append_text(imhtml, text, options) \ + gtk_imhtml_append_text_with_images(imhtml, text, options, NULL) /** * Appends HTML formatted text to a GTK IM/HTML. @@ -428,7 +428,7 @@ * @param imhtml The GTK IM/HTML. * @param iter The GtkTextIter at which to add the scalable. */ -void gtk_imhtml_hr_add_to(GtkIMHtmlScalable *scale, GtkIMHtml *, GtkTextIter *); +void gtk_imhtml_hr_add_to(GtkIMHtmlScalable *scale, GtkIMHtml *imhtml, GtkTextIter *iter); /** * Finds and highlights a given string in a GTK IM/HTML.
--- a/src/gtkprefs.c Fri Jun 18 07:28:25 2004 +0000 +++ b/src/gtkprefs.c Fri Jun 18 07:39:02 2004 +0000 @@ -1888,9 +1888,13 @@ plug = g_value_get_pointer(&val); pname = g_markup_escape_text(_(plug->info->name), -1); - pdesc = g_markup_escape_text(_(plug->info->description), -1); - pauth = g_markup_escape_text(_(plug->info->author), -1); - pweb = g_markup_escape_text(_(plug->info->homepage), -1); + pdesc = (plug->info->description) ? + g_markup_escape_text(_(plug->info->description), -1) : NULL; + pauth = (plug->info->author) ? + g_markup_escape_text(_(plug->info->author), -1) : NULL; + pweb = (plug->info->homepage) ? + g_markup_escape_text(_(plug->info->homepage), -1) : NULL; + if (plug->error != NULL) { perr = g_markup_escape_text(_(plug->error), -1); buf = g_strdup_printf(
--- a/src/util.h Fri Jun 18 07:28:25 2004 +0000 +++ b/src/util.h Fri Jun 18 07:39:02 2004 +0000 @@ -570,9 +570,9 @@ /** * Converts a binary string into a NUL terminated ascii string, * replacing nonascii characters and characters below SPACE (including - * NUL) into \xyy, where yy are two hex digits. Also backslashes are - * changed into two backslashes (\\). The returned, newly allocated - * can be outputted to the console, and must be g_free()d. + * NUL) into \\xyy, where yy are two hex digits. Also backslashes are + * changed into two backslashes (\\\\). The returned, newly allocated + * string can be outputted to the console, and must be g_free()d. * * @param binary A string of random data, possibly with embedded NULs * and such.