Index: components/nsComponentManager.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/components/nsComponentManager.cpp,v
retrieving revision 1.279
diff -u -r1.279 components/nsComponentManager.cpp
--- components/nsComponentManager.cpp
+++ components/nsComponentManager.cpp
@@ -206,51 +206,6 @@
     return rv;
 }
 
-
-nsresult
-nsGetServiceFromCategory::operator()(const nsIID& aIID, void** aInstancePtr) const
-{
-    nsresult rv;
-    nsXPIDLCString value;
-    nsCOMPtr<nsICategoryManager> catman;
-    nsComponentManagerImpl *compMgr = nsComponentManagerImpl::gComponentManager;
-    if (!compMgr) {
-        rv = NS_ERROR_NOT_INITIALIZED;
-        goto error;
-    }
-
-    if (!mCategory || !mEntry) {
-        // when categories have defaults, use that for null mEntry
-        rv = NS_ERROR_NULL_POINTER;
-        goto error;
-    }
-
-    rv = compMgr->nsComponentManagerImpl::GetService(kCategoryManagerCID,
-                                                     NS_GET_IID(nsICategoryManager),
-                                                     getter_AddRefs(catman));
-    if (NS_FAILED(rv)) goto error;
-
-    /* find the contractID for category.entry */
-    rv = catman->GetCategoryEntry(mCategory, mEntry,
-                                  getter_Copies(value));
-    if (NS_FAILED(rv)) goto error;
-    if (!value) {
-        rv = NS_ERROR_SERVICE_NOT_AVAILABLE;
-        goto error;
-    }
-
-    rv = compMgr->
-        nsComponentManagerImpl::GetServiceByContractID(value,
-                                                       aIID, aInstancePtr);
-    if (NS_FAILED(rv)) {
-    error:
-        *aInstancePtr = 0;
-    }
-    if (mErrorPtr)
-        *mErrorPtr = rv;
-    return rv;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Arena helper functions
 ////////////////////////////////////////////////////////////////////////////////
Index: glue/nsServiceManagerUtils.cpp
--- /dev/null
+++ glue/nsServiceManagerUtils.cpp
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+#include "nsStringGlue.h"
+#include "nsICategoryManager.h"
+#include "nsServiceManagerUtils.h"
+#include "nsIComponentManager.h"
+#include "nsXPCOM.h"
+
+nsresult
+nsGetServiceFromCategory::operator()(const nsIID& aIID, void** aInstancePtr) const
+{
+    nsresult rv;
+    nsCString value;
+    nsCOMPtr<nsICategoryManager> catman;
+    nsCOMPtr<nsIComponentManager> compMgr;
+    NS_GetComponentManager(getter_AddRefs(compMgr));
+    nsCOMPtr<nsIServiceManager> srvMgr(do_QueryInterface(compMgr));
+ 
+    if (!compMgr) {
+        rv = NS_ERROR_NOT_INITIALIZED;
+        goto error;
+    }
+
+    if (!mCategory || !mEntry) {
+        // when categories have defaults, use that for null mEntry
+        rv = NS_ERROR_NULL_POINTER;
+        goto error;
+    }
+
+    catman = do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
+    if (NS_FAILED(rv)) goto error;
+
+    /* find the contractID for category.entry */
+    rv = catman->GetCategoryEntry(mCategory, mEntry,
+                                  getter_Copies(value));
+    if (NS_FAILED(rv)) goto error;
+    if (value.IsEmpty()) {
+        rv = NS_ERROR_SERVICE_NOT_AVAILABLE;
+        goto error;
+    }
+
+    rv = srvMgr->GetServiceByContractID(value.get(), aIID, aInstancePtr);
+    if (NS_FAILED(rv)) {
+    error:
+        *aInstancePtr = 0;
+    }
+    if (mErrorPtr)
+        *mErrorPtr = rv;
+    return rv;
+}
Index: glue/objs.mk
===================================================================
RCS file: /cvsroot/mozilla/xpcom/glue/objs.mk,v
retrieving revision 1.26
diff -u -r1.26 glue/objs.mk
--- glue/objs.mk
+++ glue/objs.mk
@@ -55,6 +55,7 @@
   nsWeakReference.cpp            \
   nsGREGlue.cpp                  \
   nsVersionComparator.cpp        \
+  nsServiceManagerUtils.cpp      \
   nsStringAPI.cpp                \
   nsTHashtable.cpp               \
   nsQuickSort.cpp                \