wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-29 02:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/tracking' into custom

Browse source
This commit is contained in:
roytam1 2023-05-12 10:43:23 +08:00
commit 1e37e713c7
5 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
application/basilisk/installer/package-manifest.in
View file

@ -73,8 +73,9 @@
#ifdef GKMEDIAS_SHARED_LIBRARY #ifdef GKMEDIAS_SHARED_LIBRARY
@BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
#endif #endif
; Hunspell #ifndef MOZ_SYSTEM_HUNSPELL
@BINPATH@/@DLL_PREFIX@hunspell@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@hunspell@DLL_SUFFIX@
#endif
#ifndef MOZ_SYSTEM_NSPR #ifndef MOZ_SYSTEM_NSPR
#ifndef MOZ_FOLD_LIBS #ifndef MOZ_FOLD_LIBS
@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@

3
application/palemoon/base/content/browser-appmenu.inc
View file

@ -306,8 +306,7 @@
<menuitem id="appmenu_permissions" <menuitem id="appmenu_permissions"
class="menuitem-iconic" class="menuitem-iconic"
label="&permissions.label;" label="&permissions.label;"
command="Tools:Permissions" command="Tools:Permissions"/>
key="key_openPermissions"/>
#ifdef MOZ_SERVICES_SYNC #ifdef MOZ_SERVICES_SYNC
<!-- only one of sync-setup or sync-syncnow will be showing at once --> <!-- only one of sync-setup or sync-syncnow will be showing at once -->
<menuitem id="sync-setup-appmenu" <menuitem id="sync-setup-appmenu"

2
application/palemoon/base/content/browser-places.js
View file

@ -428,7 +428,7 @@ var PlacesCommandHook = {
*/ */
updateBookmarkAllTabsCommand: function() { updateBookmarkAllTabsCommand: function() {
// There's nothing to do in non-browser windows. // There's nothing to do in non-browser windows.
if (window.location.href != getBrowserURL()) { if (!window.location || window.location.href != getBrowserURL()) {
return; return;
} }

4
application/palemoon/base/content/tabbrowser.xml
View file

@ -1978,7 +1978,9 @@
setTimeout(function (tab, tabbrowser) { setTimeout(function (tab, tabbrowser) {
if (tab.parentNode && if (tab.parentNode &&
window.getComputedStyle(tab).maxWidth == "0.1px") { window.getComputedStyle(tab).maxWidth == "0.1px") {
NS_ASSERT(false, "Giving up waiting for the tab closing animation to finish (bug 608589)"); if (this.visible) {
NS_ASSERT(false, "Giving up waiting for the tab closing animation to finish (bug 608589)");
}
tabbrowser._endRemoveTab(tab); tabbrowser._endRemoveTab(tab);
} }
}, 3000, aTab, this); }, 3000, aTab, this);

3
application/palemoon/installer/package-manifest.in
View file

@ -66,8 +66,9 @@
#ifdef GKMEDIAS_SHARED_LIBRARY #ifdef GKMEDIAS_SHARED_LIBRARY
@BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
#endif #endif
; Hunspell #ifndef MOZ_SYSTEM_HUNSPELL
@BINPATH@/@DLL_PREFIX@hunspell@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@hunspell@DLL_SUFFIX@
#endif
#ifndef MOZ_SYSTEM_NSPR #ifndef MOZ_SYSTEM_NSPR
#ifndef MOZ_FOLD_LIBS #ifndef MOZ_FOLD_LIBS
@BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@