Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix warnings. use NS_WITH_SERVICE. use NS_DEFINE_CID instead of NS_DEFINE_IID. remove unnecessary static kINetSupportDialogIID

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@33942 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sspitzer%netscape.com 1999-06-06 00:00:39 +00:00
parent a125e0542a
commit b6d15f7ee8
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/xpfe/appshell/src/nsDefaultHelper.cpp
View File

@ -27,7 +27,8 @@
#include "nsXPComFactory.h"
// Class IDs...
static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
// Interface IDs...
static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID);
@ -35,6 +36,7 @@ static NS_DEFINE_IID(kIBlockingNotificationObserverIID,
NS_IBLOCKINGNOTIFICATION_OBSERVER_IID);
static NS_DEFINE_IID(kIBlockingNotificationIID, NS_IBLOCKINGNOTIFICATION_IID);
// Forward declarations...
class nsDefaultProtocolHelper;
@ -152,13 +154,13 @@ nsDefaultProtocolHelper::Notify(nsIBlockingNotification *aCaller,
* If no thread switch is necessary, then handle the notification
* immediately...
*/
PRThread* currentThread = PR_GetCurrentThread();
#if 0 // The mac netlib is on the same thread as the UI thread but you crash if you block right here
#if 0 // The mac netlib is on the same thread as the UI thread but you crash if you block right here
PRThread* currentThread = PR_GetCurrentThread();
if ( currentThread == aThread) {
rv = HandleNotification(aCaller, aUrl, aCode, (void *)aExtraInfo);
}
else
#endif
#endif
{
/*
@ -235,26 +237,20 @@ nsresult nsDefaultProtocolHelper::HandleNotification(nsIBlockingNotification *aC
// create a dialog
PRBool bResult = PR_FALSE;
nsString password, user;
nsINetSupportDialogService* dialog = NULL;
PRInt32 result;
/* this is so ugly, but ProgID->CLSID mapping seems to be broken -alecf */
static NS_DEFINE_IID( kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
static NS_DEFINE_IID(kINetSupportDialogIID, NS_INETSUPPORTDIALOGSERVICE_IID);
result = nsServiceManager::GetService(kNetSupportDialogCID,
kINetSupportDialogIID,
(nsISupports**)&dialog);
if ( !NS_SUCCEEDED( result ) )
nsresult rv;
NS_WITH_SERVICE(nsINetSupportDialogService, dialog, kNetSupportDialogCID, &rv);
if (NS_FAILED(rv))
return NS_ERROR_FAILURE;
if ( dialog )
if ( dialog )
dialog->PromptUserAndPassword( aText, aUser, aPass, &result );
if ( result == 1 )
bResult = NS_NOTIFY_SUCCEEDED;
else
bResult = NS_ERROR_FAILURE;
nsServiceManager::ReleaseService(kNetSupportDialogCID, dialog);
auth_closure->user = aUser.ToNewCString();
auth_closure->pass = aPass.ToNewCString();