Mercurial > pidgin.yaz

comparison src/gtkconv.c @ 7095:c8bf2da398e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7660] html.[ch] is gone. Everything inside was namespaced and put in util.[ch]. One less ugly part of gaim in the tree. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Wed, 01 Oct 2003 03:43:18 +0000
parents 04f9f7440bc3
children 9220c7490cd1
comparison
equal deleted inserted replaced
7094:2343c3aa1dec 7095:c8bf2da398e3
31 31
32 #include <gdk/gdkkeysyms.h> 32 #include <gdk/gdkkeysyms.h>
33 #include <locale.h> 33 #include <locale.h>
34 34
35 #include "debug.h" 35 #include "debug.h"
36 #include "html.h"
37 #include "imgstore.h" 36 #include "imgstore.h"
38 #include "log.h" 37 #include "log.h"
39 #include "multi.h" 38 #include "multi.h"
40 #include "notify.h" 39 #include "notify.h"
41 #include "prefs.h" 40 #include "prefs.h"
4386 mdate, message); 4385 mdate, message);
4387 4386
4388 gtk_imhtml_append_text_with_images(GTK_IMHTML(gtkconv->imhtml), buf2, 0, images); 4387 gtk_imhtml_append_text_with_images(GTK_IMHTML(gtkconv->imhtml), buf2, 0, images);
4389 4388
4390 if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) { 4389 if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) {
4391 char *t1 = strip_html(buf); 4390 char *t1 = gaim_markup_strip_html(buf);
4392 4391
4393 conv->history = g_string_append(conv->history, t1); 4392 conv->history = g_string_append(conv->history, t1);
4394 conv->history = g_string_append(conv->history, "\n"); 4393 conv->history = g_string_append(conv->history, "\n");
4395 4394
4396 g_free(t1); 4395 g_free(t1);
4404 4403
4405 char *t1; 4404 char *t1;
4406 char nm[256]; 4405 char nm[256];
4407 4406
4408 if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) 4407 if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html"))
4409 t1 = strip_html(buf); 4408 t1 = gaim_markup_strip_html(buf);
4410 else 4409 else
4411 t1 = buf; 4410 t1 = buf;
4412 4411
4413 if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) 4412 if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
4414 g_snprintf(nm, sizeof(nm), "%s.chat", 4413 g_snprintf(nm, sizeof(nm), "%s.chat",
4542 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", 0); 4541 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", 0);
4543 4542
4544 if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) { 4543 if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) {
4545 char *t1, *t2; 4544 char *t1, *t2;
4546 4545
4547 t1 = strip_html(buf); 4546 t1 = gaim_markup_strip_html(buf);
4548 t2 = strip_html(new_message); 4547 t2 = gaim_markup_strip_html(new_message);
4549 4548
4550 conv->history = g_string_append(conv->history, t1); 4549 conv->history = g_string_append(conv->history, t1);
4551 conv->history = g_string_append(conv->history, t2); 4550 conv->history = g_string_append(conv->history, t2);
4552 conv->history = g_string_append(conv->history, "\n"); 4551 conv->history = g_string_append(conv->history, "\n");
4553 4552
4579 gaim_conversation_get_name(conv)); 4578 gaim_conversation_get_name(conv));
4580 else 4579 else
4581 strncpy(nm, gaim_conversation_get_name(conv), sizeof(nm)); 4580 strncpy(nm, gaim_conversation_get_name(conv), sizeof(nm));
4582 4581
4583 if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) { 4582 if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) {
4584 t1 = strip_html(buf); 4583 t1 = gaim_markup_strip_html(buf);
4585 t2 = strip_html(with_font_tag); 4584 t2 = gaim_markup_strip_html(with_font_tag);
4586 } 4585 }
4587 else { 4586 else {
4588 t1 = html_logize(buf); 4587 t1 = html_logize(buf);
4589 t2 = html_logize(with_font_tag); 4588 t2 = html_logize(with_font_tag);
4590 } 4589 }