Hello community,
here is the log from the commit of package MozillaFirefox
checked in at Wed Jun 21 01:16:27 CEST 2006.
--------
--- MozillaFirefox/MozillaFirefox.changes 2006-06-01 20:35:51.000000000 +0200
+++ MozillaFirefox/MozillaFirefox.changes 2006-06-19 06:29:02.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Jun 16 22:11:22 CEST 2006 - stark@suse.de
+
+- added 48x48 icon (#185777)
+
+-------------------------------------------------------------------
+Mon Jun 12 20:20:02 CEST 2006 - stark@suse.de
+
+- fix overwrite confirmation for GTK filesaver (#179531)
+- get network.negotiate-auth.trusted-uris and
+ network.negotiate-auth.delegation-uris from gconf if
+ system-settings are enabled (#184489)
+
+-------------------------------------------------------------------
New:
----
file-saver.patch
firefox48.png
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.736QOa/_old 2006-06-21 01:16:14.000000000 +0200
+++ /var/tmp/diff_new_pack.736QOa/_new 2006-06-21 01:16:14.000000000 +0200
@@ -21,7 +21,7 @@
Obsoletes: mozilla
%endif
Version: 1.5.0.4
-Release: 1
+Release: 2
Summary: Mozilla Firefox Web Browser
URL: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
@@ -36,11 +36,13 @@
Source8: plastikfox-theme.tar.bz2
Source9: bookmarks.html.nld
Source10: bookmarks.html.suse
+Source11: firefox48.png
Source16: firefox.1
Source17: firefox-suse-default-prefs.js
Source18: firefox.schemas
Patch1: visibility.patch
Patch2: rpath.patch
+Patch3: file-saver.patch
Patch4: pango-cairo.patch
Patch5: abuild.patch
# NSPR bmo #270502
@@ -153,6 +155,9 @@
cd $RPM_BUILD_DIR/mozilla
%patch1
%patch2
+%if %suse_version >= 1000
+%patch3
+%endif
%patch4
%patch5
%patch6
@@ -369,6 +374,8 @@
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
%if %milestone
cp -f other-licenses/branding/firefox/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.png
+mkdir -p $RPM_BUILD_ROOT/opt/gnome/share/icons/hicolor/48x48/apps/
+install %{SOURCE11} $RPM_BUILD_ROOT/opt/gnome/share/icons/hicolor/48x48/apps/firefox.png
ln -sf firefox.png $RPM_BUILD_ROOT/usr/share/pixmaps/firefox-gnome.png
%else
cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.xpm
@@ -491,6 +498,9 @@
%endif
/etc/opt/gnome/gconf/schemas/firefox.schemas
/usr/share/pixmaps/firefox*
+%if %milestone
+/opt/gnome/share/icons/hicolor/
+%endif
/usr/bin/%{progname}
%doc %{_mandir}/man1/firefox.1.gz
@@ -498,6 +508,13 @@
%defattr(-,root,root)
%changelog -n MozillaFirefox
+* Fri Jun 16 2006 - stark@suse.de
+- added 48x48 icon (#185777)
+* Mon Jun 12 2006 - stark@suse.de
+- fix overwrite confirmation for GTK filesaver (#179531)
+- get network.negotiate-auth.trusted-uris and
+ network.negotiate-auth.delegation-uris from gconf if
+ system-settings are enabled (#184489)
* Thu Jun 01 2006 - stark@suse.de
- update to security/stability release 1.5.0.4 (#179011)
- moved locale-global prefs to browserconfig.properties (#177881)
++++++ file-saver.patch ++++++
From: Robert O'Callahan
Subject: overwrite confirmation behaves strange (we need at least GTK2.8 for this)
References:
https://bugzilla.novell.com/show_bug.cgi?id=179531
https://bugzilla.mozilla.org/show_bug.cgi?id=341218
Index: widget/src/gtk2/nsFilePicker.cpp
===================================================================
RCS file: /home/rocallahan/mozilla-cvs-mirror/mozilla/widget/src/gtk2/nsFilePicker.cpp,v
retrieving revision 1.11
diff -u -t -p -1 -2 -r1.11 nsFilePicker.cpp
--- widget/src/gtk2/nsFilePicker.cpp 17 Aug 2005 13:41:44 -0000 1.11
+++ widget/src/gtk2/nsFilePicker.cpp 12 Jun 2006 08:02:15 -0000
@@ -81,39 +81,41 @@ typedef enum
GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
} GtkFileChooserAction;
typedef gchar* (*_gtk_file_chooser_get_filename_fn)(GtkFileChooser *chooser);
typedef GSList* (*_gtk_file_chooser_get_filenames_fn)(GtkFileChooser *chooser);
typedef GtkWidget* (*_gtk_file_chooser_dialog_new_fn)(const gchar *title,
GtkWindow *parent,
GtkFileChooserAction action,
const gchar *first_button_text,
...);
typedef void (*_gtk_file_chooser_set_select_multiple_fn)(GtkFileChooser* chooser, gboolean truth);
+typedef void (*_gtk_file_chooser_set_do_overwrite_confirmation_fn)(GtkFileChooser* chooser, gboolean do_confirm);
typedef void (*_gtk_file_chooser_set_current_name_fn)(GtkFileChooser* chooser, const gchar* name);
typedef void (*_gtk_file_chooser_set_current_folder_fn)(GtkFileChooser* chooser, const gchar* folder);
typedef void (*_gtk_file_chooser_add_filter_fn)(GtkFileChooser* chooser, GtkFileFilter* filter);
typedef void (*_gtk_file_chooser_set_filter_fn)(GtkFileChooser* chooser, GtkFileFilter* filter);
typedef GtkFileFilter* (*_gtk_file_chooser_get_filter_fn)(GtkFileChooser* chooser);
typedef GSList* (*_gtk_file_chooser_list_filters_fn)(GtkFileChooser* chooser);
typedef GtkFileFilter* (*_gtk_file_filter_new_fn)();
typedef void (*_gtk_file_filter_add_pattern_fn)(GtkFileFilter* filter, const gchar* pattern);
typedef void (*_gtk_file_filter_set_name_fn)(GtkFileFilter* filter, const gchar* name);
DECL_FUNC_PTR(gtk_file_chooser_get_filename);
DECL_FUNC_PTR(gtk_file_chooser_get_filenames);
DECL_FUNC_PTR(gtk_file_chooser_dialog_new);
DECL_FUNC_PTR(gtk_file_chooser_set_select_multiple);
+DECL_FUNC_PTR(gtk_file_chooser_set_do_overwrite_confirmation);
DECL_FUNC_PTR(gtk_file_chooser_set_current_name);
DECL_FUNC_PTR(gtk_file_chooser_set_current_folder);
DECL_FUNC_PTR(gtk_file_chooser_add_filter);
DECL_FUNC_PTR(gtk_file_chooser_set_filter);
DECL_FUNC_PTR(gtk_file_chooser_get_filter);
DECL_FUNC_PTR(gtk_file_chooser_list_filters);
DECL_FUNC_PTR(gtk_file_filter_new);
DECL_FUNC_PTR(gtk_file_filter_add_pattern);
DECL_FUNC_PTR(gtk_file_filter_set_name);
static GtkWindow *
get_gtk_window_for_nsiwidget(nsIWidget *widget)
@@ -175,24 +177,25 @@ nsFilePicker::LoadSymbolsGTK24()
} else {
// XXX hmm, this seems to fail when gtk 2.4 is already loaded...
mGTK24 = LoadVersionedLibrary("gtk-2", ".4");
if (!mGTK24) {
return NS_ERROR_NOT_AVAILABLE;
}
GET_LIBGTK_FUNC(gtk_file_chooser_get_filename);
}
GET_LIBGTK_FUNC(gtk_file_chooser_get_filenames);
GET_LIBGTK_FUNC(gtk_file_chooser_dialog_new);
GET_LIBGTK_FUNC(gtk_file_chooser_set_select_multiple);
+ GET_LIBGTK_FUNC(gtk_file_chooser_set_do_overwrite_confirmation);
GET_LIBGTK_FUNC(gtk_file_chooser_set_current_name);
GET_LIBGTK_FUNC(gtk_file_chooser_set_current_folder);
GET_LIBGTK_FUNC(gtk_file_chooser_add_filter);
GET_LIBGTK_FUNC(gtk_file_chooser_set_filter);
GET_LIBGTK_FUNC(gtk_file_chooser_get_filter);
GET_LIBGTK_FUNC(gtk_file_chooser_list_filters);
GET_LIBGTK_FUNC(gtk_file_filter_new);
GET_LIBGTK_FUNC(gtk_file_filter_add_pattern);
GET_LIBGTK_FUNC(gtk_file_filter_set_name);
// Woot.
return NS_OK;
@@ -555,43 +558,51 @@ nsFilePicker::Show(PRInt16 *aReturn)
const char *filter_pattern = mFilters[i]->get();
_gtk_file_filter_set_name (filter, filter_pattern);
}
_gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_chooser), filter);
// Set the initially selected filter
if (mSelectedType == i) {
_gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(file_chooser), filter);
}
}
+ PRBool manualConfirm = PR_TRUE;
+ if (_gtk_file_chooser_set_do_overwrite_confirmation) {
+ manualConfirm = PR_FALSE;
+ // Only available in GTK 2.8
+ _gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(file_chooser), PR_TRUE);
+ }
+
gint response = gtk_dialog_run (GTK_DIALOG (file_chooser));
switch (response) {
case GTK_RESPONSE_ACCEPT:
ReadValuesFromFileChooser(file_chooser);
*aReturn = nsIFilePicker::returnOK;
if (mMode == nsIFilePicker::modeSave) {
nsCOMPtr<nsILocalFile> file;
GetFile(getter_AddRefs(file));
if (file) {
PRBool exists = PR_FALSE;
file->Exists(&exists);
if (exists) {
- PRBool overwrite = confirm_overwrite_file (file_chooser, file);
+ PRBool overwrite = !manualConfirm ||
+ confirm_overwrite_file (file_chooser, file);
if (overwrite) {
*aReturn = nsIFilePicker::returnReplace;
} else {
- *aReturn = nsIFilePicker::returnCancel;
+ *aReturn = nsIFilePicker::returnCancel;
}
}
}
}
break;
case GTK_RESPONSE_CANCEL:
case GTK_RESPONSE_CLOSE:
case GTK_RESPONSE_DELETE_EVENT:
*aReturn = nsIFilePicker::returnCancel;
break;
++++++ firefox.schemas ++++++
--- MozillaFirefox/firefox.schemas 2006-06-01 20:21:39.000000000 +0200
+++ MozillaFirefox/firefox.schemas 2006-06-19 06:29:02.000000000 +0200
@@ -252,5 +252,36 @@
</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>
+ string
+ <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>
+ string
+ <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>
++++++ gconf-backend.patch ++++++
--- /var/tmp/diff_new_pack.736QOa/_old 2006-06-21 01:16:16.000000000 +0200
+++ /var/tmp/diff_new_pack.736QOa/_new 2006-06-21 01:16:16.000000000 +0200
@@ -4,7 +4,7 @@
retrieving revision 1.4
diff -u -t -p -1 -2 -r1.4 nsSystemPref.h
--- extensions/pref/system-pref/src/nsSystemPref.h 23 Feb 2005 16:15:37 -0000 1.4
-+++ extensions/pref/system-pref/src/nsSystemPref.h 5 Feb 2006 22:18:30 -0000
++++ extensions/pref/system-pref/src/nsSystemPref.h 6 Jun 2006 00:14:06 -0000
@@ -14,101 +14,131 @@
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
@@ -176,7 +176,7 @@
retrieving revision 1.1
diff -u -t -p -1 -2 -r1.1 nsSystemPrefFactory.cpp
--- extensions/pref/system-pref/src/nsSystemPrefFactory.cpp 15 Apr 2003 02:28:25 -0000 1.1
-+++ extensions/pref/system-pref/src/nsSystemPrefFactory.cpp 5 Feb 2006 22:18:30 -0000
++++ extensions/pref/system-pref/src/nsSystemPrefFactory.cpp 6 Jun 2006 00:14:06 -0000
@@ -33,28 +33,28 @@
* 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 NPL, indicate your
@@ -234,7 +234,7 @@
RCS file: extensions/pref/system-pref/src/nsISystemPrefService.h
diff -N extensions/pref/system-pref/src/nsISystemPrefService.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ extensions/pref/system-pref/src/nsISystemPrefService.h 5 Feb 2006 22:18:30 -0000
++++ extensions/pref/system-pref/src/nsISystemPrefService.h 6 Jun 2006 00:14:06 -0000
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4:
@@ -349,7 +349,7 @@
retrieving revision 1.9
diff -u -t -p -1 -2 -r1.9 nsSystemPref.cpp
--- extensions/pref/system-pref/src/nsSystemPref.cpp 30 Apr 2005 02:37:41 -0000 1.9
-+++ extensions/pref/system-pref/src/nsSystemPref.cpp 6 Feb 2006 00:27:19 -0000
++++ extensions/pref/system-pref/src/nsSystemPref.cpp 6 Jun 2006 00:14:06 -0000
@@ -15,99 +15,96 @@
* implied. See the License for the specific language governing
* rights and limitations under the License.
@@ -1252,11 +1252,11 @@
Index: configure.in
===================================================================
RCS file: /home/rocallahan/mozilla-cvs-mirror/mozilla/configure.in,v
-retrieving revision 1.1503.2.11
-diff -u -t -p -1 -2 -r1.1503.2.11 configure.in
---- configure.in 14 Sep 2005 14:24:18 -0000 1.1503.2.11
-+++ configure.in 5 Feb 2006 22:18:30 -0000
-@@ -4400,24 +4400,25 @@ then
+retrieving revision 1.1503.2.15.2.8
+diff -u -t -p -1 -2 -r1.1503.2.15.2.8 configure.in
+--- configure.in 21 Apr 2006 20:50:21 -0000 1.1503.2.15.2.8
++++ configure.in 6 Jun 2006 00:14:06 -0000
+@@ -4464,24 +4464,25 @@ then
AC_SUBST(MOZ_GNOMEVFS_CFLAGS)
AC_SUBST(MOZ_GNOMEVFS_LIBS)
@@ -1285,11 +1285,11 @@
Index: configure
===================================================================
RCS file: /home/rocallahan/mozilla-cvs-mirror/mozilla/configure,v
-retrieving revision 1.1492.2.12
-diff -u -t -p -1 -2 -r1.1492.2.12 configure
---- configure 14 Sep 2005 14:32:53 -0000 1.1492.2.12
-+++ configure 5 Feb 2006 22:18:30 -0000
-@@ -19541,24 +19541,25 @@ s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
+retrieving revision 1.1492.2.17.2.7
+diff -u -t -p -1 -2 -r1.1492.2.17.2.7 configure
+--- configure 21 Apr 2006 21:41:39 -0000 1.1492.2.17.2.7
++++ configure 6 Jun 2006 00:14:06 -0000
+@@ -19564,24 +19564,25 @@ s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g
s%@_PANGOCHK_CFLAGS@%$_PANGOCHK_CFLAGS%g
s%@_PANGOCHK_LIBS@%$_PANGOCHK_LIBS%g
@@ -1318,11 +1318,11 @@
Index: config/autoconf.mk.in
===================================================================
RCS file: /home/rocallahan/mozilla-cvs-mirror/mozilla/config/autoconf.mk.in,v
-retrieving revision 3.363.2.1
-diff -u -t -p -1 -2 -r3.363.2.1 autoconf.mk.in
---- config/autoconf.mk.in 17 Aug 2005 17:17:17 -0000 3.363.2.1
-+++ config/autoconf.mk.in 5 Feb 2006 22:18:30 -0000
-@@ -206,24 +206,25 @@ MOZ_LIBART_CFLAGS := $(MOZ_LIBART_CFLAGS
+retrieving revision 3.363.2.1.4.4
+diff -u -t -p -1 -2 -r3.363.2.1.4.4 autoconf.mk.in
+--- config/autoconf.mk.in 21 Apr 2006 20:50:30 -0000 3.363.2.1.4.4
++++ config/autoconf.mk.in 6 Jun 2006 00:14:06 -0000
+@@ -208,24 +208,25 @@ MOZ_LIBART_CFLAGS := $(MOZ_LIBART_CFLAGS
endif
endif
MOZ_LIBART_LIBS = @MOZ_LIBART_LIBS@
@@ -1353,14 +1353,14 @@
RCS file: /cvsroot/mozilla/browser/installer/unix/packages-static,v
retrieving revision 1.50.2.7.2.1
diff -u -r1.50.2.7.2.1 packages-static
---- browser/installer/unix/packages-static 20 Dec 2005 15:43:34 -0000 1.50.2.7.2.1
-+++ browser/installer/unix/packages-static 24 Dec 2005 09:22:23 -0000
+--- browser/installer/unix/packages-static 20 Dec 2005 15:43:34 -0000 1.50.2.7.2.1
++++ browser/installer/unix/packages-static 24 Dec 2005 09:22:23 -0000
@@ -193,6 +193,7 @@
bin/components/nsUpdateService.js
bin/components/extensions.xpt
bin/components/update.xpt
+bin/components/libsystem-pref-gconf.so
-
+
; Kerberos NegotiateAuth
bin/components/libauth.so
Index: extensions/pref/system-pref/src/Makefile.in
@@ -1500,10 +1500,12 @@
===================================================================
RCS file: /cvsroot/mozilla/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp,v
retrieving revision 1.8
-diff -u -p -6 -r1.8 nsSystemPrefService.cpp
+diff -u -p -8 -r1.8 nsSystemPrefService.cpp
--- extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp 23 Feb 2005 16:15:37 -0000 1.8
-+++ extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp 14 Feb 2006 20:39:07 -0000
-@@ -20,13 +20,13 @@
++++ extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp 9 Jun 2006 04:35:03 -0000
+@@ -18,17 +18,17 @@
+ * The Original Code is mozilla.org code.
+ *
* The Initial Developer of the Original Code is Sun Microsystems, Inc.
* Portions created by Sun Microsystems are Copyright (C) 2003 Sun
* Microsystems, Inc. All Rights Reserved.
@@ -1518,7 +1520,11 @@
* 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
-@@ -38,847 +38,1209 @@
+ * 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 NPL, indicate your
+@@ -36,849 +36,1272 @@
+ * 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 NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -2121,39 +2127,36 @@
-NS_IMETHODIMP nsSystemPrefService::UnlockPref(const char *aPrefName)
-{
- return NS_ERROR_NOT_IMPLEMENTED;
-+/**
-+ * The relationship R is
-+ * "network.proxy.no_proxies_on" is the comma-separated concatenation
-+ * of the elements of the list "/system/http_proxy/ignore_hosts"
-+ */
-+static const char GConfKey_IgnoreHosts[] = "/system/http_proxy/ignore_hosts";
-+static const char MozKey_IgnoreHosts[] = "network.proxy.no_proxies_on";
-+static nsresult ApplyIgnoreHosts(nsSystemPrefService* aPrefService,
-+ GConfClient* aClient)
++static nsresult ApplyListPref(nsSystemPrefService* aPrefService,
++ GConfClient* aClient,
++ const char* aGConfKey, const char* aMozKey,
++ char aSeparator)
+{
-+ GSList* list = gconf_client_get_list(aClient, GConfKey_IgnoreHosts,
++ GSList* list = gconf_client_get_list(aClient, aGConfKey,
+ GCONF_VALUE_STRING, nsnull);
+ nsCAutoString str;
+ for (GSList* l = list; l; l = l->next) {
+ str.Append((const char*)l->data);
+ if (l->next) {
-+ str.Append(',');
++ str.Append(aSeparator);
+ }
+ }
-+ PRBool lock = !gconf_client_key_is_writable(aClient, GConfKey_IgnoreHosts, nsnull);
++ PRBool lock = !gconf_client_key_is_writable(aClient, aGConfKey, nsnull);
+ nsresult rv = aPrefService->GetPrefs()->
-+ SetOverridingMozillaStringPref(MozKey_IgnoreHosts, str.get(), lock);
++ SetOverridingMozillaStringPref(aMozKey, str.get(), lock);
+ // XXX does this free the strings? Should it?
+ g_slist_free(list);
+ return rv;
+}
-+static nsresult ReverseApplyIgnoreHosts(nsSystemPrefService* aPrefService,
-+ GConfClient* aClient)
++static nsresult ReverseApplyListPref(nsSystemPrefService* aPrefService,
++ GConfClient* aClient,
++ const char* aGConfKey, const char* aMozKey,
++ char aSeparator)
+{
+ char* data = nsnull;
+ nsCOMPtr<nsIPrefBranch2> prefs =
+ aPrefService->GetPrefs()->GetPrefUserBranch();
-+ prefs->GetCharPref(MozKey_IgnoreHosts, &data);
++ prefs->GetCharPref(aMozKey, &data);
+ if (!data)
+ return NS_ERROR_FAILURE;
+ nsresult rv = NS_OK;
@@ -2177,7 +2180,7 @@
+ }
+ nsMemory::Free(data);
+ if (NS_SUCCEEDED(rv)) {
-+ gconf_client_set_list(aClient, GConfKey_IgnoreHosts, GCONF_VALUE_STRING, list, nsnull);
++ gconf_client_set_list(aClient, aGConfKey, GCONF_VALUE_STRING, list, nsnull);
+ }
+ for (GSList* l = list; l; l = l->next) {
+ free(l->data);
@@ -2190,6 +2193,66 @@
-NS_IMETHODIMP nsSystemPrefService::DeleteBranch(const char *aStartingAt)
+/**
+ * The relationship R is
++ * "network.negotiate-auth.trusted-uris" is the comma-separated concatenation
++ * of the elements of the list "/apps/firefox/general/trusted_URIs"
++ */
++static const char GConfKey_TrustedURIs[] = "/apps/firefox/general/trusted_URIs";
++static const char MozKey_TrustedURIs[] = "network.negotiate-auth.trusted-uris";
++static nsresult ApplyTrustedURIs(nsSystemPrefService* aPrefService,
++ GConfClient* aClient)
++{
++ return ApplyListPref(aPrefService, aClient,
++ GConfKey_TrustedURIs, MozKey_TrustedURIs, ',');
++}
++static nsresult ReverseApplyTrustedURIs(nsSystemPrefService* aPrefService,
++ GConfClient* aClient)
++{
++ return ReverseApplyListPref(aPrefService, aClient,
++ GConfKey_TrustedURIs, MozKey_TrustedURIs, ',');
++}
++
++/**
++ * The relationship R is
++ * "network.negotiate-auth.delegation-uris" is the comma-separated concatenation
++ * of the elements of the list "/apps/firefox/general/delegation_URIs"
++ */
++static const char GConfKey_DelegationURIs[] = "/apps/firefox/general/delegation_URIs";
++static const char MozKey_DelegationURIs[] = "network.negotiate-auth.delegation-uris";
++static nsresult ApplyDelegationURIs(nsSystemPrefService* aPrefService,
++ GConfClient* aClient)
++{
++ return ApplyListPref(aPrefService, aClient,
++ GConfKey_DelegationURIs, MozKey_DelegationURIs, ',');
++}
++static nsresult ReverseApplyDelegationURIs(nsSystemPrefService* aPrefService,
++ GConfClient* aClient)
++{
++ return ReverseApplyListPref(aPrefService, aClient,
++ GConfKey_DelegationURIs, MozKey_DelegationURIs, ',');
++}
++
++/**
++ * The relationship R is
++ * "network.proxy.no_proxies_on" is the comma-separated concatenation
++ * of the elements of the list "/system/http_proxy/ignore_hosts"
++ */
++static const char GConfKey_IgnoreHosts[] = "/system/http_proxy/ignore_hosts";
++static const char MozKey_IgnoreHosts[] = "network.proxy.no_proxies_on";
++static nsresult ApplyIgnoreHosts(nsSystemPrefService* aPrefService,
++ GConfClient* aClient)
++{
++ return ApplyListPref(aPrefService, aClient,
++ GConfKey_IgnoreHosts, MozKey_IgnoreHosts, ',');
++}
++static nsresult ReverseApplyIgnoreHosts(nsSystemPrefService* aPrefService,
++ GConfClient* aClient)
++{
++ return ReverseApplyListPref(aPrefService, aClient,
++ GConfKey_IgnoreHosts, MozKey_IgnoreHosts, ',');
++}
++
++/**
++ * The relationship R is
+ * ("/system/proxy/mode" is 'manual' if and only if "network.proxy.type" is eProxyConfig_Manual (1))
+ * AND ("/system/proxy/mode" is 'auto' if and only if "network.proxy.type" is eProxyConfig_PAC (2))
+ *
@@ -3060,6 +3123,8 @@
-{
- NS_ENSURE_TRUE(mInitialized, NS_ERROR_FAILURE);
+static ComplexGConfPrefMapping sComplexGConfPrefMappings[] = {
++ {GConfKey_TrustedURIs, ApplyTrustedURIs},
++ {GConfKey_DelegationURIs, ApplyDelegationURIs},
+ {GConfKey_IgnoreHosts, ApplyIgnoreHosts},
+ {GConfKey_ProxyMode, ApplyProxyMode},
+ {GConfKey_DownloadFolder, ApplyDownloadFolder},
@@ -3073,6 +3138,8 @@
+ {GConfKey_DisablePopups, ApplyDisablePopups}
+};
+static ComplexMozPrefMapping sComplexMozPrefMappings[] = {
++ {MozKey_TrustedURIs, ReverseApplyTrustedURIs},
++ {MozKey_DelegationURIs, ReverseApplyDelegationURIs},
+ {MozKey_IgnoreHosts, ReverseApplyIgnoreHosts},
+ {MozKey_ProxyMode, ReverseApplyProxyMode},
+ {MozKey_UseDownloadDir, ReverseApplyDownloadFolder},
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org