Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switching to nsIEventQueues and tweaking the AppCore createWindow function's args.

Browse Source
This commit is contained in:
hyatt%netscape.com 1999-05-04 23:29:53 +00:00
parent 97aaeb8e8f
commit adfa4ca905
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mailnews/compose/src/nsComposeAppCore.cpp
View File

@ -609,14 +609,13 @@ nsComposeAppCore::CompleteCallback(nsAutoString& aScript)
NS_IMETHODIMP
nsComposeAppCore::NewMessage(nsAutoString& aUrl,
nsAutoString& args,
nsAutoString& args,
nsIDOMXULTreeElement *tree,
nsIDOMNodeList *nodeList,
nsIDOMMsgAppCore * msgAppCore,
PRInt32 messageType)
{
nsresult rv;
nsString controllerCID;
char *default_mail_charset = nsnull;
mArgs = args;
@ -634,10 +633,9 @@ nsComposeAppCore::NewMessage(nsAutoString& aUrl,
else
goto done;
controllerCID = "6B75BB61-BD41-11d2-9D31-00805F8ADDDF";
appShell->CreateTopLevelWindow(nsnull, // parent
url,
controllerCID,
PR_TRUE,
mWebShellWindow, // result widget
nsnull, // observer
this, // callbacks

4
mailnews/compose/src/nsComposer.cpp
View File

@ -55,14 +55,14 @@ private:
NS_IMETHOD CreateTopLevelWindow(nsIWebShellWindow * aParent,
nsIURL* aUrl,
nsString& aControllerIID,
PRBool aShowWindow,
nsIWebShellWindow*& aResult, nsIStreamObserver* anObserver,
nsIXULWindowCallbacks *aCallbacks,
PRInt32 aInitialWidth, PRInt32 aInitialHeight)
{ return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHOD CreateDialogWindow( nsIWebShellWindow * aParent,
nsIURL* aUrl,
nsString& aControllerIID,
PRBool aShowWindow,
nsIWebShellWindow*& aResult,
nsIStreamObserver* anObserver,
nsIXULWindowCallbacks *aCallbacks,

17
mailnews/compose/tests/smtp/smtpTest.cpp
View File

@ -133,7 +133,7 @@ static void strip_nonprintable(char *string) {
class nsSmtpTestDriver : public nsIUrlListener
{
public:
nsSmtpTestDriver(nsINetService * pService, PLEventQueue *queue);
nsSmtpTestDriver(nsINetService * pService, nsIEventQueue *queue);
virtual ~nsSmtpTestDriver();
NS_DECL_ISUPPORTS
@ -159,7 +159,7 @@ public:
nsresult OnSendMessageInFile();
nsresult OnExit();
protected:
PLEventQueue *m_eventQueue;
nsIEventQueue *m_eventQueue;
char m_urlSpec[200]; // "sockstub://hostname:port" it does not include the command specific data...
char m_urlString[500]; // string representing the current url being run. Includes host AND command specific data.
char m_userData[250]; // generic string buffer for storing the current user entered data...
@ -210,7 +210,7 @@ nsresult nsSmtpTestDriver::OnStopRunningUrl(nsIURL * aUrl, nsresult aExitCode)
}
nsSmtpTestDriver::nsSmtpTestDriver(nsINetService * pNetService,
PLEventQueue *queue)
nsIEventQueue *queue)
{
NS_INIT_REFCNT();
m_urlSpec[0] = '\0';
@ -218,9 +218,10 @@ nsSmtpTestDriver::nsSmtpTestDriver(nsINetService * pNetService,
m_protocolInitialized = PR_FALSE;
m_runningURL = PR_FALSE;
m_runTestHarness = PR_TRUE;
m_eventQueue = queue;
m_eventQueue = queue;
m_netService = dont_QueryInterface(pNetService);
NS_IF_ADDREF(m_eventQueue);
InitializeTestDriver(); // prompts user for initialization information...
m_smtpService = nsnull;
@ -231,6 +232,7 @@ nsSmtpTestDriver::nsSmtpTestDriver(nsINetService * pNetService,
nsSmtpTestDriver::~nsSmtpTestDriver()
{
NS_IF_RELEASE(m_eventQueue);
nsServiceManager::ReleaseService(kSmtpServiceCID, m_smtpService); // XXX probably need shutdown listener here
}
@ -248,7 +250,7 @@ nsresult nsSmtpTestDriver::RunDriver()
// if running url
#ifdef XP_UNIX
PL_ProcessPendingEvents(m_eventQueue);
m_eventQueue->ProcessPendingEvents();
#endif
#ifdef XP_PC
@ -426,7 +428,7 @@ nsresult nsSmtpTestDriver::OnSendMessageInFile()
int main()
{
nsINetService * pNetService;
PLEventQueue *queue;
nsIEventQueue *queue;
nsresult result;
nsComponentManager::RegisterComponent(kNetServiceCID, NULL, NULL, NETLIB_DLL, PR_FALSE, PR_FALSE);
@ -474,5 +476,6 @@ int main()
// when it kicks out...it is done....so delete it...
NS_RELEASE(driver);
}
NS_IF_RELEASE(queue);
return NS_OK;
}