--- a/mcabber/src/screen.c Sat Sep 27 22:41:29 2008 +0200
+++ b/mcabber/src/screen.c Sat Sep 27 22:44:02 2008 +0200
@@ -1351,12 +1351,12 @@
werase(mainstatusWnd);
if (info) {
- char *info_utf8 = from_utf8(info);
+ char *info_locale = from_utf8(info);
mvwprintw(mainstatusWnd, 0, 0, "%c[%c] %s: %s",
(unread_msg(NULL) ? '#' : ' '),
imstatus2char[jb_getstatus()],
- info_utf8, (sm ? sm : ""));
- g_free(info_utf8);
+ info_locale, (sm ? sm : ""));
+ g_free(info_locale);
} else
mvwprintw(mainstatusWnd, 0, 0, "%c[%c] %s",
(unread_msg(NULL) ? '#' : ' '),
--- a/mcabber/src/settings.c Sat Sep 27 22:41:29 2008 +0200
+++ b/mcabber/src/settings.c Sat Sep 27 22:44:02 2008 +0200
@@ -182,7 +182,7 @@
startswith(line, "source ", FALSE) ||
startswith(line, "color ", FALSE) ||
startswith(line, "otrpolicy", FALSE)) {
- // Only accept the set, alias, bind, pgp and source commands
+ // Only accept a few "safe" commands
if (!runtime &&
!startswith(line, "set ", FALSE) &&
!startswith(line, "bind ", FALSE) &&