Bug 1544739 - Part 8: Update GNOME shell service - Don't create gnome shell service in headlesss mode. r=frg a=frg
Ports Bug 1368211 [GConf warning during headless marionette test].
This commit is contained in:
Родитель
1f667f9507
Коммит
f61826745d
|
@ -30,6 +30,7 @@
|
|||
#include "nsIImageToPixbuf.h"
|
||||
#endif
|
||||
#include "nsXULAppAPI.h"
|
||||
#include "gfxPlatform.h"
|
||||
|
||||
#include <glib.h>
|
||||
#include <glib-object.h>
|
||||
|
@ -104,6 +105,10 @@ nsGNOMEShellService::Init()
|
|||
{
|
||||
nsresult rv;
|
||||
|
||||
if (gfxPlatform::IsHeadless()) {
|
||||
return NS_ERROR_NOT_AVAILABLE;
|
||||
}
|
||||
|
||||
// Check G_BROKEN_FILENAMES. If it's set, then filenames in glib use
|
||||
// the locale encoding. If it's not set, they use UTF-8.
|
||||
mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nullptr;
|
||||
|
|
Загрузка…
Ссылка в новой задаче