Fix for bug 138299 - switch consumers of nsIWindowMediator service to use the non-RDF contractID, in preparation for bug 132175

r=danm, sr=jag git-svn-id: svn://10.0.0.236/trunk@120272 18797224-902f-48f8-a5cc-f745e15eee43
2002-04-30 01:36:59 +00:00
parent cbd4d50912
commit 868ac4081c
31 changed files with 40 additions and 42 deletions
--- a/mozilla/editor/ui/composer/content/ComposerCommands.js
+++ b/mozilla/editor/ui/composer/content/ComposerCommands.js
@@ -1880,7 +1880,7 @@ var nsPreviewCommand =
      var browser;
      try {
        // Find a browser with this URL
-        var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"].getService();
+        var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"].getService();
        var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
        var enumerator = windowManagerInterface.getEnumerator("navigator:browser");

--- a/mozilla/editor/ui/composer/content/editor.js
+++ b/mozilla/editor/ui/composer/content/editor.js
@@ -2666,7 +2666,7 @@ function SwitchInsertCharToThisWindow(windowWithDialog)
 function FindEditorWithInsertCharDialog()
 {
  // Find window with an InsertCharsWindow and switch association to this one
-  var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+  var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
  var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
  var enumerator = windowManagerInterface.getEnumerator( null );

@@ -2710,7 +2710,7 @@ function SwitchInsertCharToAnotherEditorOrClose()
 {
  if ("InsertCharWindow" in window && window.InsertCharWindow)
  {
-    var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+    var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
    var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
    var enumerator = windowManagerInterface.getEnumerator( null );

--- a/mozilla/editor/ui/composer/content/editorApplicationOverlay.js
+++ b/mozilla/editor/ui/composer/content/editorApplicationOverlay.js
@@ -121,7 +121,7 @@ function editPage(url, launchWindow, delay)
  try {
    var uri = createURI(url, null, null);

-    var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+    var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
    var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
    var enumerator = windowManagerInterface.getEnumerator( "composer:html" );
    var emptyWindow;
--- a/mozilla/extensions/help/resources/content/contextHelp.js
+++ b/mozilla/extensions/help/resources/content/contextHelp.js
@@ -21,7 +21,7 @@ function setHelpFileURI(rdfURI) {

 // Locate mozilla:help window (if any) opened for this help file uri.
 function locateHelpWindow(helpFileURI) {
-  var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+  var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
  var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
  var iterator = windowManagerInterface.getEnumerator( "mozilla:help");
  var topWindow = null;
--- a/mozilla/extensions/inspector/resources/content/inspector.js
+++ b/mozilla/extensions/inspector/resources/content/inspector.js
@@ -49,7 +49,7 @@ var inspector;

 const kSearchRegURL        = "resource:///res/inspector/search-registry.rdf";

-const kWindowMediatorCID   = "@mozilla.org/rdf/datasource;1?name=window-mediator";
+const kWindowMediatorCID   = "@mozilla.org/appshell/window-mediator;1";
 const kClipboardHelperCID  = "@mozilla.org/widget/clipboardhelper;1";
 const nsIWebNavigation     = Components.interfaces.nsIWebNavigation;

--- a/mozilla/extensions/irc/js/lib/chatzilla-service.js
+++ b/mozilla/extensions/irc/js/lib/chatzilla-service.js
@@ -49,7 +49,7 @@ const IRCPROT_HANDLER_CID =

 /* components used in this file */
 const MEDIATOR_CONTRACTID =
-    "@mozilla.org/rdf/datasource;1?name=window-mediator";
+    "@mozilla.org/appshell/window-mediator;1";
 const STANDARDURL_CONTRACTID = 
    "@mozilla.org/network/standard-url;1";
 const ASS_CONTRACTID =
--- a/mozilla/extensions/venkman/resources/content/venkman-utils.js
+++ b/mozilla/extensions/venkman/resources/content/venkman-utils.js
@@ -183,7 +183,7 @@ function dumpObjectTree (o, recurse, compress, level)
 function getWindowByType (windowType)
 {
    const MEDIATOR_CONTRACTID =
-        "@mozilla.org/rdf/datasource;1?name=window-mediator";
+        "@mozilla.org/appshell/window-mediator;1";
    const nsIWindowMediator  = Components.interfaces.nsIWindowMediator;

    var windowManager =
--- a/mozilla/extensions/xmlterm/ui/xmlterm-service.js
+++ b/mozilla/extensions/xmlterm/ui/xmlterm-service.js
@@ -50,7 +50,7 @@ const XMLTERMPROT_HANDLER_CID =

 /* components used in this file */
 const MEDIATOR_CONTRACTID =
-    "@mozilla.org/rdf/datasource;1?name=window-mediator"
+    "@mozilla.org/appshell/window-mediator;1"
 const SIMPLEURI_CONTRACTID = 
    "@mozilla.org/network/simple-uri;1";
 const ASS_CONTRACTID =
--- a/mozilla/mailnews/base/resources/content/mailNavigatorOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailNavigatorOverlay.xul
@@ -14,7 +14,7 @@
    {
      try 
      {
-        var cwindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+        var cwindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
        var iwindowManager = Components.interfaces.nsIWindowMediator;
        var windowManager  = cwindowManager.QueryInterface(iwindowManager);
        var mailWindow = windowManager.getMostRecentWindow('mail:3pane');
--- a/mozilla/mailnews/base/resources/content/mailOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailOverlay.xul
@@ -20,7 +20,7 @@
      {
        try
        {
-          var cwindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+          var cwindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
          var iwindowManager = Components.interfaces.nsIWindowMediator;
          var windowManager  = cwindowManager.QueryInterface(iwindowManager);
          var mailWindow = windowManager.getMostRecentWindow('mail:3pane');
--- a/mozilla/mailnews/base/resources/content/mailTasksOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailTasksOverlay.xul
@@ -49,7 +49,7 @@
        var preselectedFolder = null;
        if ("GetFirstSelectedMsgFolder" in window)
          preselectedFolder = GetFirstSelectedMsgFolder();
-        var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+        var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
        var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
        var searchWindow = windowManagerInterface.getMostRecentWindow("mailnews:search");
    
@@ -62,7 +62,7 @@

    function MsgSearchAddresses()
    {
-        var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+        var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
        var windowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator);
        var abSearchWindow = windowManagerInterface.getMostRecentWindow("mailnews:absearch");
    
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
@@ -533,7 +533,7 @@ function GetWindowMediator()
    if (gWindowManagerInterface)
        return gWindowManagerInterface;

-    var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+    var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
    return (gWindowManagerInterface = windowManager.QueryInterface(Components.interfaces.nsIWindowMediator));
 }

--- a/mozilla/mailnews/base/resources/content/widgetglue.js
+++ b/mozilla/mailnews/base/resources/content/widgetglue.js
@@ -241,7 +241,7 @@ function NotifyQuitApplication()

 function LastToClose()
 {
-	var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+	var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
 	var	windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
 	var enumerator = windowManagerInterface.getEnumerator( null );
    var count = 0;
--- a/mozilla/mailnews/extensions/smoketest/resources/content/mailSmoketestOverlay.js
+++ b/mozilla/mailnews/extensions/smoketest/resources/content/mailSmoketestOverlay.js
@@ -42,7 +42,7 @@ function SelectInboxFolderMessage()

 function SendMessageNow()
 {
-  var cwindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+  var cwindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
  var iwindowManager = Components.interfaces.nsIWindowMediator;           
  var windowManager  = cwindowManager.QueryInterface(iwindowManager);     
  var composeWindow = windowManager.getMostRecentWindow('msgcompose'); //find the open msgcompose window and get it      
--- a/mozilla/xpfe/appshell/src/nsCloseAllWindows.js
+++ b/mozilla/xpfe/appshell/src/nsCloseAllWindows.js
@@ -64,7 +64,7 @@ nsCloseAllWindows.prototype = {
    // closeAll: Close all open windows
    closeAll: function(aAskToSave)  {
    
-        var windowMediator = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].
+        var windowMediator = Components.classes['@mozilla.org/appshell/window-mediator;1'].
                                getService(Components.interfaces.nsIWindowMediator);
        var enumerator = windowMediator.getEnumerator(null);

--- a/mozilla/xpfe/appshell/src/nsXULWindow.cpp
+++ b/mozilla/xpfe/appshell/src/nsXULWindow.cpp
@@ -1003,7 +1003,7 @@ void nsXULWindow::StaggerPosition(PRInt32 &aRequestedX, PRInt32 &aRequestedY,
  PRBool   keepTrying;

  // look for any other windows of this type
-  nsCOMPtr<nsIWindowMediator> wm(do_GetService("@mozilla.org/rdf/datasource;1?name=window-mediator"));
+  nsCOMPtr<nsIWindowMediator> wm(do_GetService(NS_WINDOWMEDIATOR_CONTRACTID));
  if (!wm)
    return;

--- a/mozilla/xpfe/browser/resources/content/fastnav.js
+++ b/mozilla/xpfe/browser/resources/content/fastnav.js
@@ -647,7 +647,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
    }
    if (forceDialogFlag || searchMode == 1) {
      // Use a single search dialog
-      var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"]
+      var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                                    .getService(Components.interfaces.nsIWindowMediator);

      var searchWindow = windowManager.getMostRecentWindow("search:window");
@@ -740,7 +740,7 @@ function enableBookmarks()
 function BrowserEditBookmarks()
 {
  // Use a single sidebar bookmarks dialog
-  var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"]
+  var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                                .getService(Components.interfaces.nsIWindowMediator);

  var bookmarksWindow = windowManager.getMostRecentWindow("bookmarks:manager");
--- a/mozilla/xpfe/browser/resources/content/navigator.js
+++ b/mozilla/xpfe/browser/resources/content/navigator.js
@@ -818,7 +818,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr, newWindowFlag)

      if (forceDialogFlag || searchMode == 1) {
        // Use a single search dialog
-        var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"]
+        var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                                      .getService(Components.interfaces.nsIWindowMediator);

        var searchWindow = windowManager.getMostRecentWindow("search:window");
@@ -942,7 +942,7 @@ function enableBookmarks()
 function BrowserEditBookmarks()
 {
  // Use a single sidebar bookmarks dialog
-  var windowManager = Components.classes["@mozilla.org/rdf/datasource;1?name=window-mediator"]
+  var windowManager = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                                .getService(Components.interfaces.nsIWindowMediator);

  var bookmarksWindow = windowManager.getMostRecentWindow("bookmarks:manager");
@@ -1729,7 +1729,7 @@ function toHistory()
 {
  // Use a single sidebar history dialog

-  var cwindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+  var cwindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
  var iwindowManager = Components.interfaces.nsIWindowMediator;
  var windowManager  = cwindowManager.QueryInterface(iwindowManager);

--- a/mozilla/xpfe/browser/resources/content/nsBrowserContentListener.js
+++ b/mozilla/xpfe/browser/resources/content/nsBrowserContentListener.js
@@ -36,7 +36,7 @@
 *
 * ***** END LICENSE BLOCK ***** */

-const mediatorContractId = "@mozilla.org/rdf/datasource;1?name=window-mediator";
+const mediatorContractId = "@mozilla.org/appshell/window-mediator;1";
 const nsIWebBrowserChrome = Components.interfaces.nsIWebBrowserChrome;

 function nsBrowserContentListener(toplevelWindow, contentWindow)
--- a/mozilla/xpfe/communicator/resources/content/openLocation.js
+++ b/mozilla/xpfe/communicator/resources/content/openLocation.js
@@ -52,7 +52,7 @@ function onLoad()
    dialog.openTopWindow.setAttribute("label", dialog.bundle.getString("existingNavigatorWindow"));

    // Find most recent browser window
-    var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+    var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
    var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
    if (windowManagerInterface)
      browser = windowManagerInterface.getMostRecentWindow( "navigator:browser" );
--- a/mozilla/xpfe/communicator/resources/content/tasksOverlay.js
+++ b/mozilla/xpfe/communicator/resources/content/tasksOverlay.js
@@ -75,7 +75,7 @@ function toJavaConsole()

 function toOpenWindowByType( inType, uri )
 {
-	var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+	var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();

 	var	windowManagerInterface = windowManager.QueryInterface(nsIWindowMediator);

@@ -117,7 +117,7 @@ function OpenBrowserWindow()

 function CycleWindow( aType )
 {
-  var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+  var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
  var windowManagerInterface = windowManager.QueryInterface(nsIWindowMediator);

  var topWindowOfType = windowManagerInterface.getMostRecentWindow( aType );
@@ -152,7 +152,7 @@ function CycleWindow( aType )

 function ShowWindowFromResource( node )
 {
-	var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+	var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
 	var	windowManagerInterface = windowManager.QueryInterface(nsIWindowMediator);
    
    var desiredWindow = null;
@@ -180,7 +180,7 @@ function ShowUpdateFromResource( node )

 function checkFocusedWindow()
 {
-  var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+  var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
  var windowManagerInterface = windowManager.QueryInterface(nsIWindowMediator);

  var sep = document.getElementById("sep-window-list");
--- a/mozilla/xpfe/communicator/resources/content/utilityOverlay.js
+++ b/mozilla/xpfe/communicator/resources/content/utilityOverlay.js
@@ -158,7 +158,7 @@ function goPreferences(containerID, paneURL, itemID)
  }

  //check for an existing pref window and focus it; it's not application modal
-  const kWindowMediatorContractID = "@mozilla.org/rdf/datasource;1?name=window-mediator";
+  const kWindowMediatorContractID = "@mozilla.org/appshell/window-mediator;1";
  const kWindowMediatorIID = Components.interfaces.nsIWindowMediator;
  const kWindowMediator = Components.classes[kWindowMediatorContractID].getService(kWindowMediatorIID);
  var lastPrefWindow = kWindowMediator.getMostRecentWindow("mozilla:preferences");
@@ -246,7 +246,7 @@ function openTopWin( url )
        url = "about:blank";
    }

-    var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+    var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
    var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);

    var topWindowOfType = windowManagerInterface.getMostRecentWindow( "navigator:browser" );
--- a/mozilla/xpfe/components/bookmarks/resources/findBookmark.js
+++ b/mozilla/xpfe/components/bookmarks/resources/findBookmark.js
@@ -83,7 +83,7 @@ function find()

 function findMostRecentWindow(aType, aURI, aParam)
 {
-  var WM = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+  var WM = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
  WM = WM.QueryInterface(Components.interfaces.nsIWindowMediator);
  var topWindow = WM.getMostRecentWindow(aType);
  if (!topWindow) gCreatingNewWindow = true;
--- a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
+++ b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp
@@ -641,7 +641,7 @@ nsDownloadManager::Open(nsIDOMWindow* aParent)
  
  //check for an existing manager window and focus it
  nsresult rv;
-  nsCOMPtr<nsIWindowMediator> wm = do_GetService("@mozilla.org/rdf/datasource;1?name=window-mediator", &rv);
+  nsCOMPtr<nsIWindowMediator> wm = do_GetService(NS_WINDOWMEDIATOR_CONTRACTID, &rv);
  if (NS_FAILED(rv)) return rv;

  nsCOMPtr<nsIDOMWindowInternal> recentWindow;
--- a/mozilla/xpfe/components/history/resources/findHistory.js
+++ b/mozilla/xpfe/components/history/resources/findHistory.js
@@ -71,7 +71,7 @@ function find()
 var gCreatingNewWindow = false;
 function findMostRecentWindow(aType, aURI, aParam)
 {
-  var WM = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+  var WM = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
  WM = WM.QueryInterface(Components.interfaces.nsIWindowMediator);
  var topWindow = WM.getMostRecentWindow(aType);
  if (!topWindow) gCreatingNewWindow = true;
--- a/mozilla/xpfe/components/history/resources/history.js
+++ b/mozilla/xpfe/components/history/resources/history.js
@@ -422,7 +422,7 @@ function updateItems()
    copyLocationItem.removeAttribute("hidden");
    sep1.removeAttribute("hidden");
    if (!gWindowManager) {
-      gWindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+      gWindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
      gWindowManager = gWindowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
    }
    var topWindowOfType = gWindowManager.getMostRecentWindow("navigator:browser");
--- a/mozilla/xpfe/components/search/resources/search-panel.js
+++ b/mozilla/xpfe/components/search/resources/search-panel.js
@@ -42,7 +42,7 @@
 *
 * ***** END LICENSE BLOCK ***** */

-const WMEDIATOR_CONTRACTID     = "@mozilla.org/rdf/datasource;1?name=window-mediator";
+const WMEDIATOR_CONTRACTID     = "@mozilla.org/appshell/window-mediator;1";
 const ISEARCH_CONTRACTID       = "@mozilla.org/rdf/datasource;1?name=internetsearch";
 const RDFSERVICE_CONTRACTID    = "@mozilla.org/rdf/rdf-service;1";
 const BMARKS_CONTRACTID        = "@mozilla.org/browser/bookmarks-service;1";
--- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js
+++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js
@@ -1033,7 +1033,7 @@ function enable_customize() {
 // Bring up the Sidebar customize dialog.
 function SidebarCustomize() {
  // Use a single sidebar customize dialog
-  var cwindowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+  var cwindowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
  var iwindowManager = Components.interfaces.nsIWindowMediator;
  var windowManager  = cwindowManager.QueryInterface(iwindowManager);

--- a/mozilla/xpfe/components/startup/src/nsCloseAllWindows.js
+++ b/mozilla/xpfe/components/startup/src/nsCloseAllWindows.js
@@ -64,7 +64,7 @@ nsCloseAllWindows.prototype = {
    // closeAll: Close all open windows
    closeAll: function(aAskToSave)  {
    
-        var windowMediator = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].
+        var windowMediator = Components.classes['@mozilla.org/appshell/window-mediator;1'].
                                getService(Components.interfaces.nsIWindowMediator);
        var enumerator = windowMediator.getEnumerator(null);

--- a/mozilla/xpfe/components/xremote/src/XRemoteService.cpp
+++ b/mozilla/xpfe/components/xremote/src/XRemoteService.cpp
@@ -44,7 +44,6 @@
 #include <nsIURI.h>
 #include <nsNetUtil.h>
 #include <nsIWindowMediator.h>
-#include <rdf.h>

 NS_DEFINE_CID(kWindowCID, NS_WINDOW_CID);

@@ -845,8 +844,7 @@ XRemoteService::FindWindow(const PRUnichar *aType,
 			   nsIDOMWindowInternal **_retval)
 {
  nsCOMPtr<nsIWindowMediator> mediator;
-  mediator = do_GetService(NS_RDF_DATASOURCE_CONTRACTID_PREFIX
-			   "window-mediator");
+  mediator = do_GetService(NS_WINDOWMEDIATOR_CONTRACTID);

  if (!mediator)
    return NS_ERROR_FAILURE;
--- a/mozilla/xpfe/global/resources/content/globalOverlay.js
+++ b/mozilla/xpfe/global/resources/content/globalOverlay.js
@@ -14,7 +14,7 @@ function goQuitApplication()
    }
  }

-  var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
+  var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
  var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
  var enumerator = windowManagerInterface.getEnumerator( null );
  var appShell = Components.classes['@mozilla.org/appshell/appShellService;1'].getService();