From a72ebb5e73a697aeef267fb2896cf931cc78f0fe Mon Sep 17 00:00:00 2001 From: Fedor Date: Thu, 5 Sep 2019 20:08:58 +0300 Subject: [PATCH] [Mypal] Remove MOZ_BROWSER_STATUSBAR conditional. --- application/palemoon/components/moz.build | 4 +--- application/palemoon/configure.in | 14 -------------- application/palemoon/confvars.sh | 3 --- application/palemoon/themes/linux/jar.mn | 2 -- application/palemoon/themes/osx/jar.mn | 2 -- application/palemoon/themes/windows/jar.mn | 2 -- 6 files changed, 1 insertion(+), 26 deletions(-) diff --git a/application/palemoon/components/moz.build b/application/palemoon/components/moz.build index eb2771c48..48d4552ba 100644 --- a/application/palemoon/components/moz.build +++ b/application/palemoon/components/moz.build @@ -20,11 +20,9 @@ DIRS += [ 'search', 'sessionstore', 'shell', + 'statusbar', ] -if CONFIG['MOZ_BROWSER_STATUSBAR']: - DIRS += ['statusbar'] - if CONFIG['MOZ_SERVICES_SYNC']: DIRS += ['sync'] diff --git a/application/palemoon/configure.in b/application/palemoon/configure.in index 9d820f6d4..70ddf6621 100644 --- a/application/palemoon/configure.in +++ b/application/palemoon/configure.in @@ -14,20 +14,6 @@ AC_SUBST(MOZ_PHOENIX_EXTENSIONS) dnl Optional parts of the build. -dnl ======================================================== -dnl = Disable the status bar code -dnl ======================================================== -MOZ_ARG_DISABLE_BOOL(browser-statusbar, -[ --disable-browser-statusbar Disable Browser Status bar], - MOZ_BROWSER_STATUSBAR=, - MOZ_BROWSER_STATUSBAR=1) - -if test -n "$MOZ_BROWSER_STATUSBAR"; then - AC_DEFINE(MOZ_BROWSER_STATUSBAR) -fi - -AC_SUBST(MOZ_BROWSER_STATUSBAR) - dnl ======================================================== dnl = Disable Sync dnl ======================================================== diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh index b73889207..132d33648 100644 --- a/application/palemoon/confvars.sh +++ b/application/palemoon/confvars.sh @@ -43,9 +43,6 @@ MC_PALEMOON=1 # Firefox-like browsers MOZ_PHOENIX=1 -# Browser Feature: Status bar Component -MOZ_BROWSER_STATUSBAR=1 - # Lightweight Themes MOZ_PERSONAS=1 diff --git a/application/palemoon/themes/linux/jar.mn b/application/palemoon/themes/linux/jar.mn index 4f4333841..3dcd42e2b 100644 --- a/application/palemoon/themes/linux/jar.mn +++ b/application/palemoon/themes/linux/jar.mn @@ -108,7 +108,6 @@ browser.jar: #endif * skin/classic/browser/preferences/preferences.css (preferences/preferences.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) -#ifdef MOZ_BROWSER_STATUSBAR skin/classic/browser/statusbar/dynamic.css (../shared/statusbar/dynamic.css) * skin/classic/browser/statusbar/overlay.css (statusbar/overlay.css) * skin/classic/browser/statusbar/prefs.css (statusbar/prefs.css) @@ -117,7 +116,6 @@ browser.jar: skin/classic/browser/statusbar/pms24.png (../shared/statusbar/pms24.png) skin/classic/browser/statusbar/throbber-idle.png (../shared/statusbar/throbber-idle.png) skin/classic/browser/statusbar/throbberStatic.png (../shared/statusbar/throbberStatic.png) -#endif skin/classic/browser/tabbrowser/alltabs.png (tabbrowser/alltabs.png) skin/classic/browser/tabbrowser/connecting.png (tabbrowser/connecting.png) skin/classic/browser/tabbrowser/loading.png (tabbrowser/loading.png) diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn index c59fb1c72..67339c7cc 100644 --- a/application/palemoon/themes/osx/jar.mn +++ b/application/palemoon/themes/osx/jar.mn @@ -146,7 +146,6 @@ browser.jar: skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png) * skin/classic/browser/preferences/preferences.css (preferences/preferences.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) -#ifdef MOZ_BROWSER_STATUSBAR skin/classic/browser/statusbar/dynamic.css (../shared/statusbar/dynamic.css) * skin/classic/browser/statusbar/overlay.css (statusbar/overlay.css) * skin/classic/browser/statusbar/prefs.css (statusbar/prefs.css) @@ -155,7 +154,6 @@ browser.jar: skin/classic/browser/statusbar/pms24.png (../shared/statusbar/pms24.png) skin/classic/browser/statusbar/throbber-idle.png (../shared/statusbar/throbber-idle.png) skin/classic/browser/statusbar/throbberStatic.png (../shared/statusbar/throbberStatic.png) -#endif skin/classic/browser/tabbrowser/alltabs.png (tabbrowser/alltabs.png) skin/classic/browser/tabbrowser/alltabs-inverted.png (tabbrowser/alltabs-inverted.png) skin/classic/browser/tabbrowser/newtab.png (tabbrowser/newtab.png) diff --git a/application/palemoon/themes/windows/jar.mn b/application/palemoon/themes/windows/jar.mn index 604466c9f..4422bb666 100644 --- a/application/palemoon/themes/windows/jar.mn +++ b/application/palemoon/themes/windows/jar.mn @@ -131,7 +131,6 @@ browser.jar: skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png) * skin/classic/browser/preferences/preferences.css (preferences/preferences.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) -#ifdef MOZ_BROWSER_STATUSBAR skin/classic/browser/statusbar/dynamic.css (../shared/statusbar/dynamic.css) * skin/classic/browser/statusbar/overlay.css (statusbar/overlay.css) * skin/classic/browser/statusbar/prefs.css (statusbar/prefs.css) @@ -140,7 +139,6 @@ browser.jar: skin/classic/browser/statusbar/pms24.png (../shared/statusbar/pms24.png) skin/classic/browser/statusbar/throbber-idle.png (../shared/statusbar/throbber-idle.png) skin/classic/browser/statusbar/throbberStatic.png (../shared/statusbar/throbberStatic.png) -#endif skin/classic/browser/tabbrowser/alltabs.png (tabbrowser/alltabs.png) skin/classic/browser/tabbrowser/alltabs-inverted.png (tabbrowser/alltabs-inverted.png) skin/classic/browser/tabbrowser/newtab.png (tabbrowser/newtab.png)