From d564309a58adf426c737848b3965adec0c7560d1 Mon Sep 17 00:00:00 2001 From: "ben%bengoodger.com" Date: Wed, 1 Dec 2004 07:13:06 +0000 Subject: [PATCH] aviary branch landing: more bustage fixes for seamonkey, make sure extensions stub is built for seamonkey, and make sure SelectSkin is called on the right interface pointer. git-svn-id: svn://10.0.0.236/trunk@166029 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/components/Makefile.in | 3 +-- mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mozilla/xpfe/components/Makefile.in b/mozilla/xpfe/components/Makefile.in index 91071ed3d19..f5266e8a662 100644 --- a/mozilla/xpfe/components/Makefile.in +++ b/mozilla/xpfe/components/Makefile.in @@ -104,7 +104,7 @@ endif ifeq ($(OS_ARCH),WINNT) ifndef MOZ_PHOENIX ifndef MOZ_XULRUNNER -DIRS += urlwidget winhooks +DIRS += urlwidget winhooks extensions endif endif endif @@ -124,7 +124,6 @@ DIRS = \ sidebar/public \ bookmarks/public \ alerts \ - extensions \ $(NULL) ifeq ($(OS_ARCH),WINNT) diff --git a/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp b/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp index d9a4074dc0c..ef472f061e0 100644 --- a/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp +++ b/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp @@ -742,10 +742,10 @@ extern "C" void RunChromeInstallOnThread(void *data) rv = reg->InstallSkin(spec.get(), PR_TRUE, PR_FALSE); #ifndef MOZ_XUL_APP - if (NS_SUCCEEDED(rv) && selected) + if (NS_SUCCEEDED(rv) && selected && cr) { NS_ConvertUCS2toUTF8 utf8Args(info->GetArguments()); - rv = reg->SelectSkin(utf8Args, PR_TRUE); + rv = cr->SelectSkin(utf8Args, PR_TRUE); } #endif } @@ -755,7 +755,7 @@ extern "C" void RunChromeInstallOnThread(void *data) rv = reg->InstallLocale(spec.get(), PR_TRUE); #ifndef MOZ_XUL_APP - if (NS_SUCCEEDED(rv) && selected) + if (NS_SUCCEEDED(rv) && selected && cr) { NS_ConvertUCS2toUTF8 utf8Args(info->GetArguments()); rv = cr->SelectLocale(utf8Args, PR_TRUE);