--- rxvt-unicode/src/init.C 2003/12/02 21:49:46 1.9 +++ rxvt-unicode/src/init.C 2003/12/18 00:29:29 1.12 @@ -1,7 +1,7 @@ /*--------------------------------*-C-*---------------------------------* * File: init.c *----------------------------------------------------------------------* - * $Id: init.C,v 1.9 2003/12/02 21:49:46 pcg Exp $ + * $Id: init.C,v 1.12 2003/12/18 00:29:29 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1992 John Bovey, University of Kent at Canterbury @@ -359,15 +359,12 @@ return false; #if defined(XPM_BACKGROUND) || defined(TRANSPARENT) - TermWin.pixmap = None; #endif #ifdef UTMP_SUPPORT - next_utmp_action = SAVE; #endif #ifndef NO_SETOWNER_TTYDEV - next_tty_action = SAVE; #endif @@ -460,7 +457,7 @@ } #if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) - R->locale = setlocale (LC_CTYPE, ""); + R->locale = strdup (setlocale (LC_CTYPE, "")); #endif /* @@ -825,7 +822,7 @@ rxvt_print_error("Setting locale failed."); else { - Atom wmlocale; + Atom wmlocale; wmlocale = XInternAtom(R->Xdisplay, "WM_LOCALE_NAME", False); XChangeProperty(R->Xdisplay, R->TermWin.parent[0], wmlocale, @@ -837,6 +834,7 @@ rxvt_print_error("The locale is not supported by Xlib"); return; } + rxvt_setTermFontSet(aR_ 0); /* see if we can connect yet */