OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=43

MozillaFirefox.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Nov  7 15:39:54 CST 2008 - maw@suse.de
+
+- Review and approve changes.
+
+-------------------------------------------------------------------
+Tue Nov  4 23:27:03 CET 2008 - wr@rosenauer.org
+
+- moved gconf schema into branding packages (bnc#441646)
+
 -------------------------------------------------------------------
 Tue Oct 28 16:16:14 EDT 2008 - hfiguiere@suse.de
 

MozillaFirefox.spec

@@ -27,7 +27,7 @@ License:        GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL
 Provides:       web_browser
 Provides:       firefox
 Version:        3.0.3
-Release:        4
+Release:        5
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -41,7 +41,6 @@ Source8:        firefox-mimeinfo.xml
 Source11:       firefox48.png
 Source16:       firefox.1
 Source17:       firefox-suse-default-prefs.js
-Source18:       firefox.schemas
 Patch1:         firefox-libxul-sdk.patch
 Patch2:         firefox-no-update.patch
 Patch14:        credits.patch
@@ -65,11 +64,8 @@ Requires:       %{name}-branding >= 3.0
 %define progname firefox
 %define progdir %{_prefix}/%_lib/%{progname}
 %if %suse_version > 1020
-%define gnome_confdir %{_sysconfdir}
 %define gnome_dir     %{_prefix}
-%gconf_schemas_prereq
 %else
-%define gnome_confdir %{_sysconfdir}/opt/gnome
 %define gnome_dir     /opt/gnome
 %endif
 ### build options
@@ -117,11 +113,13 @@ Group:          Productivity/Networking/Web/Browsers
 Provides:       %{name}-branding = %{version}
 Conflicts:      otherproviders(MozillaFirefox-branding)
 Supplements:    packageand(%{name}:branding-upstream)
-#BRAND: Provide two files -
+#BRAND: Provide three files -
 #BRAND: /usr/lib/firefox/browserconfig.properties that contains the
 #BRAND: default homepage and some other default configuration options
 #BRAND: /usr/lib/firefox/defaults/profile/bookmarks.html that contains
 #BRAND: the list of default bookmarks
+#BRAND: /etc/gconf/schemas/firefox.schemas
+#BRAND: for mapping some Firefox prefs to gconf
 #BRAND: It's also possible to create a file
 #BRAND: /usr/lib/firefox/defaults/preferences/firefox-$vendor.js to set
 #BRAND: custom preference overrides.
@@ -222,10 +220,6 @@ install -m 644 %{SOURCE1} \
 # additional mime-types
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
 cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{progname}.xml
-# SCHEMA File
-mkdir -p $RPM_BUILD_ROOT%{gnome_confdir}/gconf/schemas
-install -m 644 %{SOURCE18} \
-               $RPM_BUILD_ROOT/%{gnome_confdir}/gconf/schemas/
 # install man-page
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
 cp %{SOURCE16} $RPM_BUILD_ROOT%{_mandir}/man1/%{progname}.1
@@ -252,7 +246,6 @@ cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pi
 %endif
 %suse_update_desktop_file %{name} Network WebBrowser X-Ximian-Main X-Ximian-Toplevel GTK
 %if %suse_version > 1020
-%find_gconf_schemas
 %fdupes $RPM_BUILD_ROOT%{progdir}
 %fdupes $RPM_BUILD_ROOT%{_datadir}
 %endif
@@ -262,12 +255,6 @@ chmod -x $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{progname}.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-%if %suse_version > 1020
-
-%pre -f %{name}.schemas_pre
-
-%preun -f %{name}.schemas_preun
-%endif
 
 %post
 # update mime and desktop database
@@ -291,12 +278,6 @@ if [ "$1" = "2" ]; then
     rm -rf /opt/MozillaFirefox/%{_lib}/plugins
   fi
 fi
-%if %suse_version <= 1020
-if [ ! -f /.buildenv ]; then
-  export GCONF_CONFIG_SOURCE=`%{gnome_dir}/bin/gconftool-2 --get-default-source`
-  %{gnome_dir}bin/gconftool-2 --makefile-install-rule %{gnome_confdir}/gconf/schemas/firefox.schemas > /dev/null 2>&1
-fi
-%endif
 exit 0
 
 %postun
@@ -312,16 +293,8 @@ if [ -f opt/gnome/bin/update-mime-database ] ; then
   opt/gnome/bin/update-mime-database > /dev/null || :
 fi
 %endif
-%if %suse_version > 1020
-%posttrans -f %{name}.schemas_posttrans
-%endif
-%if %suse_version > 1020
-
-%files -f %{name}.schemas_list
-%else
 
 %files
-%endif
 %defattr(-,root,root)
 %dir %{progdir}
 %dir %{progdir}/chrome/
@@ -349,9 +322,6 @@ fi
 %exclude %{progdir}/run-mozilla.sh
 %exclude %{progdir}/libjemalloc.so
 %{_datadir}/applications/%{name}.desktop
-%if %suse_version <= 1020
-%{gnome_confdir}/gconf/schemas/firefox.schemas
-%endif
 %{_datadir}/mime/packages/%{progname}.xml
 %{_datadir}/pixmaps/firefox*
 %if %branding
@@ -369,9 +339,12 @@ fi
 %defattr(-,root,root)  
 %{progdir}/browserconfig.properties  
 %{progdir}/defaults/profile/bookmarks.html
-%{progdir}/defaults/preferences/firefox-build.js
 
 %changelog
+* Fri Nov 07 2008 maw@suse.de
+- Review and approve changes.
+* Tue Nov 04 2008 wr@rosenauer.org
+- moved gconf schema into branding packages (bnc#441646)
 * Tue Oct 28 2008 hfiguiere@suse.de
 - Fix missing %%endif (for fix for bnc#434283)
 * Mon Oct 27 2008 hfiguiere@suse.de
@@ -722,7 +695,7 @@ fi
 - updated tango theme
 * Sun Oct 29 2006 aj@suse.de
 - Another fix for 214125, patch by Wolfgang Rosenauer.
-* Thu Oct 26 2006 aj@suse.de
+* Wed Oct 25 2006 aj@suse.de
 - Fix gcc warnings about undefined operations, patch by
   Robert O'Callahan.
 - Update system-proxies.patch to fix error box (214125), patch by
@@ -757,7 +730,7 @@ fi
 - added symlink for Firefox 1.0.x compatibility
 * Sat Jul 29 2006 stark@suse.de
 - update to regression release 1.5.0.6 (#195043)
-* Thu Jul 27 2006 stark@suse.de
+* Wed Jul 26 2006 stark@suse.de
 - security update to version 1.5.0.5 (#195043)
   * observer-lock.patch integrated now
 - fixed leak in JS' liveconnect (#186066)
@@ -780,7 +753,7 @@ fi
 - complete implementation of startup-notification (#115417)
   (including autoconf and remote support)
 - different home-pages for SLE10 and SL (#177881)
-* Tue May 16 2006 stark@suse.de
+* Mon May 15 2006 stark@suse.de
 - fixed potential deadlock in nsObserverList::RemoveObserver
   (#173986, bmo #338069)
 - base startup notification on libstartup-notification (#115417)
@@ -817,7 +790,7 @@ fi
   UI option (#132398)
 * Mon Apr 03 2006 stark@suse.de
 - fixed keyword fixup patch (#162532)
-* Tue Mar 28 2006 stark@suse.de
+* Mon Mar 27 2006 stark@suse.de
 - don't use keyword fixup for pasted text (#160034, bmo #331522)
 * Mon Mar 20 2006 stark@suse.de
 - added Tango theme
@@ -833,7 +806,7 @@ fi
 - merged dbus reconnection patch (#150042)
 - default to autodetect proxy (network.proxy.type=4) (#151811)
 - added GTK category to desktop file
-* Tue Feb 14 2006 stark@suse.de
+* Mon Feb 13 2006 stark@suse.de
 - modified lockdown patches (#67281, #67282)
 - applied set of security patches (#148876)
   bmo bugs: 282105, 307989, 315625, 320459, 323634, 325403, 325947
@@ -900,7 +873,7 @@ fi
 * Mon Oct 31 2005 stark@suse.de
 - updated l10n archive (20051030)
 - fixed postinstall script to copy plugin links instead of files
-* Fri Oct 28 2005 stark@suse.de
+* Thu Oct 27 2005 stark@suse.de
 - update to 1.5rc1 (20051027)
 - fixed profile locking on FAT partitions (bmo #313360)
 - introduced an rpath again
@@ -949,7 +922,7 @@ fi
 * Thu Sep 01 2005 stark@suse.de
 - changed default font to sans-serif (#114464)
 - removed de-de parts of the bookmark-links (#114279)
-* Mon Aug 22 2005 stark@suse.de
+* Sun Aug 21 2005 stark@suse.de
 - install gconf schema for lockdown also on non-NLD
 - added backports (firefox-backports.patch)
   * gtk_im_context_set_cursor_location() is not used (bmo #281339)
@@ -972,7 +945,7 @@ fi
 * Fri Aug 05 2005 stark@suse.de
 - fixed profile locking (bmo #151188)
 - install beagle extension globally
-* Fri Jul 29 2005 stark@suse.de
+* Thu Jul 28 2005 stark@suse.de
 - don't require and provide NSS libs (#98002)
 - fixed printing error 'You cannot print while in print preview'
   (#96991, bmo #302445)
@@ -997,9 +970,9 @@ fi
 - fixed plugin event starvation (bnc #94749, #94751, bmo #301161)
 * Fri Jul 15 2005 stark@suse.de
 - searchplugins can now be installed per profile (#8176)
-* Fri Jul 15 2005 stark@suse.de
+* Thu Jul 14 2005 stark@suse.de
 - update to 1.0.6 which restores API compatibility
-* Tue Jul 12 2005 stark@suse.de
+* Mon Jul 11 2005 stark@suse.de
 - update to 1.0.5 final (#88509)
 - don't strip explicitely
 - don't ship beagle.xpi
@@ -1016,10 +989,10 @@ fi
   (it's not needed and caused problems: bnc #75418)
 - fixed NLD lockdown patch (bnc #75418)
 - don't write prefs back to gconf for now
-* Wed Jun 22 2005 stark@suse.de
+* Tue Jun 21 2005 stark@suse.de
 - new NLD lockdown patch which is syncing user prefs to gconf
 - update to 1.0.5pre security-release
-* Thu Jun 09 2005 stark@suse.de
+* Wed Jun 08 2005 stark@suse.de
 - new revision of NLD lockdown patch
 - fixed remote usage behaviour in start script (bnc #41903)
 - got more bugfixes from the branch
@@ -1031,9 +1004,9 @@ fi
 - fixed keybinding for KP separator (bnc #84147)
 - pulled security related patch from upstream branch
 - update plastikfox theme to version 1.6
-* Thu May 12 2005 stark@suse.de
+* Wed May 11 2005 stark@suse.de
 - update to final 1.0.4 release
-* Tue May 10 2005 stark@suse.de
+* Mon May 09 2005 stark@suse.de
 - update to 1.0.4 security release
 - removed s390(x) patches (upstream)
 - made two more files %%verify (81692)
@@ -1124,7 +1097,7 @@ fi
 - bumped version number to 1.0.1
 * Tue Feb 15 2005 stark@suse.de
 - got updates from 1.0.1 branch
-* Thu Feb 10 2005 stark@suse.de
+* Wed Feb 09 2005 stark@suse.de
 - additional fireflashing fix (#50635, bmo #280664)
 - some more security related fixes
   (bmo #268483, #273498, #277322)
@@ -1177,7 +1150,7 @@ fi
 - update to 1.0rc2
 * Sat Oct 30 2004 stark@suse.de
 - added missing s390(x) patch
-* Wed Oct 27 2004 stark@suse.de
+* Tue Oct 26 2004 stark@suse.de
 - update to 1.0rc1 codebase
 - printing via XFT/fontconfig
 - freetype changes to avoid API conflicts with newer freetype2
@@ -1196,7 +1169,7 @@ fi
 - fixed chrome registration
 * Wed Oct 06 2004 joeshaw@suse.de
 - disable gconf settings as default (Ximian #67718)
-* Wed Oct 06 2004 stark@suse.de
+* Tue Oct 05 2004 stark@suse.de
 - fixed inclusion of RealPlayer plugin again
 * Tue Oct 05 2004 stark@suse.de
 - small important fix in firefox-download.patch (Ximian #65472)
@@ -1214,7 +1187,7 @@ fi
 * Mon Sep 27 2004 joeshaw@suse.de
 - Update the industrial default patch, for some reason it didn't
   take before.
-* Fri Sep 24 2004 stark@suse.de
+* Thu Sep 23 2004 stark@suse.de
 - fix for Ximian #65176 (mozilla.org #240068)
 - revised patch for update function (Ximian #65615)
 * Thu Sep 23 2004 joeshaw@suse.de
@@ -1286,7 +1259,7 @@ fi
   - set startup homepage to Novell
 * Tue Aug 17 2004 stark@suse.de
 - update to pre-1.0.0 (20040817)
-* Thu Aug 05 2004 stark@suse.de
+* Wed Aug 04 2004 stark@suse.de
 - security update to 0.9.3
   (including #43312 and others)
 - handle RealPlayer 9 plugin
@@ -1294,11 +1267,11 @@ fi
 - recode desktop file to utf-8
 * Wed Jul 28 2004 stark@suse.de
 - added fix against certificate spoofing (#43312)
-* Fri Jul 23 2004 stark@suse.de
+* Thu Jul 22 2004 stark@suse.de
 - update to 0.9.2
 - added workaround for extension registry
 - removed old (incompatible) mozex extension
-* Tue Jun 29 2004 stark@suse.de
+* Mon Jun 28 2004 stark@suse.de
 - update to 0.9.1
 - added hint to run as root first
 * Tue Jun 15 2004 stark@suse.de
@@ -1315,12 +1288,12 @@ fi
 - enabled gnomevfs extension
 * Fri Mar 26 2004 uli@suse.de
 - fixed hang during build on s390* (bug #35440)
-* Wed Mar 03 2004 stark@suse.de
+* Tue Mar 02 2004 stark@suse.de
 - removed unused patches for GTK2 build
 - more fixes for (#35179)
 * Mon Mar 01 2004 stark@suse.de
 - improved start-script to interact with thunderbird (#35179)
-* Thu Feb 26 2004 stark@suse.de
+* Wed Feb 25 2004 stark@suse.de
 - use official releasedate
 - added official (trademarked) artwork
 - added firefox icon to /usr/share/pixmaps
@@ -1358,7 +1331,7 @@ fi
 * Thu Jul 10 2003 stark@suse.de
 - update to snapshot 20030709
 - fixed generation of symlink MozillaFirebird-xremote-client
-* Fri Jun 20 2003 stark@suse.de
+* Thu Jun 19 2003 stark@suse.de
 - update to snapshot 20030622 (0.7pre)
 * Mon May 19 2003 stark@suse.de
 - update to snapshot 20030518 (0.6)

firefox.schemas

@@ -1,299 +0,0 @@
-<gconfschemafile>
-    <schemalist>
-      <schema>
-        <key>/schemas/apps/firefox/lockdown/disable_history</key>
-        <applyto>/apps/firefox/lockdown/disable_history</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>To disable the History.</short>
-        <long>To disable the histroy.</long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/lockdown/disable_toolbar_editing</key>
-        <applyto>/apps/firefox/lockdown/disable_toolbar_editing</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Disable toolbar editing.</short>
-        <long>Disable ToolBar Editing.
-        </long>
-        </locale>
-      </schema>
-       <schema>
-        <key>/schemas/apps/firefox/lockdown/disable_themes</key>
-        <applyto>/apps/firefox/lockdown/disable_themes</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Disable installing themes</short>
-        <long>Disable installing theme
-        </long>
-        </locale>
-      </schema>
-      <schema>
-        <key>/schemas/apps/firefox/lockdown/disable_extensions</key>
-        <applyto>/apps/firefox/lockdown/disable_extensions</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Disable installing extensions</short>
-        <long>Disable installing extensions
-        </long>
-        </locale>
-       </schema>
-      <schema>
-        <key>/schemas/apps/firefox/lockdown/disable_show_passwords</key>
-        <applyto>/apps/firefox/lockdown/disable_show_passwords</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Disable showing passwords</short>
-        <long>Disable showing passwords in the password manager.
-        </long>
-        </locale>
-       </schema>
-     <schema>
-        <key>/schemas/apps/firefox/web/disable_popups</key>
-        <applyto>/apps/firefox/web/disable_popups</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Allow Popups.</short>
-        <long>Allow Popups.
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/web/java_enabled</key>
-        <applyto>/apps/firefox/web/java_enabled</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-        <short>Enable java.</short>
-        <long>Enable java.
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/web/javascript_enabled</key>
-        <applyto>/apps/firefox/web/javascript_enabled</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>true</default>
-        <locale name="C">
-        <short>Enable javascript.</short>
-        <long>Enable javascript.
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/lockdown/disable_url_bar</key>
-        <applyto>/apps/firefox/lockdown/disable_url_bar</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Disable URL bar.</short>
-        <long>Disable URL bar.
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/lockdown/disable_searchbar</key>
-        <applyto>/apps/firefox/lockdown/disable_searchbar</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Disable search bar.</short>
-        <long>Disable search bar.
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/web/disable_cookies</key>
-        <applyto>/apps/firefox/web/disable_cookies</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Disable Cookies.</short>
-        <long>Disable Cookies.
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/web/disable_save_password</key>
-        <applyto>/apps/firefox/web/disable_save_password</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Disable Save Password.</short>
-        <long>Disable Save Password.
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/web/cache_size</key>
-        <applyto>/apps/firefox/web/cache_size</applyto>
-        <owner>firefox</owner>
-        <type>int</type>
-        <default>50000</default>
-        <locale name="C">
-        <short>Cache Size.</short>
-        <long>Cache Size.
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/general/homepage_url</key>
-        <applyto>/apps/firefox/general/homepage_url</applyto>
-        <owner>firefox</owner>
-        <type>string</type>
-        <default>www.novell.com/linux</default>
-        <locale name="C">
-        <short>Home Page URL.</short>
-        <long>Home Page URL.
-        </long>
-        </locale>
-      </schema>
-      <schema>
-        <key>/schemas/apps/firefox/web/download_defaultfolder</key>
-        <applyto>/apps/firefox/web/download_defaultfolder</applyto>
-        <owner>firefox</owner>
-        <type>string</type>
-        <default>Desktop</default>
-        <locale name="C">
-        <short>Default downloadfolder location.</short>
-        <long> This is the default download folder location. 
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/lockdown/disable_unsafe_protocol</key>
-        <applyto>/apps/firefox/lockdown/disable_unsafe_protocol</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Disable Unsafe Protocol.</short>
-        <long>Disable Unsafe Protocol.
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/lockdown/disable_bookmark_editing</key>
-        <applyto>/apps/firefox/lockdown/disable_bookmark_editing</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>disable_bookmark_editing.</short>
-        <long>disable_bookmark_editing.
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/lockdown/hide_bookmark</key>
-        <applyto>/apps/firefox/lockdown/hide_bookmark</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Hide Bookmarks</short>
-        <long>Hide Bookmarks.
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/lockdown/disable_javascript_chrome</key>
-        <applyto>/apps/firefox/lockdown/disable_javascript_chrome</applyto>
-        <owner>firefox</owner>
-        <type>bool</type>
-        <default>false</default>
-        <locale name="C">
-        <short>Disable Javascript Chrome.</short>
-        <long>Disable Javascript Chrome.
-        </long>
-        </locale>
-      </schema>
-	<schema>
-        <key>/schemas/apps/firefox/web/cookie_accept</key>
-        <applyto>/apps/firefox/web/cookie_accept</applyto>
-        <owner>firefox</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-        <short>Setting Cookies.</short>
-        <long>Setting Cookies.
-        </long>
-        </locale>
-      </schema>
-        <schema>
-        <key>/schemas/apps/firefox/web/images_load</key>
-        <applyto>/apps/firefox/web/images_load</applyto>
-        <owner>firefox</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-        <short>Setting Loadimages.</short>
-        <long>Setting Loadimages.
-        </long>
-        </locale>
-      </schema>
-
-     <schema>
-        <key>/schemas/apps/firefox/lockdown/additional_safe_protocols</key>
-        <applyto>/apps/firefox/lockdown/additional_safe_protocols</applyto>
-        <owner>firefox</owner>
-        <type>string</type>
-        <default></default>
-        <locale name="C">
-        <short>Additional Safe Protocols.</short>
-        <long>Additional Safe Protocols.
-        </long>
-        </locale>
-      </schema>
-
-     <schema>
-        <key>/schemas/apps/firefox/general/trusted_URIs</key>
-        <applyto>/apps/firefox/general/trusted_URIs</applyto>
-        <owner>firefox</owner>
-        <type>list</type>
-        <list_type>string</list_type>
-        <default>[]</default>
-        <locale name="C">
-        <short>List of URIs for which Kerberos/NTLM is enabled</short>
-        <long>A comma-separated list of URI keys, of the form
-         [scheme "://"] [host [":" port]], for which login should be allowed
-         via SPNEGO Kerberos or NTLM authentication.
-        </long>
-        </locale>
-      </schema>
-     <schema>
-        <key>/schemas/apps/firefox/general/delegated_URIs</key>
-        <applyto>/apps/firefox/general/delegated_URIs</applyto>
-        <owner>firefox</owner>
-        <type>list</type>
-        <list_type>string</list_type>
-        <default>[]</default>
-        <locale name="C">
-        <short>List of URIs for which Kerberos/NTLM delegation is enabled</short>
-        <long>A comma-separated list of URI keys, of the form
-         [scheme "://"] [host [":" port]], for which delegation should be allowed
-         using SPNEGO Kerberos or NTLM authentication.
-        </long>
-        </locale>
-      </schema>
-    </schemalist>
-</gconfschemafile>