Initial import
This commit is contained in:
@@ -0,0 +1,24 @@
|
||||
From: Mike Hommey <glandium@debian.org>
|
||||
Date: Sat, 27 Sep 2008 17:17:39 +0200
|
||||
Subject: Don't register plugins if the MOZILLA_DISABLE_PLUGINS environment
|
||||
variable is set
|
||||
|
||||
---
|
||||
dom/plugins/base/nsPluginHost.cpp | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
|
||||
index ad37e00..e5833d7 100644
|
||||
--- a/dom/plugins/base/nsPluginHost.cpp
|
||||
+++ b/dom/plugins/base/nsPluginHost.cpp
|
||||
@@ -290,6 +290,10 @@ nsPluginHost::nsPluginHost()
|
||||
Preferences::AddStrongObserver(this, "plugin.disable");
|
||||
}
|
||||
|
||||
+ const char *env = PR_GetEnv("MOZILLA_DISABLE_PLUGINS");
|
||||
+ if (env && env[0])
|
||||
+ mPluginsDisabled = PR_TRUE;
|
||||
+
|
||||
nsCOMPtr<nsIObserverService> obsService =
|
||||
mozilla::services::GetObserverService();
|
||||
if (obsService) {
|
||||
@@ -0,0 +1,21 @@
|
||||
From: Mike Hommey <mh@glandium.org>
|
||||
Date: Sun, 5 Feb 2017 08:41:22 +0900
|
||||
Subject: Set program name from the remoting name
|
||||
|
||||
---
|
||||
toolkit/xre/nsAppRunner.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
|
||||
index ef72d1b..4affb82 100644
|
||||
--- a/toolkit/xre/nsAppRunner.cpp
|
||||
+++ b/toolkit/xre/nsAppRunner.cpp
|
||||
@@ -3750,7 +3750,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
|
||||
|
||||
// Set program name to the one defined in application.ini.
|
||||
{
|
||||
- nsAutoCString program(gAppData->name);
|
||||
+ nsAutoCString program(gAppData->remotingName);
|
||||
ToLowerCase(program);
|
||||
g_set_prgname(program.get());
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
From: Mike Hommey <mh@glandium.org>
|
||||
Date: Mon, 3 Sep 2018 07:37:40 +0900
|
||||
Subject: Use remoting name for call to gdk_set_program_class
|
||||
|
||||
Closes: #907574
|
||||
---
|
||||
widget/gtk/nsAppShell.cpp | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
|
||||
index a424664..1126bf9 100644
|
||||
--- a/widget/gtk/nsAppShell.cpp
|
||||
+++ b/widget/gtk/nsAppShell.cpp
|
||||
@@ -24,6 +24,7 @@
|
||||
# include "WakeLockListener.h"
|
||||
#endif
|
||||
#include "gfxPlatform.h"
|
||||
+#include "nsAppRunner.h"
|
||||
#include "ScreenHelperGTK.h"
|
||||
#include "HeadlessScreenHelper.h"
|
||||
#include "mozilla/widget/ScreenManager.h"
|
||||
@@ -178,10 +179,8 @@ nsresult nsAppShell::Init() {
|
||||
// creating top-level windows. (At this point, a child process hasn't
|
||||
// received the list of registered chrome packages, so the
|
||||
// GetBrandShortName call would fail anyway.)
|
||||
- nsAutoString brandName;
|
||||
- mozilla::widget::WidgetUtils::GetBrandShortName(brandName);
|
||||
- if (!brandName.IsEmpty()) {
|
||||
- gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get());
|
||||
+ if (gAppData) {
|
||||
+ gdk_set_program_class(gAppData->remotingName);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user