some more idl/#define magic (my fingers are crossed) to get NECKO to build.

xpfe/components/ucth/public/nsIUnkContentTypeHandler.idl

@@ -58,7 +58,7 @@ interface nsIUnknownContentTypeHandler : nsIAppShellComponent {
 #define NS_IUNKNOWNCONTENTTYPEHANDLER_PROGID NS_IAPPSHELLCOMPONENT_PROGID "/unknownContentType"
 #define NS_IUNKNOWNCONTENTTYPEHANDLER_CLASSNAME "Mozilla Unknown Content-Type Handler Component"
 #define NS_DECL_IUNKNOWNCONTENTTYPEHANDLER                                \
-    NS_IMETHOD HandleUnknownContentType( nsIURI *aURL,                    \
+    NS_IMETHOD HandleUnknownContentType( nsIChannel *aURL,                    \
                                          const char *aContentType,        \
                                          nsIDocumentLoader *aDocLoader );
 %}

xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp

@@ -194,7 +194,7 @@ nsUnknownContentDialog::QueryInterface(REFNSIID aIID,void** aInstancePtr)
 
 // HandleUnknownContentType (from nsIUnknownContentTypeHandler) implementation.
 NS_IMETHODIMP
-nsUnknownContentTypeHandler::HandleUnknownContentType( nsIURI *aURL,
+nsUnknownContentTypeHandler::HandleUnknownContentType( nsIChannel *aURL,
                                                        const char *aContentType,
                                                        nsIDocumentLoader *aDocLoader ) {
     nsresult rv = NS_OK;
@@ -223,7 +223,13 @@ nsUnknownContentTypeHandler::HandleUnknownContentType( nsIURI *aURL,
     
         if ( NS_SUCCEEDED(rv) ) {
             // Create "save to disk" nsIXULCallbacks...
+#ifndef NECKO
             nsUnknownContentDialog *dialog = new nsUnknownContentDialog( aURL, aContentType, aDocLoader );
+#else
+            nsCOMPtr<nsIURI>channelUri = nsnull;
+            rv = aURL->GetURI(getter_AddRefs(channelUri));
+            nsUnknownContentDialog *dialog = new nsUnknownContentDialog( channelUri, aContentType, aDocLoader );
+#endif // NECKO
     
             rv = mAppShell->CreateTopLevelWindow( nsnull,
                                                   url,