Mercurial > pidgin.yaz

comparison src/gtkconv.c @ 7322:ab828b8c3f22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7908] all sorts of stuff including tweaks to logging so it mostly works again for jabber. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Fri, 24 Oct 2003 05:46:01 +0000
parents 41bbe5534441
children 00a9ab26d607
comparison
equal deleted inserted replaced
7321:c41e522028f2 7322:ab828b8c3f22
4025 conv_type != GAIM_CONV_MISC) { 4025 conv_type != GAIM_CONV_MISC) {
4026 4026
4027 FILE *fd; 4027 FILE *fd;
4028 char filename[256]; 4028 char filename[256];
4029 4029
4030 g_snprintf(filename, sizeof(filename), "%s%s", name, 4030 g_snprintf(filename, sizeof(filename), "%s%s",
4031 gaim_normalize(gaim_conversation_get_account(conv),name),
4031 (conv_type == GAIM_CONV_CHAT ? ".chat" : "")); 4032 (conv_type == GAIM_CONV_CHAT ? ".chat" : ""));
4032 4033
4033 fd = open_log_file(filename, (conv_type == GAIM_CONV_CHAT)); 4034 fd = open_log_file(filename, (conv_type == GAIM_CONV_CHAT));
4034 4035
4035 if (fd) { 4036 if (fd) {
4518 4519
4519 if (!(flags & GAIM_MESSAGE_NO_LOG) && gaim_conversation_is_logging(conv)) { 4520 if (!(flags & GAIM_MESSAGE_NO_LOG) && gaim_conversation_is_logging(conv)) {
4520 4521
4521 char *t1; 4522 char *t1;
4522 char nm[256]; 4523 char nm[256];
4524 const char *nm2;
4523 4525
4524 if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) 4526 if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html"))
4525 t1 = gaim_markup_strip_html(buf); 4527 t1 = gaim_markup_strip_html(buf);
4526 else 4528 else
4527 t1 = buf; 4529 t1 = buf;
4528 4530
4531 nm2 = gaim_normalize(gaim_conversation_get_account(conv),
4532 gaim_conversation_get_name(conv));
4533
4529 if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) 4534 if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
4530 g_snprintf(nm, sizeof(nm), "%s.chat", 4535 g_snprintf(nm, sizeof(nm), "%s.chat", nm2);
4531 gaim_conversation_get_name(conv));
4532 else 4536 else
4533 strncpy(nm, gaim_conversation_get_name(conv), sizeof(nm)); 4537 strncpy(nm, nm2, sizeof(nm));
4534 4538
4535 fd = open_log_file(nm, 4539 fd = open_log_file(nm,
4536 (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)); 4540 (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT));
4537 4541
4538 if (fd) { 4542 if (fd) {
4687 } 4691 }
4688 4692
4689 if (gaim_conversation_is_logging(conv)) { 4693 if (gaim_conversation_is_logging(conv)) {
4690 char *t1, *t2; 4694 char *t1, *t2;
4691 char nm[256]; 4695 char nm[256];
4696 const char *nm2;
4697
4698 nm2 = gaim_normalize(gaim_conversation_get_account(conv),
4699 gaim_conversation_get_name(conv));
4692 4700
4693 if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) 4701 if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
4694 g_snprintf(nm, sizeof(nm), "%s.chat", 4702 g_snprintf(nm, sizeof(nm), "%s.chat", nm2);
4695 gaim_conversation_get_name(conv));
4696 else 4703 else
4697 strncpy(nm, gaim_conversation_get_name(conv), sizeof(nm)); 4704 strncpy(nm, nm2, sizeof(nm));
4698 4705
4699 if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) { 4706 if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) {
4700 t1 = gaim_markup_strip_html(buf); 4707 t1 = gaim_markup_strip_html(buf);
4701 t2 = gaim_markup_strip_html(with_font_tag); 4708 t2 = gaim_markup_strip_html(with_font_tag);
4702 } 4709 }