Fix compile warnings. b=311646 r=dveditz sr=benjamin

git-svn-id: svn://10.0.0.236/trunk@182332 18797224-902f-48f8-a5cc-f745e15eee43
2005-10-16 15:52:26 +00:00
parent 5aab713564
commit 16edb76faf
5 changed files with 7 additions and 11 deletions
--- a/mozilla/xpinstall/src/nsInstallTrigger.cpp
+++ b/mozilla/xpinstall/src/nsInstallTrigger.cpp
@@ -181,13 +181,10 @@ nsInstallTrigger::HandleContent(const char * aContentType,


    // Get the global object of the target window for StartSoftwareUpdate
-    nsIScriptGlobalObject* globalObject;
    nsCOMPtr<nsIScriptGlobalObjectOwner> globalObjectOwner = 
                                         do_QueryInterface(aWindowContext);
-    if ( globalObjectOwner )
-    {
-        globalObject = globalObjectOwner->GetScriptGlobalObject();
-    }
+    nsIScriptGlobalObject* globalObject =
+      globalObjectOwner ? globalObjectOwner->GetScriptGlobalObject() : nsnull;
    if ( !globalObject )
        return NS_ERROR_INVALID_ARG;