Insert only those environment variables which does exist.

davispuh · davispuh · commit 476fc8acd875 · 2015-08-22T02:12:39.000+03:00
diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
@@ -124,20 +124,12 @@ namespace SDDM {
             // greeter environment
             QProcessEnvironment env;
             QProcessEnvironment sysenv = QProcessEnvironment::systemEnvironment();
-            env.insert("LANG", sysenv.value("LANG"));
-            env.insert("LANGUAGE", sysenv.value("LANGUAGE"));
-            env.insert("LC_CTYPE", sysenv.value("LC_CTYPE"));
-            env.insert("LC_NUMERIC", sysenv.value("LC_NUMERIC"));
-            env.insert("LC_TIME", sysenv.value("LC_TIME"));
-            env.insert("LC_COLLATE", sysenv.value("LC_COLLATE"));
-            env.insert("LC_MONETARY", sysenv.value("LC_MONETARY"));
-            env.insert("LC_MESSAGES", sysenv.value("LC_MESSAGES"));
-            env.insert("LC_PAPER", sysenv.value("LC_PAPER"));
-            env.insert("LC_NAME", sysenv.value("LC_NAME"));
-            env.insert("LC_ADDRESS", sysenv.value("LC_ADDRESS"));
-            env.insert("LC_TELEPHONE", sysenv.value("LC_TELEPHONE"));
-            env.insert("LC_MEASUREMENT", sysenv.value("LC_MEASUREMENT"));
-            env.insert("LC_IDENTIFICATION", sysenv.value("LC_IDENTIFICATION"));
+
+            insertEnvironmentList({"LANG", "LANGUAGE",
+                                   "LC_CTYPE", "LC_NUMERIC", "LC_TIME", "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES",
+                                   "LC_PAPER", "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT", "LC_IDENTIFICATION"
+            }, sysenv, env);
+
             env.insert("PATH", mainConfig.Users.DefaultPath.get());
             env.insert("DISPLAY", m_display->name());
             env.insert("XAUTHORITY", m_authPath);
@@ -164,6 +156,12 @@ namespace SDDM {
         return true;
     }
 
+    void Greeter::insertEnvironmentList(QStringList names, QProcessEnvironment sourceEnv, QProcessEnvironment &targetEnv) {
+        for (QStringList::const_iterator it = names.constBegin(); it != names.constEnd(); ++it)
+            if (sourceEnv.contains(*it))
+                targetEnv.insert(*it, sourceEnv.value(*it));
+    }
+
     void Greeter::stop() {
         // check flag
         if (!m_started)
diff --git a/src/daemon/Greeter.h b/src/daemon/Greeter.h
@@ -65,6 +65,8 @@ namespace SDDM {
 
         Auth *m_auth { nullptr };
         QProcess *m_process { nullptr };
+
+        static void insertEnvironmentList(QStringList names, QProcessEnvironment sourceEnv, QProcessEnvironment &targetEnv);
     };
 }
 

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,8 @@ namespace SDDM {`
`65`	`65`
`66`	`66`	`Auth *m_auth { nullptr };`
`67`	`67`	`QProcess *m_process { nullptr };`
	`68`	`+`
	`69`	`+ static void insertEnvironmentList(QStringList names, QProcessEnvironment sourceEnv, QProcessEnvironment &targetEnv);`
`68`	`70`	`};`
`69`	`71`	`}`
`70`	`72`