diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
| commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
| tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/WebKit2/UIProcess/Launcher/gtk | |
| parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
| download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz | |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/WebKit2/UIProcess/Launcher/gtk')
| -rw-r--r-- | Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp b/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp index d7a50829d..94cad5fc4 100644 --- a/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp +++ b/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp @@ -28,18 +28,20 @@ #include "ProcessLauncher.h" #include "Connection.h" -#include "RunLoop.h" #include <WebCore/FileSystem.h> #include <WebCore/ResourceHandle.h> +#include <WebCore/RunLoop.h> #include <errno.h> -#if OS(LINUX) -#include <sys/prctl.h> -#endif +#include <locale.h> #include <wtf/text/CString.h> #include <wtf/text/WTFString.h> #include <wtf/gobject/GOwnPtr.h> #include <wtf/gobject/GlibUtilities.h> +#if OS(LINUX) +#include <sys/prctl.h> +#endif + #ifdef SOCK_SEQPACKET #define SOCKET_TYPE SOCK_SEQPACKET #else @@ -58,6 +60,9 @@ static void childSetupFunction(gpointer userData) int socket = GPOINTER_TO_INT(userData); close(socket); + // Make child process inherit parent's locale. + g_setenv("LC_ALL", setlocale(LC_ALL, 0), TRUE); + #if OS(LINUX) // Kill child process when parent dies. prctl(PR_SET_PDEATHSIG, SIGKILL); |