[thunderbird] Default browser is no longer read from prefs

[Christopher Aillon]

commit 7986a8567a9dbb2a6f8187b91a021d5ad350f96f
Author: Christopher Aillon <caillon at redhat.com>
Date:   Tue Apr 12 18:15:07 2011 -0700

    Default browser is no longer read from prefs
    
    It's read from the system.  Too bad that means GConf for now...
    
    This means the open browser script isn't used either, so kill that.

 thunderbird-open-browser.sh         |   76 -----------------------------------
 thunderbird-redhat-default-prefs.js |    5 --
 thunderbird.spec                    |    8 +---
 3 files changed, 1 insertions(+), 88 deletions(-)
---
diff --git a/thunderbird-redhat-default-prefs.js b/thunderbird-redhat-default-prefs.js
index a4bd7a9..eeb5c98 100644
--- a/thunderbird-redhat-default-prefs.js
+++ b/thunderbird-redhat-default-prefs.js
@@ -8,11 +8,6 @@ pref("intl.locale.matchOS", true);
 pref("mail.shell.checkDefaultClient", false);
 pref("toolkit.networkmanager.disable", false);
 
-# Make hyperlinks work
-pref("network.protocol-handler.app.http", "COMMAND");
-pref("network.protocol-handler.app.https", "COMMAND");
-pref("network.protocol-handler.app.ftp", "COMMAND");
-
 # Disable global indexing by default
 pref("mailnews.database.global.indexer.enabled", false);
 
diff --git a/thunderbird.spec b/thunderbird.spec
index 93849ec..c810284 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -49,7 +49,6 @@ Source12:       thunderbird-redhat-default-prefs.js
 Source13:       thunderbird-mozconfig-debuginfo
 Source20:       thunderbird.desktop
 Source21:       thunderbird.sh.in
-Source30:       thunderbird-open-browser.sh
 Source100:      find-external-requires
 
 # Mozilla (XULRunner) patches
@@ -237,12 +236,8 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird
   $RPM_BUILD_ROOT%{_bindir}/thunderbird
 %{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird
 
-install -Dm755 %{SOURCE30} $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
-%{__sed} -i -e 's|LIBDIR|%{_libdir}|g' $RPM_BUILD_ROOT/%{mozappdir}/open-browser.sh
-
 # set up our default preferences
-%{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' \
-                                -e 's,COMMAND,%{mozappdir}/open-browser.sh,g' > \
+%{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' > \
         $RPM_BUILD_ROOT/rh-default-prefs
 %{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/greprefs/all-redhat.js
 %{__install} -D $RPM_BUILD_ROOT/rh-default-prefs $RPM_BUILD_ROOT/%{mozappdir}/defaults/pref/all-redhat.js
@@ -357,7 +352,6 @@ fi
 %{mozappdir}/greprefs
 %{mozappdir}/isp
 %{mozappdir}/mozilla-xremote-client
-%{mozappdir}/open-browser.sh
 %{mozappdir}/res
 %{mozappdir}/run-mozilla.sh
 %{mozappdir}/thunderbird-bin