From e4e13a9a966f6c19857f8bb35870d68c14f2947b Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Fri, 6 Sep 2013 18:19:45 +0000 Subject: [PATCH] [GTK] Desktop proxy settings are ignored inside the internal jhbuild https://bugs.webkit.org/show_bug.cgi?id=120833 Patch by Mario Sanchez Prada on 2013-09-06 Reviewed by Gustavo Noronha Silva. Add dconf as an optional module for the internal jhbuild, along with vala 0.17 as a dependency, and make sure we do not explicitly set always the 'memory' backend, so we can have an easy way to allow apps access desktop settings from the jhbuild. This is useful for example to be able to run apps such as MiniBrowser inside the jhbuild (by means of run-launcher, for instance) while working behind a proxy, since those network settings have to be read from the system global configuration in org.gnome.system.proxy. * gtk/jhbuild-optional.modules: Added dconf 0.14 and vala 0.17. * gtk/jhbuildrc: Do not explicitly choose the GSettings memory backend here, since that will make more difficult to use the dconf backend from inside the jhbuild if we need to do it so. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155197 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 21 +++++++++++++++++++++ Tools/gtk/jhbuild-optional.modules | 26 ++++++++++++++++++++++++++ Tools/gtk/jhbuildrc | 4 ---- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 6e1f55824520..998d96f12c52 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,24 @@ +2013-09-06 Mario Sanchez Prada + + [GTK] Desktop proxy settings are ignored inside the internal jhbuild + https://bugs.webkit.org/show_bug.cgi?id=120833 + + Reviewed by Gustavo Noronha Silva. + + Add dconf as an optional module for the internal jhbuild, along + with vala 0.17 as a dependency, and make sure we do not explicitly + set always the 'memory' backend, so we can have an easy way to + allow apps access desktop settings from the jhbuild. This is + useful for example to be able to run apps such as MiniBrowser + inside the jhbuild (by means of run-launcher, for instance) while + working behind a proxy, since those network settings have to be + read from the system global configuration in org.gnome.system.proxy. + + * gtk/jhbuild-optional.modules: Added dconf 0.14 and vala 0.17. + * gtk/jhbuildrc: Do not explicitly choose the GSettings memory + backend here, since that will make more difficult to use the dconf + backend from inside the jhbuild if we need to do it so. + 2013-09-06 Alexey Proskuryakov Lots of pixel tests are failing on first run, so tests cannot finish diff --git a/Tools/gtk/jhbuild-optional.modules b/Tools/gtk/jhbuild-optional.modules index cccf8ffff33a..91fb829fb65a 100644 --- a/Tools/gtk/jhbuild-optional.modules +++ b/Tools/gtk/jhbuild-optional.modules @@ -16,4 +16,30 @@ hash="sha256:e5399dfb61376a7500d20cb22715152780aa3a2c8a64281ec6bc8f0ebeb8b689"/> + + + + + + + + + + + + + libvala-0.20.pc + + + + + + diff --git a/Tools/gtk/jhbuildrc b/Tools/gtk/jhbuildrc index 1d312927c9c8..69f9457df891 100644 --- a/Tools/gtk/jhbuildrc +++ b/Tools/gtk/jhbuildrc @@ -55,10 +55,6 @@ module_makeargs['gtk+'] = 'LDFLAGS="-lm" ' + makeargs # to use only the plugins we build in JHBuild. os.environ['GST_PLUGIN_SYSTEM_PATH'] = '' -# We often end up using the memory backend anyway, so explicitly choosing -# it will prevent the warning message. -os.environ['GSETTINGS_BACKEND'] = 'memory' - # We always enable introspection so that we can sniff out problems with our # annotations sooner rather than later. autogenargs='--enable-introspection' -- 2.36.0