← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/lxdm/oneiric

« back to all changes in this revision

Viewing changes to src/lxdm.c

  • Committer: Package Import Robot
  • Author(s): Julien Lavergne, Gunnar Hjalmarsson
  • Date: 2011-09-30 23:09:43 UTC
  • Revision ID: package-import@ubuntu.com-20110930230943-7crmkny19biy3b4s
Tags: 0.4.1-0ubuntu3
https://launchpad.net/bugs/857326
https://launchpad.net/bugs/843380
https://launchpad.net/bugs/857326
[ Gunnar Hjalmarsson ]
* debian/patches/22_ubuntu_i18n_oneiric.patch:
  - Source /etc/profile and ~/.profile (LP: #857326).
  - If the session language is set from the greeter, override
    language related variables that are set by sourcing ~/.profile.
  - Possible "Language" value in ~/.dmrc not applicable in Oneiric,
    so do not use it (LP: #843380).
* debian/lxdm.upstart:
  - Export LC_MESSAGES to ensure correct display language on the
    login screen (LP: #857326).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lxdm.c
1369
1369
                        session=g_key_file_get_string(dmrc,"Desktop","Session",NULL);
1370
1370
                        alloc_session=TRUE;
1371
1371
                }
1372
 
                if(!lang || !lang[0])
1373
 
                {
1374
 
                        lang=g_key_file_get_string(dmrc,"Desktop","Language",NULL);
1375
 
                        alloc_lang=TRUE;
1376
 
                }
1377
1372
                g_key_file_free(dmrc);
1378
1373
        }
1379
1374
 
1478
1473
        /* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */
1479
1474
        if( lang && lang[0] )
1480
1475
        {
1481
 
                replace_env(env, "LANG=", lang);
1482
 
                replace_env(env, "LC_MESSAGES=", lang);
1483
 
                replace_env(env, "LANGUAGE=", lang);
 
1476
                /* use this special environment variable to set the language related
 
1477
                   env. variables from Xsession after ~/.profile has been sourced */
 
1478
                replace_env(env, "GREETER_LANGUAGE=", lang);
1484
1479
        }
1485
1480
        s->env = env;
1486
1481