[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.337 by sf-exg, Fri Sep 5 19:02:53 2014 UTC vs.
Revision 1.338 by sf-exg, Mon Oct 6 11:11:19 2014 UTC

   envv->push_back (0);
   this->argv = argv;
   this->envv = envv;
+  env = new char *[this->envv->size ()];
+  for (int i = 0; i < this->envv->size (); i++)
+    env[i] = this->envv->at (i);
   init2 (argv->size () - 1, argv->begin ());
 }
 void
 rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
 void
 rxvt_term::init2 (int argc, const char *const *argv)
 {
   SET_R (this);
   set_locale ("");
-  set_environ (envv); // a few things in X do not call setlocale :(
+  set_environ (env); // a few things in X do not call setlocale :(
   init_vars ();
   const char **cmd_argv = init_resources (argc, argv);
 /*----------------------------------------------------------------------*/
 void
 rxvt_term::set_locale (const char *locale)
 {
-  set_environ (envv);
+  set_environ (env);
   free (this->locale);
   this->locale = setlocale (LC_CTYPE, locale);
   if (!this->locale)
 }
 void
 rxvt_term::init_xlocale ()
 {
-  set_environ (envv);
+  set_environ (env);
 #if USE_XIM
   if (!locale)
     rxvt_warn ("setting locale failed, continuing without locale support.\n");
   else

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