From e942080024d65a8a393a28b39d167f748120d361 Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Mon, 27 Mar 2000 12:00:45 +0000 Subject: [PATCH] Fixing menu accelerators. git-svn-id: svn://10.0.0.236/trunk@64231 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/xbl/src/nsXBLService.cpp | 3 +-- mozilla/layout/xbl/src/nsXBLService.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mozilla/content/xbl/src/nsXBLService.cpp b/mozilla/content/xbl/src/nsXBLService.cpp index f73a1dce99f..0fafb6d3d41 100644 --- a/mozilla/content/xbl/src/nsXBLService.cpp +++ b/mozilla/content/xbl/src/nsXBLService.cpp @@ -259,8 +259,7 @@ nsXBLService::LoadBindings(nsIContent* aContent, const nsString& aURL) nsCOMPtr binding; bindableContent->GetBinding(getter_AddRefs(binding)); if (binding) - return NS_OK; // The bindings are already loaded. - // XXX Think about how to flush them when styles cause a dynamic change + bindableContent->SetBinding(nsnull); // Flush old bindings nsCAutoString url = aURL; if (NS_FAILED(rv = GetBinding(url, getter_AddRefs(binding)))) { diff --git a/mozilla/layout/xbl/src/nsXBLService.cpp b/mozilla/layout/xbl/src/nsXBLService.cpp index f73a1dce99f..0fafb6d3d41 100644 --- a/mozilla/layout/xbl/src/nsXBLService.cpp +++ b/mozilla/layout/xbl/src/nsXBLService.cpp @@ -259,8 +259,7 @@ nsXBLService::LoadBindings(nsIContent* aContent, const nsString& aURL) nsCOMPtr binding; bindableContent->GetBinding(getter_AddRefs(binding)); if (binding) - return NS_OK; // The bindings are already loaded. - // XXX Think about how to flush them when styles cause a dynamic change + bindableContent->SetBinding(nsnull); // Flush old bindings nsCAutoString url = aURL; if (NS_FAILED(rv = GetBinding(url, getter_AddRefs(binding)))) {