From 10f51ca8f90c36fd4cb926d7371fac997529189f Mon Sep 17 00:00:00 2001 From: "dougt%meer.net" Date: Thu, 8 Jun 2006 06:22:11 +0000 Subject: [PATCH] You no longer need to listen to any event queues. fixes build bustage. git-svn-id: svn://10.0.0.236/trunk@199494 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/minimo/base/Minimo.cpp | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/mozilla/minimo/base/Minimo.cpp b/mozilla/minimo/base/Minimo.cpp index db5457be874..734ff93604b 100755 --- a/mozilla/minimo/base/Minimo.cpp +++ b/mozilla/minimo/base/Minimo.cpp @@ -56,7 +56,6 @@ const static char* start_url = "chrome://minimo/content/minimo.xul"; //const static char* start_url = "resource://gre/res/start.html"; //const static char* start_url = "resource://gre/res/1.html"; -static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); void OpenNewTab(char* url) @@ -121,10 +120,6 @@ ApplicationObserver::ApplicationObserver(nsIAppShell* aAppShell) nsCOMPtr os = do_GetService("@mozilla.org/observer-service;1"); - - os->AddObserver(this, "nsIEventQueueActivated", PR_FALSE); - os->AddObserver(this, "nsIEventQueueDestroyed", PR_FALSE); - os->AddObserver(this, "xul-window-registered", PR_FALSE); os->AddObserver(this, "xul-window-destroyed", PR_FALSE); os->AddObserver(this, "xul-window-visible", PR_FALSE); @@ -141,31 +136,7 @@ NS_IMPL_ISUPPORTS1(ApplicationObserver, nsIObserver) NS_IMETHODIMP ApplicationObserver::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData) { - if (!strcmp(aTopic, "nsIEventQueueActivated")) - { - nsCOMPtr eq(do_QueryInterface(aSubject)); - if (eq) - { - PRBool isNative = PR_TRUE; - // we only add native event queues to the appshell - eq->IsQueueNative(&isNative); - if (isNative) - mAppShell->ListenToEventQueue(eq, PR_TRUE); - } - } - else if (!strcmp(aTopic, "nsIEventQueueDestroyed")) - { - nsCOMPtr eq(do_QueryInterface(aSubject)); - if (eq) - { - PRBool isNative = PR_TRUE; - // we only remove native event queues from the appshell - eq->IsQueueNative(&isNative); - if (isNative) - mAppShell->ListenToEventQueue(eq, PR_FALSE); - } - } - else if (!strcmp(aTopic, "xul-window-visible")) + if (!strcmp(aTopic, "xul-window-visible")) { KillSplashScreen(); }