Mercurial > pidgin.yaz
diff src/gtkconv.c @ 7322:ab828b8c3f22
[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 |
line wrap: on
line diff
--- a/src/gtkconv.c Thu Oct 23 21:56:16 2003 +0000 +++ b/src/gtkconv.c Fri Oct 24 05:46:01 2003 +0000 @@ -4027,7 +4027,8 @@ FILE *fd; char filename[256]; - g_snprintf(filename, sizeof(filename), "%s%s", name, + g_snprintf(filename, sizeof(filename), "%s%s", + gaim_normalize(gaim_conversation_get_account(conv),name), (conv_type == GAIM_CONV_CHAT ? ".chat" : "")); fd = open_log_file(filename, (conv_type == GAIM_CONV_CHAT)); @@ -4520,17 +4521,20 @@ char *t1; char nm[256]; + const char *nm2; if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) t1 = gaim_markup_strip_html(buf); else t1 = buf; + nm2 = gaim_normalize(gaim_conversation_get_account(conv), + gaim_conversation_get_name(conv)); + if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) - g_snprintf(nm, sizeof(nm), "%s.chat", - gaim_conversation_get_name(conv)); + g_snprintf(nm, sizeof(nm), "%s.chat", nm2); else - strncpy(nm, gaim_conversation_get_name(conv), sizeof(nm)); + strncpy(nm, nm2, sizeof(nm)); fd = open_log_file(nm, (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)); @@ -4689,12 +4693,15 @@ if (gaim_conversation_is_logging(conv)) { char *t1, *t2; char nm[256]; + const char *nm2; + + nm2 = gaim_normalize(gaim_conversation_get_account(conv), + gaim_conversation_get_name(conv)); if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) - g_snprintf(nm, sizeof(nm), "%s.chat", - gaim_conversation_get_name(conv)); + g_snprintf(nm, sizeof(nm), "%s.chat", nm2); else - strncpy(nm, gaim_conversation_get_name(conv), sizeof(nm)); + strncpy(nm, nm2, sizeof(nm)); if (gaim_prefs_get_bool("/gaim/gtk/logging/strip_html")) { t1 = gaim_markup_strip_html(buf);