From a0ccb79d688bdab6cd0318e45c252c5a53dee2f6 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Sat, 12 Jul 2008 03:40:15 -0500
Subject: [PATCH] Bug 409192 - "Applications prefpane is broken if shell
 service isn't available at runtime (Applications preferences dialogue is
 empty, no way to add applications)" [p=mh+mozilla@glandium.org (Mike Hommey)
 r=gavin]

---
 browser/components/preferences/applications.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/browser/components/preferences/applications.js b/browser/components/preferences/applications.js
index 0f8093461985..ded30e9e0df9 100755
--- a/browser/components/preferences/applications.js
+++ b/browser/components/preferences/applications.js
@@ -538,8 +538,7 @@ FeedHandlerInfo.prototype = {
 
   _shellSvc:
 #ifdef HAVE_SHELL_SERVICE
-    Cc["@mozilla.org/browser/shell-service;1"].
-    getService(Ci.nsIShellService),
+    getShellService(),
 #else
     null,
 #endif
@@ -670,7 +669,7 @@ FeedHandlerInfo.prototype = {
       defaultFeedReader = this._shellSvc.defaultFeedReader;
     }
     catch(ex) {
-      // no default reader
+      // no default reader or _shellSvc is null
     }
 #endif
 
@@ -697,7 +696,7 @@ FeedHandlerInfo.prototype = {
         return true;
     }
     catch(ex) {
-      // no default reader
+      // no default reader or _shellSvc is null
     }
 #endif