ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.176 by root, Thu Jan 12 01:30:53 2006 UTC vs.
Revision 1.178 by root, Mon Jan 16 08:29:57 2006 UTC

… …
377} 377}
378 378
379void 379void
380rxvt_term::destroy_cb (time_watcher &w) 380rxvt_term::destroy_cb (time_watcher &w)
381{ 381{
382 SET_R (this); 382 make_current ();
383 383
384 delete this; 384 delete this;
385} 385}
386 386
387/*----------------------------------------------------------------------*/ 387/*----------------------------------------------------------------------*/
… …
478/*----------------------------------------------------------------------*/ 478/*----------------------------------------------------------------------*/
479bool 479bool
480rxvt_term::init (int argc, const char *const *argv) 480rxvt_term::init (int argc, const char *const *argv)
481{ 481{
482 SET_R (this); 482 SET_R (this);
483 set_locale ("");
483 set_environ (envv); // few things in X do not call setlocale :( 484 set_environ (envv); // few things in X do not call setlocale :(
484
485 set_locale ("");
486 485
487 if (!init_vars ()) 486 if (!init_vars ())
488 return false; 487 return false;
489 488
490 init_secondary (); 489 init_secondary ();
… …
1627 int i; 1626 int i;
1628 const char *p; 1627 const char *p;
1629 char **s; 1628 char **s;
1630 char buf[IMBUFSIZ]; 1629 char buf[IMBUFSIZ];
1631 1630
1632 SET_R (this); 1631 make_current ();
1633 1632
1634 im_destroy (); 1633 im_destroy ();
1635 1634
1636 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1635 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1637 if (Input_Context) 1636 if (Input_Context)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines