Mercurial > pidgin
changeset 7589:59c1cee97cbb
[gaim-migrate @ 8207]
this wasn't used, and leaked memory
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Fri, 21 Nov 2003 18:12:55 +0000 |
| parents | 4434a1615e02 |
| children | 3a48ade4f510 |
| files | src/gtkconv.c |
| diffstat | 1 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Fri Nov 21 16:19:48 2003 +0000 +++ b/src/gtkconv.c Fri Nov 21 18:12:55 2003 +0000 @@ -4444,7 +4444,6 @@ GaimConvWindow *win; GaimConnection *gc; int gtk_font_options = 0; - GString *log_str; GSList *images = NULL; char buf[BUF_LONG]; char buf2[BUF_LONG]; @@ -4492,9 +4491,6 @@ if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_font_sizes")) gtk_font_options ^= GTK_IMHTML_NO_SIZES; - if (!gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) - gtk_font_options ^= GTK_IMHTML_RETURN_LOG; - if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol(conv->account)))->options & OPT_PROTO_USE_POINTSIZE) { gtk_font_options ^= GTK_IMHTML_USE_POINTSIZE; @@ -4619,7 +4615,7 @@ else with_font_tag = g_memdup(new_message, length); - log_str = gtk_imhtml_append_text_with_images(GTK_IMHTML(gtkconv->imhtml), + gtk_imhtml_append_text_with_images(GTK_IMHTML(gtkconv->imhtml), with_font_tag, gtk_font_options, images); gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", 0);