From 237e1d2aab19a8b35552af699c9cb43c4ae32d33 Mon Sep 17 00:00:00 2001 From: "dougt%meer.net" Date: Thu, 4 Aug 2005 16:50:33 +0000 Subject: [PATCH] Make snav build statically for minimo. npodb git-svn-id: svn://10.0.0.236/trunk@177106 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/spatialnavigation/src/Makefile.in | 8 ++++++++ .../spatialnavigation/src/nsSpatialNavigationService.cpp | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mozilla/extensions/spatialnavigation/src/Makefile.in b/mozilla/extensions/spatialnavigation/src/Makefile.in index 8c2e594cf90..5df7d1aa1e9 100755 --- a/mozilla/extensions/spatialnavigation/src/Makefile.in +++ b/mozilla/extensions/spatialnavigation/src/Makefile.in @@ -48,9 +48,15 @@ IS_COMPONENT = 1 MOZILLA_INTERNAL_API = 1 + +ifdef MINIMO +MODULE_NAME = snav +EXPORT_LIBRARY = 1 +else ifdef MOZ_XUL_APP XPI_NAME = snav endif +endif # We should really pull FIREFOX_VERSION and THUNDERBIRD_VERSION from # # browser/config/version.txt mail/config/version.txt but we can't be assured @@ -99,8 +105,10 @@ CPPSRCS = nsSpatialNavigation.cpp \ # defined. We do not use this class anywhere in this # extension. +ifndef MINIMO DEFINES += -D_IMPL_NS_GFX CPPSRCS += nsRect.cpp nsFont.cpp +endif EXTRA_DSO_LDOPTS += $(LIBS_DIR) \ $(EXTRA_DSO_LIBS) \ diff --git a/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationService.cpp b/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationService.cpp index 10083ac2128..fec17c2b4df 100755 --- a/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationService.cpp +++ b/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationService.cpp @@ -105,7 +105,7 @@ nsSpatialNavigationService::Observe(nsISupports *aSubject, const char *aTopic, c NS_ENSURE_SUCCESS(rv, rv); windowWatcher->RegisterNotification(this); - nsCOMPtr prefBranch = do_GetService(NS_PREFSERVICE_CONTRACTID); + nsCOMPtr prefBranch = do_GetService(NS_PREFSERVICE_CONTRACTID); NS_ENSURE_SUCCESS(rv, rv); prefBranch->AddObserver("snav.", this, PR_FALSE);