[/trunk] Changeset 129 by mikael
* Decode UTF-8 before logging message to file.
--- a/mcabber/src/hooks.c Sun Apr 24 20:30:33 2005 +0000
+++ b/mcabber/src/hooks.c Sun Apr 24 20:50:16 2005 +0000
@@ -24,12 +24,16 @@
#include "hooks.h"
#include "roster.h"
#include "histolog.h"
+#include "utf8.h"
inline void hk_message_in(const char *jid, time_t timestamp, const char *msg)
{
- scr_WriteIncomingMessage(jid, msg);
- hlog_write_message(jid, timestamp, FALSE, msg);
+ char *buffer = utf8_decode(msg);
+ // XXX Maybe filter out special chars?
+ scr_WriteIncomingMessage(jid, buffer);
+ hlog_write_message(jid, timestamp, FALSE, buffer);
+ free(buffer);
}
inline void hk_message_out(const char *jid, time_t timestamp, const char *msg)
--- a/mcabber/src/screen.c Sun Apr 24 20:30:33 2005 +0000
+++ b/mcabber/src/screen.c Sun Apr 24 20:50:16 2005 +0000
@@ -14,7 +14,6 @@
#include "roster.h"
#include "parsecfg.h"
#include "lang.h"
-#include "utf8.h"
#include "utils.h"
#include "list.h"
@@ -526,10 +525,8 @@
void scr_WriteIncomingMessage(const char *jidfrom, const char *text)
{
- char *buffer = utf8_decode(text);
// FIXME expand tabs / filter out special chars...
- scr_WriteMessage(jidfrom, buffer, "<== ");
- free(buffer);
+ scr_WriteMessage(jidfrom, text, "<== ");
top_panel(inputPanel);
update_panels();
doupdate();