[meego-commits] 6177: Changes to Trunk:Testing/WebKit
Aaron Bockover
abockover at novell.com
Sun Aug 1 15:56:27 UTC 2010
Hi,
I have made the following changes to WebKit in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Aaron Bockover
[This message was auto-generated]
---
Request #6177:
submit: home:abock:branches:Trunk:Testing/WebKit(r2)(cleanup) -> Trunk:Testing/WebKit
Message:
Update to 1.2.3, the latest stable release, with many bug fixes and CVE fixes - required for Banshee 1.7.3 as well
State: new 2010-08-01T03:49:01 abock
Comment: None
changes files:
--------------
--- WebKit.changes
+++ WebKit.changes
@@ -0,0 +1,5 @@
+* Sat Jul 31 2010 Aaron Bockover <abockover at novell.com> - 1.2.3
+- Updated to latest upstream stable release.
+- Removed comment about Anjal bug #4346 from spec file which
+ has been fixed for quite some time.
+
old:
----
webkit-1.2.1.tar.gz
new:
----
webkit-1.2.3.tar.gz
spec files:
-----------
--- WebKit.spec
+++ WebKit.spec
@@ -6,12 +6,8 @@
cp -p %1 %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') \
echo %%doc %%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g') >> docfiles.list
-## Don't use Pango: Moblin Bug 4346 - Anjal can't display Chinese
-## chars in mail body
-## http://bugzilla.moblin.org/show_bug.cgi?id=4346
-
Name: WebKit
-Version: 1.2.1
+Version: 1.2.3
Release: 1
Summary: Web content engine library
other changes:
--------------
++++++ webkit-1.2.1.tar.gz -> webkit-1.2.3.tar.gz
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,13 @@
+2010-05-19 Dan Winship <danw at gnome.org>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Install introspection files in our prefix, not
+ gobject-introspection's prefix
+
+ * GNUmakefile.am:
+ * configure.ac:
+
2010-04-01 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Holger Freyther.
--- GNUmakefile.am
+++ GNUmakefile.am
@@ -430,10 +430,10 @@
-I$(top_srcdir) \
$(webkitgtk_h_api)
-girdir = $(GIRDIR)
+girdir = $(datadir)/gir-1.0
gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
-typelibsdir += $(GIRTYPELIBDIR)
+typelibsdir += $(libdir)/girepository-1.0
typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
%.typelib: %.gir $(G_IR_COMPILER)
--- GNUmakefile.in
+++ GNUmakefile.in
@@ -117,7 +117,7 @@
@ENABLE_INTROSPECTION_TRUE at am__append_9 = JSCore-1.0.gir
@ENABLE_INTROSPECTION_TRUE at am__append_10 = WebKit-1.0.gir
- at ENABLE_INTROSPECTION_TRUE@am__append_11 = $(GIRTYPELIBDIR)
+ at ENABLE_INTROSPECTION_TRUE@am__append_11 = $(libdir)/girepository-1.0
@ENABLE_INTROSPECTION_TRUE at am__append_12 = $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib)
@ENABLE_INTROSPECTION_TRUE at am__append_13 = $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
DIST_COMMON = README $(am__configure_deps) $(am__noinst_HEADERS_DIST) \
@@ -4214,6 +4214,8 @@
WebCore/platform/graphics/gtk/IntRectGtk.cpp \
WebCore/platform/gtk/ClipboardGtk.cpp \
WebCore/platform/gtk/ClipboardGtk.h \
+ WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp \
+ WebCore/platform/gtk/ClipboardUtilitiesGtk.h \
WebCore/platform/gtk/ContextMenuGtk.cpp \
WebCore/platform/gtk/ContextMenuItemGtk.cpp \
WebCore/platform/gtk/CursorGtk.cpp \
@@ -4225,6 +4227,8 @@
WebCore/platform/gtk/EventLoopGtk.cpp \
WebCore/platform/gtk/FileChooserGtk.cpp \
WebCore/platform/gtk/FileSystemGtk.cpp \
+ WebCore/platform/gtk/GOwnPtrGtk.cpp \
+ WebCore/platform/gtk/GOwnPtrGtk.h \
WebCore/platform/gtk/GRefPtrGtk.cpp \
WebCore/platform/gtk/GRefPtrGtk.h \
WebCore/platform/gtk/GtkPluginWidget.cpp \
@@ -5541,6 +5545,7 @@
WebCore/platform/graphics/gtk/libwebkit_1_0_la-IntPointGtk.lo \
WebCore/platform/graphics/gtk/libwebkit_1_0_la-IntRectGtk.lo \
WebCore/platform/gtk/libwebkit_1_0_la-ClipboardGtk.lo \
+ WebCore/platform/gtk/libwebkit_1_0_la-ClipboardUtilitiesGtk.lo \
WebCore/platform/gtk/libwebkit_1_0_la-ContextMenuGtk.lo \
WebCore/platform/gtk/libwebkit_1_0_la-ContextMenuItemGtk.lo \
WebCore/platform/gtk/libwebkit_1_0_la-CursorGtk.lo \
@@ -5550,6 +5555,7 @@
WebCore/platform/gtk/libwebkit_1_0_la-EventLoopGtk.lo \
WebCore/platform/gtk/libwebkit_1_0_la-FileChooserGtk.lo \
WebCore/platform/gtk/libwebkit_1_0_la-FileSystemGtk.lo \
+ WebCore/platform/gtk/libwebkit_1_0_la-GOwnPtrGtk.lo \
WebCore/platform/gtk/libwebkit_1_0_la-GRefPtrGtk.lo \
WebCore/platform/gtk/libwebkit_1_0_la-GtkPluginWidget.lo \
WebCore/platform/gtk/libwebkit_1_0_la-KURLGtk.lo \
@@ -6325,8 +6331,6 @@
GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@
GEOCLUE_LIBS = @GEOCLUE_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIRDIR = @GIRDIR@
-GIRTYPELIBDIR = @GIRTYPELIBDIR@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
GLIB_LIBS = @GLIB_LIBS@
@@ -6395,6 +6399,8 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PNG_LIBS = @PNG_LIBS@
RANLIB = @RANLIB@
SED = @SED@
@@ -8699,6 +8705,8 @@
WebCore/platform/graphics/gtk/IntRectGtk.cpp \
WebCore/platform/gtk/ClipboardGtk.cpp \
WebCore/platform/gtk/ClipboardGtk.h \
+ WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp \
+ WebCore/platform/gtk/ClipboardUtilitiesGtk.h \
WebCore/platform/gtk/ContextMenuGtk.cpp \
WebCore/platform/gtk/ContextMenuItemGtk.cpp \
WebCore/platform/gtk/CursorGtk.cpp \
@@ -8710,6 +8718,8 @@
WebCore/platform/gtk/EventLoopGtk.cpp \
WebCore/platform/gtk/FileChooserGtk.cpp \
WebCore/platform/gtk/FileSystemGtk.cpp \
+ WebCore/platform/gtk/GOwnPtrGtk.cpp \
+ WebCore/platform/gtk/GOwnPtrGtk.h \
WebCore/platform/gtk/GRefPtrGtk.cpp \
WebCore/platform/gtk/GRefPtrGtk.h \
WebCore/platform/gtk/GtkPluginWidget.cpp \
@@ -9058,7 +9068,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
- at ENABLE_INTROSPECTION_TRUE@girdir = $(GIRDIR)
+ at ENABLE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
@ENABLE_INTROSPECTION_TRUE at gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES)
WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
@@ -9214,7 +9224,9 @@
webinspectordir = ${datadir}/webkit-1.0/webinspector
dist_webinspector_DATA = \
$(WebCore)/English.lproj/localizedStrings.js \
- $(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
+ $(shell ls $(WebCore)/inspector/front-end/*.js) \
+ $(shell ls $(WebCore)/inspector/front-end/*.html) \
+ $(shell ls $(WebCore)/inspector/front-end/*.css)
webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
dist_webinspectorimages_DATA = \
@@ -13923,6 +13935,9 @@
WebCore/platform/gtk/libwebkit_1_0_la-ClipboardGtk.lo: \
WebCore/platform/gtk/$(am__dirstamp) \
WebCore/platform/gtk/$(DEPDIR)/$(am__dirstamp)
+WebCore/platform/gtk/libwebkit_1_0_la-ClipboardUtilitiesGtk.lo: \
+ WebCore/platform/gtk/$(am__dirstamp) \
+ WebCore/platform/gtk/$(DEPDIR)/$(am__dirstamp)
WebCore/platform/gtk/libwebkit_1_0_la-ContextMenuGtk.lo: \
WebCore/platform/gtk/$(am__dirstamp) \
WebCore/platform/gtk/$(DEPDIR)/$(am__dirstamp)
@@ -13950,6 +13965,9 @@
WebCore/platform/gtk/libwebkit_1_0_la-FileSystemGtk.lo: \
WebCore/platform/gtk/$(am__dirstamp) \
WebCore/platform/gtk/$(DEPDIR)/$(am__dirstamp)
+WebCore/platform/gtk/libwebkit_1_0_la-GOwnPtrGtk.lo: \
+ WebCore/platform/gtk/$(am__dirstamp) \
+ WebCore/platform/gtk/$(DEPDIR)/$(am__dirstamp)
WebCore/platform/gtk/libwebkit_1_0_la-GRefPtrGtk.lo: \
WebCore/platform/gtk/$(am__dirstamp) \
WebCore/platform/gtk/$(DEPDIR)/$(am__dirstamp)
@@ -16398,6 +16416,8 @@
-rm -f WebCore/platform/graphics/transforms/libwebkit_1_0_la-TranslateTransformOperation.lo
-rm -f WebCore/platform/gtk/libwebkit_1_0_la-ClipboardGtk.$(OBJEXT)
-rm -f WebCore/platform/gtk/libwebkit_1_0_la-ClipboardGtk.lo
+ -rm -f WebCore/platform/gtk/libwebkit_1_0_la-ClipboardUtilitiesGtk.$(OBJEXT)
+ -rm -f WebCore/platform/gtk/libwebkit_1_0_la-ClipboardUtilitiesGtk.lo
-rm -f WebCore/platform/gtk/libwebkit_1_0_la-ContextMenuGtk.$(OBJEXT)
-rm -f WebCore/platform/gtk/libwebkit_1_0_la-ContextMenuGtk.lo
-rm -f WebCore/platform/gtk/libwebkit_1_0_la-ContextMenuItemGtk.$(OBJEXT)
@@ -16416,6 +16436,8 @@
-rm -f WebCore/platform/gtk/libwebkit_1_0_la-FileChooserGtk.lo
-rm -f WebCore/platform/gtk/libwebkit_1_0_la-FileSystemGtk.$(OBJEXT)
-rm -f WebCore/platform/gtk/libwebkit_1_0_la-FileSystemGtk.lo
+ -rm -f WebCore/platform/gtk/libwebkit_1_0_la-GOwnPtrGtk.$(OBJEXT)
+ -rm -f WebCore/platform/gtk/libwebkit_1_0_la-GOwnPtrGtk.lo
-rm -f WebCore/platform/gtk/libwebkit_1_0_la-GRefPtrGtk.$(OBJEXT)
-rm -f WebCore/platform/gtk/libwebkit_1_0_la-GRefPtrGtk.lo
-rm -f WebCore/platform/gtk/libwebkit_1_0_la-GeolocationServiceGtk.$(OBJEXT)
@@ -18462,6 +18484,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/graphics/transforms/$(DEPDIR)/libwebkit_1_0_la-TransformationMatrix.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/graphics/transforms/$(DEPDIR)/libwebkit_1_0_la-TranslateTransformOperation.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-ClipboardGtk.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-ClipboardUtilitiesGtk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-ContextMenuGtk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-ContextMenuItemGtk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-CursorGtk.Plo at am__quote@
@@ -18471,6 +18494,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-EventLoopGtk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-FileChooserGtk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-FileSystemGtk.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-GOwnPtrGtk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-GRefPtrGtk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-GeolocationServiceGtk.Plo at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-GtkPluginWidget.Plo at am__quote@
@@ -30043,6 +30067,14 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/platform/gtk/libwebkit_1_0_la-ClipboardGtk.lo `test -f 'WebCore/platform/gtk/ClipboardGtk.cpp' || echo '$(srcdir)/'`WebCore/platform/gtk/ClipboardGtk.cpp
+WebCore/platform/gtk/libwebkit_1_0_la-ClipboardUtilitiesGtk.lo: WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/platform/gtk/libwebkit_1_0_la-ClipboardUtilitiesGtk.lo -MD -MP -MF WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-ClipboardUtilitiesGtk.Tpo -c -o WebCore/platform/gtk/libwebkit_1_0_la-ClipboardUtilitiesGtk.lo `test -f 'WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp' || echo '$(srcdir)/'`WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-ClipboardUtilitiesGtk.Tpo WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-ClipboardUtilitiesGtk.Plo
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp' object='WebCore/platform/gtk/libwebkit_1_0_la-ClipboardUtilitiesGtk.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/platform/gtk/libwebkit_1_0_la-ClipboardUtilitiesGtk.lo `test -f 'WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp' || echo '$(srcdir)/'`WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp
+
WebCore/platform/gtk/libwebkit_1_0_la-ContextMenuGtk.lo: WebCore/platform/gtk/ContextMenuGtk.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/platform/gtk/libwebkit_1_0_la-ContextMenuGtk.lo -MD -MP -MF WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-ContextMenuGtk.Tpo -c -o WebCore/platform/gtk/libwebkit_1_0_la-ContextMenuGtk.lo `test -f 'WebCore/platform/gtk/ContextMenuGtk.cpp' || echo '$(srcdir)/'`WebCore/platform/gtk/ContextMenuGtk.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-ContextMenuGtk.Tpo WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-ContextMenuGtk.Plo
@@ -30115,6 +30147,14 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/platform/gtk/libwebkit_1_0_la-FileSystemGtk.lo `test -f 'WebCore/platform/gtk/FileSystemGtk.cpp' || echo '$(srcdir)/'`WebCore/platform/gtk/FileSystemGtk.cpp
+WebCore/platform/gtk/libwebkit_1_0_la-GOwnPtrGtk.lo: WebCore/platform/gtk/GOwnPtrGtk.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/platform/gtk/libwebkit_1_0_la-GOwnPtrGtk.lo -MD -MP -MF WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-GOwnPtrGtk.Tpo -c -o WebCore/platform/gtk/libwebkit_1_0_la-GOwnPtrGtk.lo `test -f 'WebCore/platform/gtk/GOwnPtrGtk.cpp' || echo '$(srcdir)/'`WebCore/platform/gtk/GOwnPtrGtk.cpp
+ at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-GOwnPtrGtk.Tpo WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-GOwnPtrGtk.Plo
+ at am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='WebCore/platform/gtk/GOwnPtrGtk.cpp' object='WebCore/platform/gtk/libwebkit_1_0_la-GOwnPtrGtk.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -c -o WebCore/platform/gtk/libwebkit_1_0_la-GOwnPtrGtk.lo `test -f 'WebCore/platform/gtk/GOwnPtrGtk.cpp' || echo '$(srcdir)/'`WebCore/platform/gtk/GOwnPtrGtk.cpp
+
WebCore/platform/gtk/libwebkit_1_0_la-GRefPtrGtk.lo: WebCore/platform/gtk/GRefPtrGtk.cpp
@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libwebkit_1_0_la_CPPFLAGS) $(CPPFLAGS) $(libwebkit_1_0_la_CXXFLAGS) $(CXXFLAGS) -MT WebCore/platform/gtk/libwebkit_1_0_la-GRefPtrGtk.lo -MD -MP -MF WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-GRefPtrGtk.Tpo -c -o WebCore/platform/gtk/libwebkit_1_0_la-GRefPtrGtk.lo `test -f 'WebCore/platform/gtk/GRefPtrGtk.cpp' || echo '$(srcdir)/'`WebCore/platform/gtk/GRefPtrGtk.cpp
@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-GRefPtrGtk.Tpo WebCore/platform/gtk/$(DEPDIR)/libwebkit_1_0_la-GRefPtrGtk.Plo
--- JavaScriptCore/ChangeLog
+++ JavaScriptCore/ChangeLog
@@ -1,3 +1,29 @@
+2010-05-07 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Darin Fisher.
+
+ [WTFURL] Add a malloc-backed URLBuffer
+ https://bugs.webkit.org/show_bug.cgi?id=38694
+
+ This patch adds a URLBuffer that uses new/delete to manage the backing
+ store for the buffer.
+
+ * wtf/url/src/RawURLBuffer.h: Added.
+ (WTF::RawURLBuffer::RawURLBuffer):
+ (WTF::RawURLBuffer::~RawURLBuffer):
+ (WTF::RawURLBuffer::resize):
+
+2010-05-06 Martin Robinson <mrobinson at webkit.org>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ [GTK] Enable DOM clipboard and drag-and-drop access
+ https://bugs.webkit.org/show_bug.cgi?id=30623
+
+ Convert dragging portion of drag-and-drop to use DataObjectGtk.
+
+ * wtf/gobject/GRefPtr.h: Add forward declarations for GObject functions.
+
2010-05-04 Yongjun Zhang <yongjun_zhang at apple.com>
Reviewed by Darin Adler.
--- JavaScriptCore/wtf/gobject/GRefPtr.h
+++ JavaScriptCore/wtf/gobject/GRefPtr.h
@@ -27,6 +27,9 @@
#include <algorithm>
typedef struct _GHashTable GHashTable;
+typedef void* gpointer;
+extern "C" void g_object_unref(gpointer object);
+extern "C" gpointer g_object_ref_sink(gpointer object);
namespace WTF {
--- WebCore/ChangeLog
+++ WebCore/ChangeLog
@@ -1,3 +1,841 @@
+2010-05-14 Abhishek Arya <inferno at chromium.org>
+
+ Reviewed by David Hyatt.
+
+ Move the m_width(Length) and m_columns(RenderTable::ColumnStruct)
+ vector out-of-bounds check out of the ASSERT into the main code.
+ https://bugs.webkit.org/show_bug.cgi?id=38261
+
+ Test: fast/table/fixed-table-layout-large-colspan-crash.html
+
+ * rendering/FixedTableLayout.cpp:
+ (WebCore::FixedTableLayout::calcWidthArray):
+
+2010-05-21 Beth Dakin <bdakin at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Fix for <rdar://problem/8009118> Crash in WebCore::toAlphabetic()
+ while running MangleMe
+ -and corresponding-
+ https://bugs.webkit.org/show_bug.cgi?id=39508
+
+ The math was slightly off here, and we wound up trying to access an
+ array at index -1 in some cases. We need to decrement numberShadow
+ rather than subtracting one from the result of the modulo
+ operation.
+
+ * rendering/RenderListMarker.cpp:
+ (WebCore::toAlphabeticOrNumeric):
+
+2010-05-20 Marcus Bulach <bulach at chromium.org>
+
+ Reviewed by Steve Block.
+
+ Ensure timers are stopped on Geolocation::disconnectFrame()
+ https://bugs.webkit.org/show_bug.cgi?id=39388
+
+ fast/dom/Geolocation/notimer-after-unload.html, plus it should be possible to re-enable Gtk LayoutTests.
+
+ * page/Geolocation.cpp:
+ (WebCore::Geolocation::disconnectFrame):
+
+2010-03-22 Darin Adler <darin at apple.com>
+
+ Reviewed by Dan Bernstein.
+
+ TextBreakIteratorICU.cpp is incompatible with new UBreakIterator type in ICU 4.4
+ https://bugs.webkit.org/show_bug.cgi?id=36381
+
+ * platform/text/TextBreakIteratorICU.cpp:
+ (WebCore::setUpIterator): Use reinterpret_cast instead of static_cast or relying
+ on conversion to void*.
+ (WebCore::textBreakFirst): Ditto.
+ (WebCore::textBreakLast): Ditto.
+ (WebCore::textBreakNext): Ditto.
+ (WebCore::textBreakPrevious): Ditto.
+ (WebCore::textBreakPreceding): Ditto.
+ (WebCore::textBreakFollowing): Ditto.
+ (WebCore::textBreakCurrent): Ditto.
+ (WebCore::isTextBreak): Ditto.
+ (WebCore::setUpIteratorWithRules): Ditto.
+
+2010-05-20 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Dave Hyatt.
+
+ <rdar://problem/8007953> Textarea using custom font appears blank
+
+ Test: fast/css/font-face-in-shadow-DOM.html
+
+ When a remote font is loaded, CSSFontSelector forces a style recalc, which replaces all
+ RenderSyles that have FontFallbackLists referencing the placeholder font with fresh
+ RenderStyles. However, it does not descend into shadow DOM trees, so those may end up with
+ styles that still reference the placeholder font.
+
+ The fix is to add RenderObject::requiresForcedStyleRecalcPropagation() and have it return
+ true from renderers that maintain shadow DOM trees or otherwise keep their own RenderStyles.
+
+ * dom/Element.cpp:
+ (WebCore::Element::recalcStyle): Check if forced style recalc needs to propagated.
+ * rendering/RenderButton.h:
+ (WebCore::RenderButton::requiresForcedStyleRecalcPropagation):
+ * rendering/RenderDataGrid.h:
+ (WebCore::RenderDataGrid::requiresForcedStyleRecalcPropagation):
+ * rendering/RenderFileUploadControl.h:
+ (WebCore::RenderFileUploadControl::requiresForcedStyleRecalcPropagation):
+ * rendering/RenderListItem.h:
+ (WebCore::RenderListItem::requiresForcedStyleRecalcPropagation):
+ * rendering/RenderMedia.h:
+ (WebCore::RenderMedia::requiresForcedStyleRecalcPropagation):
+ * rendering/RenderMenuList.h:
+ (WebCore::RenderMenuList::RenderMenuList::requiresForcedStyleRecalcPropagation):
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::requiresForcedStyleRecalcPropagation):
+ * rendering/RenderProgress.h:
+ (WebCore::RenderProgress::requiresForcedStyleRecalcPropagation):
+ * rendering/RenderSlider.h:
+ (WebCore::RenderSlider::requiresForcedStyleRecalcPropagation):
+ * rendering/RenderTextControl.h:
+ (WebCore::RenderTextControl::requiresForcedStyleRecalcPropagation):
+
+2010-05-19 Abhishek Arya <inferno at chromium.org>
+
+ Reviewed by David Hyatt.
+
+ Check that the node is a text node before doing a static cast
+ to a Text class pointer.
+ https://bugs.webkit.org/show_bug.cgi?id=38626
+
+ Test: fast/text/text-transform-nontext-node-crash.xhtml
+
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::originalText):
+ * rendering/RenderTextFragment.cpp:
+ (WebCore::RenderTextFragment::originalText):
+ (WebCore::RenderTextFragment::previousCharacter):
+
+2010-05-12 Abhishek Arya <inferno at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ HTML Entity Escape the contents of a textarea node when accessed via the innerHTML and outerHTML node properties.
+ https://bugs.webkit.org/show_bug.cgi?id=38922
+
+ Test: fast/encoding/textnode-XSS.html
+
+ * editing/markup.cpp:
+ (WebCore::appendStartMarkup):
+
+2010-05-12 James Robinson <jamesr at chromium.org>
+
+ Patch by Dan Bernstein.
+
+ Reviewed by David Hyatt.
+
+ Fix marking the layout root's parent as needing layout
+ https://bugs.webkit.org/show_bug.cgi?id=37760
+
+ If an element gets marked as needing layout due to the recalcStyle()
+ call in FrameView::layout(), the m_layoutSchedulingEnabled flag will
+ be set to false. It's possible at this point that a parent of the
+ existing FrameView::m_layoutRoot will be marked as needing layout.
+
+ This patch updates FrameView::scheduleRelayoutOfSubtree to account
+ for this case.
+
+ Manual test only due to subtle timing issues.
+
+ * manual-tests/layoutroot_detach.xml: Added.
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scheduleRelayoutOfSubtree):
+
+2010-04-28 Julien Chaffraix <jchaffraix at webkit.org>
+
+ Reviewed by Alexey Proskuryakov.
+
+ [XHR] Cross-Origin synchronous request with credential raises NETWORK_ERR
+ https://bugs.webkit.org/show_bug.cgi?id=37781
+ <rdar://problem/7905150>
+
+ Tests: http/tests/xmlhttprequest/access-control-preflight-credential-async.html
+ http/tests/xmlhttprequest/access-control-preflight-credential-sync.html
+
+ Rolling the patch in as I could not reproduce Qt results locally.
+
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::DocumentThreadableLoader): Now we remove the
+ credential from the request here to avoid forgetting to do so in the different code path.
+ (WebCore::DocumentThreadableLoader::makeSimpleCrossOriginAccessRequest): Just add the
+ "Origin" header.
+ (WebCore::DocumentThreadableLoader::loadRequest): Check here the the credential have
+ been removed so that we don't leak them. Also tweaked a comment to make it clear that
+ the URL check has issue when credential is involved.
+
+2010-05-10 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Darin Adler.
+
+ Fix for https://bugs.webkit.org/show_bug.cgi?id=38583
+ <rdar://problem/7948784> Crash in Element::normalizeAttributes.
+
+ Test: fast/dom/Element/normalize-crash.html
+
+ * dom/Element.cpp:
+ (WebCore::Element::normalizeAttributes): Copy attributes to a vector
+ before iterating.
+ * dom/NamedAttrMap.cpp:
+ (WebCore::NamedNodeMap::copyAttributesToVector): Added.
+ * dom/NamedAttrMap.h:
+
+2010-05-10 Alexey Proskuryakov <ap at apple.com>
+
+ Reviewed by Darin Adler.
+
+ Based on a patch by Eric Seidel.
+
+ https://bugs.webkit.org/show_bug.cgi?id=28697
+ <rdar://problem/7946578> WebKit crash on WebCore::Node::nodeIndex()
+
+ It's not OK to call ContainerNode::willRemoveChild() in a loop, because Range code assumes
+ that it can adjust start and end position to any node except for the one being removed -
+ so these notifications cannot be batched.
+
+ Test: fast/dom/Range/remove-all-children-crash.html
+
+ * dom/ContainerNode.cpp:
+ (WebCore::willRemoveChild): Removed unused ExceptionCode.
+ (WebCore::willRemoveChildren): New function, used in removeChildren() case.
+ (WebCore::ContainerNode::removeChild): ExceptionCode return was always 0, don't bother with it.
+ (WebCore::ContainerNode::removeChildren): Call willRemoveChildrenFromNode.
+ (WebCore::dispatchChildRemovalEvents): Moved some logic out into willRemoveChildrenFromNode
+ and willRemoveChild.
+
+ * dom/Document.cpp:
+ (WebCore::Document::nodeChildrenWillBeRemoved): New function, used in removeChildren() case.
+
+ * dom/Document.h:
+ (WebCore::Document::nodeChildrenWillBeRemoved): New function, used in removeChildren() case.
+
+ * dom/Range.h:
+ * dom/Range.cpp:
+ (WebCore::boundaryNodeChildrenWillBeRemoved): New function, used in removeChildren() case.
+ (WebCore::Range::nodeChildrenWillBeRemoved): Ditto.
+
+2010-04-20 Justin Schuh <jschuh at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Invalid cast due to <video> inside <foreignObject> inside <svg> inside <img>
+ https://bugs.webkit.org/show_bug.cgi?id=37331
+
+ Added a setting to enable/disable media per-page and have the SVGImage
+ disable media for its dummy page. Also found and fixed a related bad
+ cast in the V8 bindings (JSC had a custom wrapper for this already).
+
+ Tests: media/svg-as-image-with-media-blocked.html
+
+ * dom/make_names.pl: Added media enabled check and V8 cast wrapper
+ * page/Settings.cpp: Added m_isMediaEnabled (defaults to true)
+ (WebCore::Settings::Settings):
+ (WebCore::Settings::setMediaEnabled):
+ * page/Settings.h:
+ (WebCore::Settings::isMediaEnabled):
+ * svg/graphics/SVGImage.cpp: Disables media in dummy page
+ (WebCore::SVGImage::dataChanged):
+
+2010-04-02 Justin Schuh <jschuh at chromium.org>
+
+ Reviewed by Alexey Proskuryakov.
+
+ XHR allows arbitrary XSRF across domains
+ https://bugs.webkit.org/show_bug.cgi?id=36843
+
+ Added a one-line change to prevent bypassing the XDC check on
+ synchronous preflighted requests. Added layout tests to cover
+ variations of this problem.
+
+ Tests: http/tests/xmlhttprequest/access-control-preflight-async-header-denied.html
+ http/tests/xmlhttprequest/access-control-preflight-async-method-denied.html
+ http/tests/xmlhttprequest/access-control-preflight-sync-header-denied.html
+ http/tests/xmlhttprequest/access-control-preflight-sync-method-denied.html
+
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::preflightFailure):
+
+2010-05-05 Alexey Proskuryakov <ap at apple.com>
+
+ Reviewed by Adele Peterson.
+
+ https://bugs.webkit.org/show_bug.cgi?id=26824
+ <rdar://problem/7018610> EventHandler can operate on a wrong frame if focus changes during
+ keyboard event dispatch.
+
+ EventHandler object is tied to a frame, so it's wrong for it to continue processing a keyboard
+ event if focused frame changes between keydown and keypress.
+
+ * manual-tests/focus-change-between-key-events.html: Added.
+
+ * page/EventHandler.cpp: (WebCore::EventHandler::keyEvent): Bail out early if focused frame
+ changes while dispatching keydown. Also made similar changes for Windows to maintain matching
+ behavior, even though EventHandler was re-entered anyway due to WM_KEYDOWN and WM_CHAR being
+ separate events.
+
+2010-05-03 Abhishek Arya <inferno at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Add support for controlling clipboard access from javascript.
+ Clipboard access from javascript is disabled by default.
+ https://bugs.webkit.org/show_bug.cgi?id=27751
+
+ Test: editing/execCommand/clipboard-access.html
+
+ * WebCore.base.exp:
+ * editing/EditorCommand.cpp:
+ (WebCore::supportedCopyCut):
+ (WebCore::supportedPaste):
+ (WebCore::createCommandMap):
+ * page/Settings.cpp:
+ (WebCore::Settings::Settings):
+ (WebCore::Settings::setJavaScriptCanAccessClipboard):
+ * page/Settings.h:
+ (WebCore::Settings::javaScriptCanAccessClipboard):
+
+2010-05-05 Alexey Proskuryakov <ap at apple.com>
+
+ Reviewed by Darin Adler.
+
+ https://bugs.webkit.org/show_bug.cgi?id=38260
+ <rdar://problem/7917548> Fix whitespace removing in deprecatedParseURL().
+
+ Broken all the way since r4 (yes, that's a revision number).
+
+ Test: http/tests/security/xss-DENIED-javascript-with-spaces.html
+
+ * css/CSSHelper.cpp: (WebCore::deprecatedParseURL): Fixed loop conditions for remaining length.
+
+2010-04-14 Justin Schuh <jschuh at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Javascript URL can be set as iframe.src via multiple DOM aliases
+ https://bugs.webkit.org/show_bug.cgi?id=37031
+
+ Moved frame/iframe checks from Attr to Node on inherited members.
+ Node child manipulation methods now return NOT_SUPPORTED_ERR if used
+ on a frame/iframe src attribute.
+ NamedNodeMap set methods now perform frame/iframe src checks.
+ Moved allowSettingSrcToJavascriptURL static helper function from
+ JSElementCustom.cpp to exported function in JSDOMBinding.h.
+
+ * bindings/js/JSAttrCustom.cpp:
+ (WebCore::JSAttr::setValue):
+ * bindings/js/JSDOMBinding.cpp:
+ (WebCore::allowSettingSrcToJavascriptURL):
+ * bindings/js/JSDOMBinding.h:
+ * bindings/js/JSElementCustom.cpp:
+ * bindings/js/JSNamedNodeMapCustom.cpp:
+ (WebCore::JSNamedNodeMap::setNamedItem):
+ (WebCore::JSNamedNodeMap::setNamedItemNS):
+ * bindings/js/JSNodeCustom.cpp:
+ (WebCore::isAttrFrameSrc):
+ (WebCore::JSNode::setNodeValue):
+ (WebCore::JSNode::setTextContent):
+ (WebCore::JSNode::insertBefore):
+ (WebCore::JSNode::replaceChild):
+ (WebCore::JSNode::removeChild):
+ (WebCore::JSNode::appendChild):
+ * bindings/v8/custom/V8AttrCustom.cpp:
+ * bindings/v8/custom/V8NamedNodeMapCustom.cpp:
+ (WebCore::V8NamedNodeMap::setNamedItemNSCallback):
+ (WebCore::V8NamedNodeMap::setNamedItemCallback):
+ (WebCore::toV8):
+ * bindings/v8/custom/V8NodeCustom.cpp:
+ (WebCore::isFrameSrc):
+ (WebCore::V8Node::textContentAccessorSetter):
+ (WebCore::V8Node::nodeValueAccessorSetter):
+ (WebCore::V8Node::insertBeforeCallback):
+ (WebCore::V8Node::replaceChildCallback):
+ (WebCore::V8Node::removeChildCallback):
+ (WebCore::V8Node::appendChildCallback):
+ * dom/Attr.idl:
+ * dom/NamedNodeMap.idl:
+ * dom/Node.idl:
+
+2010-03-26 Justin Schuh <jschuh at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Security: iFrame.src accepts JavaScript URL via nodeValue or textContent
+ https://bugs.webkit.org/show_bug.cgi?id=36502
+
+ Overrode inherited nodeValue and textContent in Attr.idl so they proxy
+ to value, which performs a security check.
+
+ Test: http/tests/security/xss-DENIED-iframe-src-alias.html
+
+ * bindings/js/JSAttrCustom.cpp:
+ (WebCore::JSAttr::nodeValue):
+ (WebCore::JSAttr::setNodeValue):
+ (WebCore::JSAttr::textContent):
+ (WebCore::JSAttr::setTextContent):
+ * bindings/v8/custom/V8AttrCustom.cpp:
+ (WebCore::V8Attr::nodeValueAccessorSetter):
+ (WebCore::V8Attr::nodeValueAccessorGetter):
+ (WebCore::V8Attr::textContentAccessorSetter):
+ (WebCore::V8Attr::textContentAccessorGetter):
+ * dom/Attr.idl:
+
+2010-04-23 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Simon Fraser.
+
+ <rdar://problem/7898436> :after content is duplicated
+
+ Test: fast/css-generated-content/after-duplicated-after-split.html
+
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::splitInlines): Pass the correct owner of the child list.
+
+2010-03-30 Chris Evans <cevans at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Taint the canvas if an SVG-derived pattern is rendered into it.
+
+ https://bugs.webkit.org/show_bug.cgi?id=36838
+
+ Test: fast/canvas/svg-taint.html
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::createPattern):
+ Take into account the image's hasSingleSecurityOrigin() property.
+
+2010-03-22 Darin Fisher <darin at chromium.org>
+
+ Reviewed by Brady Eidson.
+
+ HistoryController::replaceState() should modify m_currentItem
+ instead of the current HistoryItem of the BackForwardList.
+
+ https://bugs.webkit.org/show_bug.cgi?id=36435
+
+ Test: fast/loader/stateobjects/replacestate-in-iframe.html
+
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::replaceState):
+
+2010-03-18 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Darin Adler.
+
+ <rdar://problem/7761400> Rework the fix for
+ https://bugs.webkit.org/show_bug.cgi?id=18722
+
+ Test: fast/dynamic/float-remove-above-line-2.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::removeFloatingObject): Treat 0- and less-than-0-height floats
+ as having a height of 1 so that they intersect with the line they originate on.
+ (WebCore::RenderBlock::clearFloats): Use numeric_limits.
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlock::layoutInlineChildren): Removed the intersection checks here,
+ so that a float is always included in the float list of the line it originates on, even
+ if it does not intersect that line. This ensures that every float is accounted for, which
+ is necessary during incremental layout when adding floats from clean lines.
+
+2010-03-19 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Dan Bernstein.
+
+ WebCore::RenderButton::styleDidChange ReadAV at NULL (6739b7fe455ecb54a6812c0866c3b47c)
+ https://bugs.webkit.org/show_bug.cgi?id=34641
+
+ Don't dig into buttons and menu lists when finding which element
+ should be modified by :first-letter pseudo class. Even before
+ this change, we didn't dig into inline buttons and menu lists as
+ they are replaced so this issue wasn't found long time.
+
+ Test: fast/css/first-letter-block-form-controls-crash.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::updateFirstLetter):
+
+2010-03-18 Darin Adler <darin at apple.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Remove Geolocation.lastPosition, no longer in the spec.
+ https://bugs.webkit.org/show_bug.cgi?id=36255
+ rdar://problem/7746357
+
+ * WebCore.base.exp: Updated since Geolocation's destructor is now non-virtual.
+
+ * page/Geolocation.cpp:
+ (WebCore::Geolocation::lastPosition): Add an assertion; it's only legal to
+ call this if access to the location is allowed.
+
+ * page/Geolocation.h: Removed unneeded includes. Made destructor non-virtual,
+ although it will still be virtual if any of the base classes have a virtual
+ destructor. Made lastPosition, isAllowed, and isDenied functions private.
+ Removed unused suspend, resume, setShouldClearCache, shouldClearCache,
+ and frame functions.
+
+ * page/Geolocation.idl: Removed lastPosition read-only attribute. No longer in
+ the Geolocation specification.
+
+2010-07-09 Gustavo Noronha Silva <gns at gnome.org>
+
+ Reviewed by NOBODY (OOPS!).
+
+ [GTK] Crashes when going back with page cache in unknown circunstances
+ https://bugs.webkit.org/show_bug.cgi?id=41710
+
+ Could not yet find a way to reproduce this in a layout test. The
+ issue is document being NULL, so this NULL-check should be enough
+ to get rid of the crash.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::sendScrollEvent):
+
+2010-07-07 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Scrollbars sometimes go dead and stop scrolling the view
+ https://bugs.webkit.org/show_bug.cgi?id=41711
+
+ Rework the setGtkAdjustment function slightly, make it have an
+ early return, and be more readable.
+
+ * platform/gtk/ScrollViewGtk.cpp:
+ (WebCore::ScrollView::setGtkAdjustments):
+
+2010-07-06 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Unreviewed.
+
+ Fixes regression on API test by disabling the scrollbars before
+ configuring the adjustments.
+
+ * platform/gtk/ScrollViewGtk.cpp:
+ (WebCore::ScrollView::setGtkAdjustments):
+
+2010-07-06 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Scrollbars sometimes go dead and stop scrolling the view
+ https://bugs.webkit.org/show_bug.cgi?id=41711
+
+ Fixes GtkScrolledWindow scrollbars not actually scrolling the page
+ in certain conditions. No tests because it is hard to reproduce,
+ and depends on interaction with a widget that is outside of the
+ WebView, which is tricky.
+
+ * platform/gtk/ScrollViewGtk.cpp:
+ (WebCore::ScrollView::setGtkAdjustments):
+
+2010-07-06 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Rubber-stamped by Xan Lopez.
+
+ Crash when hitting back on some pages
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=575236
+
+ Also NULL-check document, in hopes of fixing this hard to
+ reproduce crash that we are getting reported quite a bit.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::windowClipRect):
+
+2010-06-01 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Double clicks cause three button press events
+ https://bugs.webkit.org/show_bug.cgi?id=38853
+
+ Add GOwnPtr wrapper for GdkEvent and expose a setter for
+ PlatformMouseEvent::m_clickCount.
+
+ * GNUmakefile.am: Add GOwnPtrGtk.{cpp,h} to the sources list.
+ * platform/PlatformMouseEvent.h:
+ (WebCore::PlatformMouseEvent::setClickCount): Added.
+ * platform/gtk/GOwnPtrGtk.cpp: Added.
+ (WTF::GdkEvent):
+ * platform/gtk/GOwnPtrGtk.h: Added.
+
+2010-05-22 Yong Li <yoli at rim.com>
+
+ Reviewed by Darin Adler.
+
+ Fix a crash when XHTMLMP is enabled. The frame pointer in Document
+ ctor can be null.
+ https://bugs.webkit.org/show_bug.cgi?id=39448
+
+ No new tests because it is obvious and it must be reproduced with
+ XHTMLMP enabled.
+
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+
+2010-05-22 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] webkit_web_view_drag_end should call EventHandler::dragSourceEndedAt
+ https://bugs.webkit.org/show_bug.cgi?id=39465
+
+ Added a helper function for converting a GDK action bitmask into a DragOperation bitmask.
+
+ No new tests as behavior has not changed.
+
+ * platform/gtk/ClipboardUtilitiesGtk.cpp:
+ (WebCore::gdkDragActionToDragOperation): Added.
+ * platform/gtk/ClipboardUtilitiesGtk.h:
+
+2010-05-22 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] WebKit/gtk/WebCoreSupport/DragClientGtk::startDrag should use the Clipboard::sourceOperation
+ https://bugs.webkit.org/show_bug.cgi?id=39459
+
+ Add ClipboardUtilitiesGtk, a container for GTK+/WebCore clipboard utility functions.
+ Initially add a function which converts a WebCore::DragOperation to a bitmask of
+ GdkDragActions.
+
+ No new tests, because behavior has not changed.
+
+ * GNUmakefile.am:
+ * platform/gtk/ClipboardUtilitiesGtk.cpp: Added.
+ (WebCore::dragOperationToGdkDragActions): Added.
+ * platform/gtk/ClipboardUtilitiesGtk.h: Added.
+
+2010-05-18 Tony Chang <tony at chromium.org>
+
+ Reviewed by Ojan Vafai.
+
+ REGRESSION: crash in WebCore::CompositeEditCommand::splitTreeToNode when indenting in an empty li
+ https://bugs.webkit.org/show_bug.cgi?id=38232
+
+ Test: editing/execCommand/crash-indenting-list-item.html
+
+ * editing/IndentOutdentCommand.cpp:
+ (WebCore::IndentOutdentCommand::tryIndentingAsListItem):
+ (WebCore::IndentOutdentCommand::indentIntoBlockquote):
+
+2010-05-17 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Rubber-stamped by Xan Lopez.
+
+ Build fix. Remove bashism from build system.
+
+ * GNUmakefile.am:
+
+2010-05-13 Tony Chang <tony at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ REGRESSION: Crash by pasting to a textarea with white-space:nowrap
+ https://bugs.webkit.org/show_bug.cgi?id=38992
+
+ Test: editing/pasteboard/paste-plaintext-nowrap.html
+
+ * editing/InsertParagraphSeparatorCommand.cpp:
+ (WebCore::highestVisuallyEquivalentDivBelowRoot):
+ (WebCore::InsertParagraphSeparatorCommand::doApply):
+
+2010-05-15 Andrei Bucur <abucur at adobe.com>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Functions using the cairo_pattern_t object returned by
+ Pattern::createPlatformPattern sould destroy it after the painting
+ operation. Failing to do so causes memory leaks.
+
+ Test: No test was added because the patch adds no new functionality.
+ It just completes the normal life cycle of a cairo_pattern_t object.
+
+ * platform/graphics/cairo/FontCairo.cpp:
+ (WebCore::Font::drawGlyphs):
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::setPlatformFill):
+ (WebCore::setPlatformStroke):
+
+2010-05-15 Joanmarie Diggs <joanmarie.diggs at gmail.com>
+
+ Reviewed by Xan Lopez.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30500
+ [Gtk] Find a way for WebKit to "announce" itself so that ATs can readily distinguish it from true Gtk/Gail
+
+ The "announcement" is now made in the form of an object attribute
+ associated with the AtkObject.
+
+ * accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:
+ (webkit_accessible_get_attributes):
+
+2010-05-14 Adele Peterson <adele at apple.com>
+
+ Reviewed by Dave Hyatt.
+
+ Fix for https://bugs.webkit.org/show_bug.cgi?id=39095
+ <rdar://problem/7984158> REGRESSION (r53085): Infinite recursion in Position::getInlineBoxAndOffset when changing writing direction to right-to-left
+
+ Test: editing/selection/applystyle-to-inline-inside-block.html
+
+ * dom/Position.cpp: (WebCore::Position::getInlineBoxAndOffset): Now that this function correctly goes in and out of editable areas by calling
+ downstreamIgnoringEditingBoundaries and upstreamIgnoringEditingBoundaries for blocks (added in r58665), we no longer need a special case to
+ jump out to the parent when we hit an inline (which was added in r53085 when this issue was introduced).
+
+2010-05-13 Alejandro G. Castro <alex at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ In case there is no expose event we render the theme in a pixmap
+ and copy it to the cairo context. This is slow but it is used just
+ in case we are printing nowadays.
+
+ [GTK] Theme does not render when printing
+ https://bugs.webkit.org/show_bug.cgi?id=38896
+
+ * platform/gtk/RenderThemeGtk.cpp:
+ (WebCore::paintMozillaGtkWidget):
+
+2010-05-10 Philippe Normand <pnormand at igalia.com>
+
+ Reviewed by David Levin.
+
+ [GStreamer] incoherent #ifdef in GOwnPtrGStreamer.h
+ https://bugs.webkit.org/show_bug.cgi?id=38839
+
+ Fixed #ifdef/curly braces coherence.
+
+ * platform/graphics/gstreamer/GOwnPtrGStreamer.cpp:
+ (WTF::GstElement):
+
+2010-05-10 Philippe Normand <pnormand at igalia.com>
+
+ Reviewed by Dirk Schulze.
+
+ [GStreamer] un-needed cairo.h include
+ https://bugs.webkit.org/show_bug.cgi?id=38837
+
+ Cairo not used in the sink anymore. So it's not needed to include
+ the header.
+
+ * platform/graphics/gstreamer/VideoSinkGStreamer.h:
+
+2010-05-11 Xan Lopez <xlopez at igalia.com>
+
+ Reviewed by Gustavo Noronha.
+
+ [gtk] critical warning in soup_message_set_first_party() when cancelling a navigation
+ https://bugs.webkit.org/show_bug.cgi?id=38653
+
+ Check if willSendRequest cancelled the request before setting the
+ first party for the cookies in the message, otherwise we'll get a
+ critical warning.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::restartedCallback):
+
+2010-05-07 Zoltan Herczeg <zherczeg at webkit.org>
+
+ Reviewed by Dirk Schulze
+
+ Fixed the inverse function of f(x) = ((x + 0.055) / 1.055) ^ 2.4
+ https://bugs.webkit.org/show_bug.cgi?id=38735
+
+ It is ((x ^ (1 / 2.4)) * 1.055) - 0.055
+
+ Chromium pixel tests cover the issue.
+
+ * platform/graphics/ImageBuffer.cpp:
+ (WebCore::ImageBuffer::transformColorSpace):
+
+2010-05-07 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ https://bugs.webkit.org/show_bug.cgi?id=38769
+ ClipboardGtk should write the URL label in the text portion of the DataObject
+
+ No tests as this code path is currently unused in the GTK+ port.
+
+ * platform/gtk/ClipboardGtk.cpp:
+ (WebCore::ClipboardGtk::writeURL): Write the label to the text portion of the DataObject, instead of the URL.
+
+2010-05-07 Ben Murdoch <benm at google.com>
+
+ Reviewed by Darin Adler.
+
+ Potential crash in EventHandler::handleTouchEvent
+ https://bugs.webkit.org/show_bug.cgi?id=38646
+
+ Fix a ref counting bug that can cause a crash if the m_originatingouchPointTargets
+ hashmap holds the last ref to an EventTarget when the user lifts their finger.
+
+ This is very hard to reproduce in a consistent way and clearly a
+ simple logic error in the code, therefore no new tests.
+
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleTouchEvent): Don't let the RefPtr we get back from
+ the hasmap go out of scope so soon as it could delete the wrapped ptr if the
+ hashmap held the last ref (and we use the raw ptr that the RefPtr
+ wraps later in the WebCore::Touch constructor).
+
+2010-05-07 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Rubber-stamped by Kenneth Rohde Christiansen.
+
+ [GTK] Fails to build on GTK+ < 2.14
+ https://bugs.webkit.org/show_bug.cgi?id=38746
+
+ Build fix only. Do basically the same as gtk_adjustment_configure
+ would do if we are bellow GTK+ 2.14.
+
+ * platform/gtk/ScrollViewGtk.cpp:
+ (WebCore::AdjustmentConfigure):
+
+2010-05-07 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
+
+ Rubber-stamped by Xan Lopez.
+
+ Crash with MgOpenModerna font, with non-UTF-8 character
+ https://bugs.webkit.org/show_bug.cgi?id=37795
+
+ NULL-check the font platform data, for now, to avoid the crash.
+
+ Could not yet figure out a way to get a test written that does not
+ involve adding the font to the tree, but there are doubts about
+ licensing.
+
+ * platform/graphics/cairo/FontCacheCairo.cpp:
+ (WebCore::FontCache::getFontDataForCharacters):
+
+2010-05-06 Martin Robinson <mrobinson at webkit.org>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ [GTK] Enable DOM clipboard and drag-and-drop access
+ https://bugs.webkit.org/show_bug.cgi?id=30623
+
+ Convert dragging portion of drag-and-drop to use DataObjectGtk.
+
+ No new tests, because functionality has not changed.
+
+ * page/gtk/EventHandlerGtk.cpp:
+ (WebCore::EventHandler::createDraggingClipboard): Pass the DataObjectGtk as a parameter here.
+ * platform/gtk/ClipboardGtk.h:
+ (WebCore::ClipboardGtk::create): Take the DataObject as a parameter instead of creating it here.
+ (WebCore::ClipboardGtk::helper): Added.
+ (WebCore::ClipboardGtk::dataObject): Added.
+ * platform/gtk/PasteboardHelper.h: Make targetListForDataObject a public method.
+
2010-05-07 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Rubber-stamped by Kenneth Rohde Christiansen.
--- WebCore/GNUmakefile.am
+++ WebCore/GNUmakefile.am
@@ -2038,6 +2038,8 @@
WebCore/platform/graphics/gtk/IntRectGtk.cpp \
WebCore/platform/gtk/ClipboardGtk.cpp \
WebCore/platform/gtk/ClipboardGtk.h \
+ WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp \
+ WebCore/platform/gtk/ClipboardUtilitiesGtk.h \
WebCore/platform/gtk/ContextMenuGtk.cpp \
WebCore/platform/gtk/ContextMenuItemGtk.cpp \
WebCore/platform/gtk/CursorGtk.cpp \
@@ -2049,6 +2051,8 @@
WebCore/platform/gtk/EventLoopGtk.cpp \
WebCore/platform/gtk/FileChooserGtk.cpp \
WebCore/platform/gtk/FileSystemGtk.cpp \
+ WebCore/platform/gtk/GOwnPtrGtk.cpp \
+ WebCore/platform/gtk/GOwnPtrGtk.h \
WebCore/platform/gtk/GRefPtrGtk.cpp \
WebCore/platform/gtk/GRefPtrGtk.h \
WebCore/platform/gtk/GtkPluginWidget.cpp \
@@ -3768,7 +3772,9 @@
webinspectordir = ${datadir}/webkit-1.0/webinspector
dist_webinspector_DATA = \
$(WebCore)/English.lproj/localizedStrings.js \
- $(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
+ $(shell ls $(WebCore)/inspector/front-end/*.js) \
+ $(shell ls $(WebCore)/inspector/front-end/*.html) \
+ $(shell ls $(WebCore)/inspector/front-end/*.css)
webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
dist_webinspectorimages_DATA = \
--- WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -328,6 +328,8 @@
{
AtkAttributeSet* attributeSet = 0;
+ attributeSet = addAttributeToSet(attributeSet, "toolkit", "WebKitGtk");
+
int headingLevel = core(object)->headingLevel();
if (headingLevel) {
String value = String::number(headingLevel);
--- WebCore/bindings/js/JSAttrCustom.cpp
+++ WebCore/bindings/js/JSAttrCustom.cpp
@@ -33,6 +33,7 @@
#include "Document.h"
#include "HTMLFrameElementBase.h"
#include "HTMLNames.h"
+#include "JSDOMBinding.h"
using namespace JSC;
@@ -46,13 +47,8 @@
String attrValue = valueToStringWithNullCheck(exec, value);
Element* ownerElement = imp->ownerElement();
- if (ownerElement && (ownerElement->hasTagName(iframeTag) || ownerElement->hasTagName(frameTag))) {
- if (equalIgnoringCase(imp->name(), "src") && protocolIsJavaScript(deprecatedParseURL(attrValue))) {
- Document* contentDocument = static_cast<HTMLFrameElementBase*>(ownerElement)->contentDocument();
- if (contentDocument && !checkNodeSecurity(exec, contentDocument))
- return;
- }
- }
+ if (ownerElement && !allowSettingSrcToJavascriptURL(exec, ownerElement, imp->name(), attrValue))
+ return;
ExceptionCode ec = 0;
imp->setValue(attrValue, ec);
--- WebCore/bindings/js/JSDOMBinding.cpp
+++ WebCore/bindings/js/JSDOMBinding.cpp
@@ -24,6 +24,7 @@
#include "debugger/DebuggerCallFrame.h"
#include "ActiveDOMObject.h"
+#include "CSSHelper.h"
#include "DOMCoreException.h"
#include "DOMObjectHashTableMap.h"
#include "Document.h"
@@ -33,6 +34,7 @@
#include "Frame.h"
#include "HTMLAudioElement.h"
#include "HTMLCanvasElement.h"
+#include "HTMLFrameElementBase.h"
#include "HTMLImageElement.h"
#include "HTMLNames.h"
#include "HTMLScriptElement.h"
@@ -630,6 +632,16 @@
return lexicalFrame && lexicalFrame->loader()->shouldAllowNavigation(frame);
}
+bool allowSettingSrcToJavascriptURL(ExecState* exec, Element* element, const String& name, const String& value)
+{
+ if ((element->hasTagName(iframeTag) || element->hasTagName(frameTag)) && equalIgnoringCase(name, "src") && protocolIsJavaScript(deprecatedParseURL(value))) {
+ Document* contentDocument = static_cast<HTMLFrameElementBase*>(element)->contentDocument();
+ if (contentDocument && !checkNodeSecurity(exec, contentDocument))
+ return false;
+ }
+ return true;
+}
+
void printErrorMessageForFrame(Frame* frame, const String& message)
{
if (!frame)
--- WebCore/bindings/js/JSDOMBinding.h
+++ WebCore/bindings/js/JSDOMBinding.h
@@ -301,6 +301,8 @@
bool allowsAccessFromFrame(JSC::ExecState*, Frame*);
bool allowsAccessFromFrame(JSC::ExecState*, Frame*, String& message);
bool shouldAllowNavigation(JSC::ExecState*, Frame*);
+ bool allowSettingSrcToJavascriptURL(JSC::ExecState*, Element*, const String&, const String&);
+
void printErrorMessageForFrame(Frame*, const String& message);
JSC::JSValue objectToStringFunctionGetter(JSC::ExecState*, JSC::JSValue, const JSC::Identifier& propertyName);
--- WebCore/bindings/js/JSElementCustom.cpp
+++ WebCore/bindings/js/JSElementCustom.cpp
@@ -36,6 +36,7 @@
#include "HTMLFrameElementBase.h"
#include "HTMLNames.h"
#include "JSAttr.h"
+#include "JSDOMBinding.h"
#include "JSHTMLElementWrapperFactory.h"
#include "JSNodeList.h"
#include "NodeList.h"
@@ -63,16 +64,6 @@
markDOMObjectWrapper(markStack, globalData, static_cast<StyledElement*>(element)->inlineStyleDecl());
}
-static inline bool allowSettingSrcToJavascriptURL(ExecState* exec, Element* element, const String& name, const String& value)
-{
- if ((element->hasTagName(iframeTag) || element->hasTagName(frameTag)) && equalIgnoringCase(name, "src") && protocolIsJavaScript(deprecatedParseURL(value))) {
- Document* contentDocument = static_cast<HTMLFrameElementBase*>(element)->contentDocument();
- if (contentDocument && !checkNodeSecurity(exec, contentDocument))
- return false;
- }
- return true;
-}
-
JSValue JSElement::setAttribute(ExecState* exec, const ArgList& args)
{
ExceptionCode ec = 0;
--- WebCore/bindings/js/JSNamedNodeMapCustom.cpp
+++ WebCore/bindings/js/JSNamedNodeMapCustom.cpp
@@ -35,6 +35,38 @@
namespace WebCore {
+JSValue JSNamedNodeMap::setNamedItem(ExecState* exec, const ArgList& args)
+{
+ NamedNodeMap* imp = static_cast<NamedNodeMap*>(impl());
+ ExceptionCode ec = 0;
+ Node* newNode = toNode(args.at(0));
+
+ if (newNode && newNode->nodeType() == Node::ATTRIBUTE_NODE && imp->element()) {
+ if (!allowSettingSrcToJavascriptURL(exec, imp->element(), newNode->nodeName(), newNode->nodeValue()))
+ return jsNull();
+ }
+
+ JSValue result = toJS(exec, globalObject(), WTF::getPtr(imp->setNamedItem(newNode, ec)));
+ setDOMException(exec, ec);
+ return result;
+}
+
+JSValue JSNamedNodeMap::setNamedItemNS(ExecState* exec, const ArgList& args)
+{
+ NamedNodeMap* imp = static_cast<NamedNodeMap*>(impl());
+ ExceptionCode ec = 0;
+ Node* newNode = toNode(args.at(0));
+
+ if (newNode && newNode->nodeType() == Node::ATTRIBUTE_NODE && imp->element()) {
+ if (!allowSettingSrcToJavascriptURL(exec, imp->element(), newNode->nodeName(), newNode->nodeValue()))
+ return jsNull();
+ }
+
+ JSValue result = toJS(exec, globalObject(), WTF::getPtr(imp->setNamedItemNS(newNode, ec)));
+ setDOMException(exec, ec);
+ return result;
+}
+
bool JSNamedNodeMap::canGetItemsForName(ExecState*, NamedNodeMap* impl, const Identifier& propertyName)
{
return impl->getNamedItem(propertyName);
--- WebCore/bindings/js/JSNodeCustom.cpp
+++ WebCore/bindings/js/JSNodeCustom.cpp
@@ -38,6 +38,7 @@
#include "JSAttr.h"
#include "JSCDATASection.h"
#include "JSComment.h"
+#include "JSDOMBinding.h"
#include "JSDocument.h"
#include "JSDocumentFragment.h"
#include "JSDocumentType.h"
@@ -66,12 +67,53 @@
namespace WebCore {
-typedef int ExpectionCode;
+static inline bool isAttrFrameSrc(Element *element, const String& name)
+{
+ return element && (element->hasTagName(HTMLNames::iframeTag) || element->hasTagName(HTMLNames::frameTag)) && equalIgnoringCase(name, "src");
+}
+
+void JSNode::setNodeValue(JSC::ExecState* exec, JSC::JSValue value)
+{
+ Node* imp = static_cast<Node*>(impl());
+ String nodeValue = valueToStringWithNullCheck(exec, value);
+
+ if (imp->nodeType() == Node::ATTRIBUTE_NODE) {
+ Element* ownerElement = static_cast<Attr*>(impl())->ownerElement();
+ if (ownerElement && !allowSettingSrcToJavascriptURL(exec, ownerElement, imp->nodeName(), nodeValue))
+ return;
+ }
+
+ ExceptionCode ec = 0;
+ imp->setNodeValue(nodeValue, ec);
+ setDOMException(exec, ec);
+}
+
+void JSNode::setTextContent(JSC::ExecState* exec, JSC::JSValue value)
+{
+ Node* imp = static_cast<Node*>(impl());
+ String nodeValue = valueToStringWithNullCheck(exec, value);
+
+ if (imp->nodeType() == Node::ATTRIBUTE_NODE) {
+ Element* ownerElement = static_cast<Attr*>(impl())->ownerElement();
+ if (ownerElement && !allowSettingSrcToJavascriptURL(exec, ownerElement, imp->nodeName(), nodeValue))
+ return;
+ }
+
+ ExceptionCode ec = 0;
+ imp->setTextContent(nodeValue, ec);
+ setDOMException(exec, ec);
+}
JSValue JSNode::insertBefore(ExecState* exec, const ArgList& args)
{
+ Node* imp = static_cast<Node*>(impl());
+ if (imp->nodeType() == Node::ATTRIBUTE_NODE && isAttrFrameSrc(static_cast<Attr*>(impl())->ownerElement(), imp->nodeName())) {
+ setDOMException(exec, NOT_SUPPORTED_ERR);
+ return jsNull();
+ }
+
ExceptionCode ec = 0;
- bool ok = impl()->insertBefore(toNode(args.at(0)), toNode(args.at(1)), ec, true);
+ bool ok = imp->insertBefore(toNode(args.at(0)), toNode(args.at(1)), ec, true);
setDOMException(exec, ec);
if (ok)
return args.at(0);
@@ -80,8 +122,14 @@
JSValue JSNode::replaceChild(ExecState* exec, const ArgList& args)
{
+ Node* imp = static_cast<Node*>(impl());
+ if (imp->nodeType() == Node::ATTRIBUTE_NODE && isAttrFrameSrc(static_cast<Attr*>(impl())->ownerElement(), imp->nodeName())) {
+ setDOMException(exec, NOT_SUPPORTED_ERR);
+ return jsNull();
+ }
+
ExceptionCode ec = 0;
- bool ok = impl()->replaceChild(toNode(args.at(0)), toNode(args.at(1)), ec, true);
+ bool ok = imp->replaceChild(toNode(args.at(0)), toNode(args.at(1)), ec, true);
setDOMException(exec, ec);
if (ok)
return args.at(1);
@@ -90,8 +138,14 @@
JSValue JSNode::removeChild(ExecState* exec, const ArgList& args)
{
+ Node* imp = static_cast<Node*>(impl());
+ if (imp->nodeType() == Node::ATTRIBUTE_NODE && isAttrFrameSrc(static_cast<Attr*>(impl())->ownerElement(), imp->nodeName())) {
+ setDOMException(exec, NOT_SUPPORTED_ERR);
+ return jsNull();
+ }
+
ExceptionCode ec = 0;
- bool ok = impl()->removeChild(toNode(args.at(0)), ec);
+ bool ok = imp->removeChild(toNode(args.at(0)), ec);
setDOMException(exec, ec);
if (ok)
return args.at(0);
@@ -100,8 +154,14 @@
JSValue JSNode::appendChild(ExecState* exec, const ArgList& args)
{
+ Node* imp = static_cast<Node*>(impl());
+ if (imp->nodeType() == Node::ATTRIBUTE_NODE && isAttrFrameSrc(static_cast<Attr*>(impl())->ownerElement(), imp->nodeName())) {
+ setDOMException(exec, NOT_SUPPORTED_ERR);
+ return jsNull();
+ }
+
ExceptionCode ec = 0;
- bool ok = impl()->appendChild(toNode(args.at(0)), ec, true);
+ bool ok = imp->appendChild(toNode(args.at(0)), ec, true);
setDOMException(exec, ec);
if (ok)
return args.at(0);
--- WebCore/css/CSSHelper.cpp
+++ WebCore/css/CSSHelper.cpp
@@ -36,7 +36,7 @@
int o = 0;
int l = i->length();
- while (o < l && (*i)[o] <= ' ') {
+ while (0 < l && (*i)[o] <= ' ') {
++o;
--l;
}
@@ -53,7 +53,7 @@
l -= 5;
}
- while (o < l && (*i)[o] <= ' ') {
+ while (0 < l && (*i)[o] <= ' ') {
++o;
--l;
}
@@ -65,7 +65,7 @@
l -= 2;
}
- while (o < l && (*i)[o] <= ' ') {
+ while (0 < l && (*i)[o] <= ' ') {
++o;
--l;
}
--- WebCore/dom/Attr.idl
+++ WebCore/dom/Attr.idl
@@ -28,7 +28,9 @@
// DOM Level 1
readonly attribute [ConvertNullStringTo=Null] DOMString name;
+
readonly attribute boolean specified;
+
attribute [ConvertNullStringTo=Null, ConvertNullToNullString, CustomSetter] DOMString value
setter raises(DOMException);
--- WebCore/dom/ContainerNode.cpp
+++ WebCore/dom/ContainerNode.cpp
@@ -292,19 +292,32 @@
Node::willRemove();
}
-static ExceptionCode willRemoveChild(Node *child)
+static void willRemoveChild(Node* child)
{
- ExceptionCode ec = 0;
+ // update auxiliary doc info (e.g. iterators) to note that node is being removed
+ child->document()->nodeWillBeRemoved(child);
+ child->document()->incDOMTreeVersion();
// fire removed from document mutation events.
dispatchChildRemovalEvents(child);
- if (ec)
- return ec;
if (child->attached())
child->willRemove();
-
- return 0;
+}
+
+static void willRemoveChildren(ContainerNode* container)
+{
+ container->document()->nodeChildrenWillBeRemoved(container);
+ container->document()->incDOMTreeVersion();
+
+ // FIXME: Adding new children from event handlers can cause an infinite loop here.
+ for (RefPtr<Node> child = container->firstChild(); child; child = child->nextSibling()) {
+ // fire removed from document mutation events.
+ dispatchChildRemovalEvents(child.get());
+
+ if (child->attached())
+ child->willRemove();
+ }
}
bool ContainerNode::removeChild(Node* oldChild, ExceptionCode& ec)
@@ -328,10 +341,7 @@
}
RefPtr<Node> child = oldChild;
-
- ec = willRemoveChild(child.get());
- if (ec)
- return false;
+ willRemoveChild(child.get());
// Mutation events might have moved this child into a different parent.
if (child->parentNode() != this) {
@@ -399,14 +409,12 @@
return false;
// The container node can be removed from event handlers.
- RefPtr<Node> protect(this);
-
+ RefPtr<ContainerNode> protect(this);
+
// Do any prep work needed before actually starting to detach
// and remove... e.g. stop loading frames, fire unload events.
- // FIXME: Adding new children from event handlers can cause an infinite loop here.
- for (RefPtr<Node> n = m_firstChild; n; n = n->nextSibling())
- willRemoveChild(n.get());
-
+ willRemoveChildren(protect.get());
+
// exclude this node when looking for removed focusedNode since only children will be removed
document()->removeFocusedNodeOfSubtree(this, true);
@@ -936,6 +944,8 @@
static void dispatchChildRemovalEvents(Node* child)
{
+ ASSERT(!eventDispatchForbidden());
+
#if ENABLE(INSPECTOR)
if (Page* page = child->document()->page()) {
if (InspectorController* inspectorController = page->inspectorController())
@@ -946,11 +956,6 @@
RefPtr<Node> c = child;
RefPtr<Document> document = child->document();
- // update auxiliary doc info (e.g. iterators) to note that node is being removed
- document->nodeWillBeRemoved(child);
-
- document->incDOMTreeVersion();
-
// dispatch pre-removal mutation events
if (c->parentNode() && document->hasListenerType(Document::DOMNODEREMOVED_LISTENER))
c->dispatchEvent(MutationEvent::create(eventNames().DOMNodeRemovedEvent, true, c->parentNode()));
--- WebCore/dom/Document.cpp
+++ WebCore/dom/Document.cpp
@@ -451,7 +451,7 @@
static int docID = 0;
m_docID = docID++;
#if ENABLE(XHTMLMP)
- m_shouldProcessNoScriptElement = m_frame->script()->canExecuteScripts(NotAboutToExecuteScript);
+ m_shouldProcessNoScriptElement = m_frame && m_frame->script()->canExecuteScripts(NotAboutToExecuteScript);
#endif
}
@@ -2879,6 +2879,28 @@
}
}
+void Document::nodeChildrenWillBeRemoved(ContainerNode* container)
+{
+ if (!disableRangeMutation(page())) {
+ HashSet<Range*>::const_iterator end = m_ranges.end();
+ for (HashSet<Range*>::const_iterator it = m_ranges.begin(); it != end; ++it)
+ (*it)->nodeChildrenWillBeRemoved(container);
+ }
+
+ HashSet<NodeIterator*>::const_iterator nodeIteratorsEnd = m_nodeIterators.end();
+ for (HashSet<NodeIterator*>::const_iterator it = m_nodeIterators.begin(); it != nodeIteratorsEnd; ++it) {
+ for (Node* n = container->firstChild(); n; n = n->nextSibling())
+ (*it)->nodeWillBeRemoved(n);
+ }
+
+ if (Frame* frame = this->frame()) {
+ for (Node* n = container->firstChild(); n; n = n->nextSibling()) {
+ frame->selection()->nodeWillBeRemoved(n);
+ frame->dragCaretController()->nodeWillBeRemoved(n);
+ }
+ }
+}
+
void Document::nodeWillBeRemoved(Node* n)
{
HashSet<NodeIterator*>::const_iterator nodeIteratorsEnd = m_nodeIterators.end();
--- WebCore/dom/Document.h
+++ WebCore/dom/Document.h
@@ -611,6 +611,9 @@
void detachRange(Range*);
void nodeChildrenChanged(ContainerNode*);
+ // nodeChildrenWillBeRemoved is used when removing all node children at once.
+ void nodeChildrenWillBeRemoved(ContainerNode*);
+ // nodeWillBeRemoved is only safe when removing one node at a time.
void nodeWillBeRemoved(Node*);
void textInserted(Node*, unsigned offset, unsigned length);
--- WebCore/dom/Element.cpp
+++ WebCore/dom/Element.cpp
@@ -938,7 +938,7 @@
newStyle->setChildrenAffectedByDirectAdjacentRules();
}
- if (ch != NoChange || pseudoStyleCacheIsInvalid(currentStyle.get(), newStyle.get())) {
+ if (ch != NoChange || pseudoStyleCacheIsInvalid(currentStyle.get(), newStyle.get()) || change == Force && renderer() && renderer()->requiresForcedStyleRecalcPropagation()) {
setRenderStyle(newStyle);
} else if (needsStyleRecalc() && (styleChangeType() != SyntheticStyleChange) && (document()->usesSiblingRules() || document()->usesDescendantRules())) {
// Although no change occurred, we use the new style so that the cousin style sharing code won't get
@@ -1430,9 +1430,15 @@
NamedNodeMap* attrs = attributes(true);
if (!attrs)
return;
- unsigned numAttrs = attrs->length();
- for (unsigned i = 0; i < numAttrs; i++) {
- if (Attr* attr = attrs->attributeItem(i)->attr())
+
+ if (attrs->isEmpty())
+ return;
+
+ Vector<RefPtr<Attribute> > attributeVector;
+ attrs->copyAttributesToVector(attributeVector);
+ size_t numAttrs = attributeVector.size();
+ for (size_t i = 0; i < numAttrs; ++i) {
+ if (Attr* attr = attributeVector[i]->attr())
attr->normalize();
}
}
--- WebCore/dom/NamedAttrMap.cpp
+++ WebCore/dom/NamedAttrMap.cpp
@@ -172,6 +172,11 @@
return m_attributes[index]->createAttrIfNeeded(m_element);
}
+void NamedNodeMap::copyAttributesToVector(Vector<RefPtr<Attribute> >& copy)
+{
+ copy = m_attributes;
+}
+
Attribute* NamedNodeMap::getAttributeItemSlowCase(const String& name, bool shouldIgnoreAttributeCase) const
{
unsigned len = length();
--- WebCore/dom/NamedAttrMap.h
+++ WebCore/dom/NamedAttrMap.h
@@ -72,6 +72,8 @@
Attribute* attributeItem(unsigned index) const { return m_attributes[index].get(); }
Attribute* getAttributeItem(const QualifiedName&) const;
+ void copyAttributesToVector(Vector<RefPtr<Attribute> >&);
+
void shrinkToLength() { m_attributes.shrinkCapacity(length()); }
void reserveInitialCapacity(unsigned capacity) { m_attributes.reserveInitialCapacity(capacity); }
--- WebCore/dom/NamedNodeMap.idl
+++ WebCore/dom/NamedNodeMap.idl
@@ -28,7 +28,7 @@
Node getNamedItem(in DOMString name);
- Node setNamedItem(in Node node)
+ [Custom] Node setNamedItem(in Node node)
raises(DOMException);
Node removeNamedItem(in DOMString name)
@@ -46,7 +46,7 @@
// FIXME: the implementation does take an exceptioncode parameter.
/*raises(DOMException)*/;
- Node setNamedItemNS(in Node node)
+ [Custom] Node setNamedItemNS(in Node node)
raises(DOMException);
[OldStyleObjC] Node removeNamedItemNS(in [ConvertNullToNullString] DOMString namespaceURI,
--- WebCore/dom/Node.idl
+++ WebCore/dom/Node.idl
@@ -51,7 +51,7 @@
readonly attribute [ConvertNullStringTo=Null] DOMString nodeName;
// FIXME: the spec says this can also raise on retrieval.
- attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString nodeValue
+ attribute [CustomSetter, ConvertNullStringTo=Null, ConvertNullToNullString] DOMString nodeValue
setter raises(DOMException);
readonly attribute unsigned short nodeType;
@@ -96,7 +96,7 @@
readonly attribute [ConvertNullStringTo=Null] DOMString baseURI;
// FIXME: the spec says this can also raise on retrieval.
- attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString textContent
+ attribute [CustomSetter, ConvertNullStringTo=Null, ConvertNullToNullString] DOMString textContent
setter raises(DOMException);
boolean isSameNode(in Node other);
--- WebCore/dom/Position.cpp
+++ WebCore/dom/Position.cpp
@@ -1018,10 +1018,6 @@
inlineBox = toRenderBox(renderer)->inlineBoxWrapper();
if (!inlineBox || (caretOffset > inlineBox->caretMinOffset() && caretOffset < inlineBox->caretMaxOffset()))
return;
- } else if (!node()->isLink() && node()->isContentEditable()) {
- Position pos = positionInParentBeforeNode(node()).upstream();
- pos.getInlineBoxAndOffset(DOWNSTREAM, primaryDirection, inlineBox, caretOffset);
- return;
}
} else {
RenderText* textRenderer = toRenderText(renderer);
--- WebCore/dom/Range.cpp
+++ WebCore/dom/Range.cpp
@@ -1716,6 +1716,31 @@
boundaryNodeChildrenChanged(m_end, container);
}
+static inline void boundaryNodeChildrenWillBeRemoved(RangeBoundaryPoint& boundary, ContainerNode* container)
+{
+ for (Node* nodeToBeRemoved = container->firstChild(); nodeToBeRemoved; nodeToBeRemoved = nodeToBeRemoved->nextSibling()) {
+ if (boundary.childBefore() == nodeToBeRemoved) {
+ boundary.setToStartOfNode(container);
+ return;
+ }
+
+ for (Node* n = boundary.container(); n; n = n->parentNode()) {
+ if (n == nodeToBeRemoved) {
+ boundary.setToStartOfNode(container);
+ return;
+ }
+ }
+ }
+}
+
+void Range::nodeChildrenWillBeRemoved(ContainerNode* container)
+{
+ ASSERT(container);
+ ASSERT(container->document() == m_ownerDocument);
+ boundaryNodeChildrenWillBeRemoved(m_start, container);
+ boundaryNodeChildrenWillBeRemoved(m_end, container);
+}
+
static inline void boundaryNodeWillBeRemoved(RangeBoundaryPoint& boundary, Node* nodeToBeRemoved)
{
if (boundary.childBefore() == nodeToBeRemoved) {
--- WebCore/dom/Range.h
+++ WebCore/dom/Range.h
@@ -111,6 +111,7 @@
void textQuads(Vector<FloatQuad>&, bool useSelectionHeight = false);
void nodeChildrenChanged(ContainerNode*);
+ void nodeChildrenWillBeRemoved(ContainerNode*);
void nodeWillBeRemoved(Node*);
void textInserted(Node*, unsigned offset, unsigned length);
--- WebCore/dom/make_names.pl
+++ WebCore/dom/make_names.pl
@@ -287,8 +287,10 @@
# Handle media elements.
if ($tags{$tagName}{wrapperOnlyIfMediaIsAvailable}) {
print F <<END
- if (!MediaPlayer::isAvailable())
+ Settings* settings = document->settings();
+ if (!MediaPlayer::isAvailable() || (settings && !settings->isMediaEnabled()))
return HTMLElement::create($constructorTagName, document);
+
END
;
}
@@ -638,7 +640,7 @@
print F <<END
#include <wtf/HashMap.h>
-#if ENABLE(DASHBOARD_SUPPORT)
+#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(VIDEO)
#include "Document.h"
#include "Settings.h"
#endif
@@ -839,7 +841,8 @@
print F <<END
static JSNode* create${JSInterfaceName}Wrapper(ExecState* exec, JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
{
- if (!MediaPlayer::isAvailable())
+ Settings* settings = element->document()->settings();
+ if (!MediaPlayer::isAvailable() || (settings && !settings->isMediaEnabled()))
return CREATE_DOM_NODE_WRAPPER(exec, globalObject, $parameters{namespace}Element, element.get());
return CREATE_DOM_NODE_WRAPPER(exec, globalObject, ${JSInterfaceName}, element.get());
}
@@ -857,14 +860,29 @@
;
}
} elsif ($wrapperFactoryType eq "V8") {
+ if ($tags{$tagName}{wrapperOnlyIfMediaIsAvailable}) {
+ print F <<END
+static v8::Handle<v8::Value> create${JSInterfaceName}Wrapper($parameters{namespace}Element* element)
+{
+ Settings* settings = element->document()->settings();
+ if (!MediaPlayer::isAvailable() || (settings && !settings->isMediaEnabled()))
+ return toV8(static_cast<$parameters{namespace}Element*>(element));
+ return toV8(static_cast<${JSInterfaceName}*>(element));
+}
+
+END
+;
+ } else {
print F <<END
static v8::Handle<v8::Value> create${JSInterfaceName}Wrapper($parameters{namespace}Element* element)
{
return toV8(static_cast<${JSInterfaceName}*>(element));
}
+
END
;
+ }
}
if ($conditional) {
@@ -895,7 +913,16 @@
printElementIncludes($F);
- print F "\n#include <wtf/StdLibExtras.h>\n\n";
+ print F <<END
+#include <wtf/StdLibExtras.h>
+
+#if ENABLE(VIDEO)
+#include "Document.h"
+#include "Settings.h"
+#endif
+
+END
+;
if ($wrapperFactoryType eq "JS") {
print F <<END
--- WebCore/editing/EditorCommand.cpp
+++ WebCore/editing/EditorCommand.cpp
@@ -1069,6 +1069,21 @@
return source == CommandFromMenuOrKeyBinding;
}
+static bool supportedCopyCut(Frame* frame, EditorCommandSource source)
+{
+ switch (source) {
+ case CommandFromMenuOrKeyBinding:
+ return true;
+ case CommandFromDOM:
+ case CommandFromDOMWithUserInterface: {
+ Settings* settings = frame ? frame->settings() : 0;
+ return settings && settings->javaScriptCanAccessClipboard();
+ }
+ }
+ ASSERT_NOT_REACHED();
+ return false;
+}
+
static bool supportedPaste(Frame* frame, EditorCommandSource source)
{
switch (source) {
@@ -1077,7 +1092,7 @@
case CommandFromDOM:
case CommandFromDOMWithUserInterface: {
Settings* settings = frame ? frame->settings() : 0;
- return settings && settings->isDOMPasteAllowed();
+ return settings && (settings->javaScriptCanAccessClipboard() ? settings->isDOMPasteAllowed() : 0);
}
}
ASSERT_NOT_REACHED();
@@ -1304,9 +1319,9 @@
{ "BackColor", { executeBackColor, supported, enabledInRichlyEditableText, stateNone, valueBackColor, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "BackwardDelete", { executeDeleteBackward, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } }, // FIXME: remove BackwardDelete when Safari for Windows stops using it.
{ "Bold", { executeToggleBold, supported, enabledInRichlyEditableText, stateBold, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
- { "Copy", { executeCopy, supported, enabledCopy, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
+ { "Copy", { executeCopy, supportedCopyCut, enabledCopy, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
{ "CreateLink", { executeCreateLink, supported, enabledInRichlyEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
- { "Cut", { executeCut, supported, enabledCut, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
+ { "Cut", { executeCut, supportedCopyCut, enabledCut, stateNone, valueNull, notTextInsertion, allowExecutionWhenDisabled } },
{ "Delete", { executeDelete, supported, enabledDelete, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "DeleteBackward", { executeDeleteBackward, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
{ "DeleteBackwardByDecomposingPreviousCharacter", { executeDeleteBackwardByDecomposingPreviousCharacter, supportedFromMenuOrKeyBinding, enabledInEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } },
--- WebCore/editing/IndentOutdentCommand.cpp
+++ WebCore/editing/IndentOutdentCommand.cpp
@@ -75,12 +75,8 @@
if (!listNode)
return false;
- // Find the list item enclosing the current paragraph
+ // Find the block that we want to indent. If it's not a list item (e.g., a div inside a list item), we bail out.
Element* selectedListItem = static_cast<Element*>(enclosingBlock(lastNodeInSelectedParagraph));
- // FIXME: enclosingBlock shouldn't return the passed in element. See the
- // comment on the function about how to fix rather than having to adjust here.
- if (selectedListItem == lastNodeInSelectedParagraph)
- selectedListItem = static_cast<Element*>(enclosingBlock(lastNodeInSelectedParagraph->parentNode()));
// FIXME: we need to deal with the case where there is no li (malformed HTML)
if (!selectedListItem->hasTagName(liTag))
@@ -117,7 +113,7 @@
else
nodeToSplitTo = editableRootForPosition(start);
- RefPtr<Node> outerBlock = splitTreeToNode(start.node(), nodeToSplitTo);
+ RefPtr<Node> outerBlock = (start.node() == nodeToSplitTo) ? start.node() : splitTreeToNode(start.node(), nodeToSplitTo);
if (!targetBlockquote) {
// Create a new blockquote and insert it as a child of the root editable element. We accomplish
--- WebCore/editing/InsertParagraphSeparatorCommand.cpp
+++ WebCore/editing/InsertParagraphSeparatorCommand.cpp
@@ -48,10 +48,12 @@
// pasting, it's easy to have each new line be a div deeper than the previous. E.g., in the case
// below, we want to insert at ^ instead of |.
// <div>foo<div>bar</div>|</div>^
-static Element* highestVisuallyEquivalentDiv(Element* startBlock)
+static Element* highestVisuallyEquivalentDivBelowRoot(Element* startBlock)
{
Element* curBlock = startBlock;
- while (!curBlock->nextSibling() && curBlock->parentElement()->hasTagName(divTag)) {
+ // We don't want to return a root node (if it happens to be a div, e.g., in a document fragment) because there are no
+ // siblings for us to append to.
+ while (!curBlock->nextSibling() && curBlock->parentElement()->hasTagName(divTag) && curBlock->parentElement()->parentElement()) {
NamedNodeMap* attributes = curBlock->parentElement()->attributes(true);
if (attributes && !attributes->isEmpty())
break;
@@ -235,7 +237,7 @@
// for div nodes, this can result in nested div tags that are hard to break out of.
Element* siblingNode = startBlock;
if (blockToInsert->hasTagName(divTag))
- siblingNode = highestVisuallyEquivalentDiv(startBlock);
+ siblingNode = highestVisuallyEquivalentDivBelowRoot(startBlock);
insertNodeAfter(blockToInsert, siblingNode);
}
--- WebCore/editing/markup.cpp
+++ WebCore/editing/markup.cpp
@@ -404,10 +404,12 @@
if (Node* parent = node->parentNode()) {
if (parent->hasTagName(scriptTag)
|| parent->hasTagName(styleTag)
- || parent->hasTagName(textareaTag)
|| parent->hasTagName(xmpTag)) {
appendUCharRange(result, ucharRange(node, range));
break;
+ } else if (parent->hasTagName(textareaTag)) {
+ appendEscapedContent(result, ucharRange(node, range), documentIsHTML);
+ break;
}
}
if (!annotate) {
--- WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -1211,7 +1211,7 @@
if (!cachedImage || !image->cachedImage()->image())
return CanvasPattern::create(Image::nullImage(), repeatX, repeatY, true);
- bool originClean = !canvas()->document()->securityOrigin()->taintsCanvas(KURL(KURL(), cachedImage->url()));
+ bool originClean = !canvas()->document()->securityOrigin()->taintsCanvas(KURL(KURL(), cachedImage->url())) && cachedImage->image()->hasSingleSecurityOrigin();
return CanvasPattern::create(cachedImage->image(), repeatX, repeatY, originClean);
}
--- WebCore/loader/DocumentThreadableLoader.cpp
+++ WebCore/loader/DocumentThreadableLoader.cpp
@@ -81,16 +81,19 @@
ASSERT(m_options.crossOriginRequestPolicy == UseAccessControl);
- if (!m_options.forcePreflight && isSimpleCrossOriginAccessRequest(request.httpMethod(), request.httpHeaderFields()))
- makeSimpleCrossOriginAccessRequest(request);
+ OwnPtr<ResourceRequest> crossOriginRequest(new ResourceRequest(request));
+ crossOriginRequest->removeCredentials();
+ crossOriginRequest->setAllowCookies(m_options.allowCredentials);
+
+ if (!m_options.forcePreflight && isSimpleCrossOriginAccessRequest(crossOriginRequest->httpMethod(), crossOriginRequest->httpHeaderFields()))
+ makeSimpleCrossOriginAccessRequest(*crossOriginRequest);
else {
- m_actualRequest.set(new ResourceRequest(request));
- m_actualRequest->setAllowCookies(m_options.allowCredentials);
+ m_actualRequest.set(crossOriginRequest.release());
- if (CrossOriginPreflightResultCache::shared().canSkipPreflight(document->securityOrigin()->toString(), request.url(), m_options.allowCredentials, request.httpMethod(), request.httpHeaderFields()))
+ if (CrossOriginPreflightResultCache::shared().canSkipPreflight(document->securityOrigin()->toString(), m_actualRequest->url(), m_options.allowCredentials, m_actualRequest->httpMethod(), m_actualRequest->httpHeaderFields()))
preflightSuccess();
else
- makeCrossOriginAccessRequestWithPreflight(request);
+ makeCrossOriginAccessRequestWithPreflight(*m_actualRequest);
}
}
@@ -106,8 +109,6 @@
// Make a copy of the passed request so that we can modify some details.
ResourceRequest crossOriginRequest(request);
- crossOriginRequest.removeCredentials();
- crossOriginRequest.setAllowCookies(m_options.allowCredentials);
crossOriginRequest.setHTTPOrigin(m_document->securityOrigin()->toString());
loadRequest(crossOriginRequest, DoSecurityCheck);
@@ -287,11 +288,17 @@
void DocumentThreadableLoader::preflightFailure()
{
+ m_actualRequest = 0; // Prevent didFinishLoading() from bypassing access check.
m_client->didFail(ResourceError());
}
void DocumentThreadableLoader::loadRequest(const ResourceRequest& request, SecurityCheckPolicy securityCheck)
{
+ // Any credential should have been removed from the cross-site requests.
+ const KURL& requestURL = request.url();
+ ASSERT(m_sameOriginRequest || requestURL.user().isEmpty());
+ ASSERT(m_sameOriginRequest || requestURL.pass().isEmpty());
+
if (m_async) {
// Don't sniff content or send load callbacks for the preflight request.
bool sendLoadCallbacks = m_options.sendLoadCallbacks && !m_actualRequest;
@@ -315,15 +322,15 @@
// No exception for file:/// resources, see <rdar://problem/4962298>.
// Also, if we have an HTTP response, then it wasn't a network error in fact.
- if (!error.isNull() && !request.url().isLocalFile() && response.httpStatusCode() <= 0) {
+ if (!error.isNull() && !requestURL.isLocalFile() && response.httpStatusCode() <= 0) {
m_client->didFail(error);
return;
}
// FIXME: FrameLoader::loadSynchronously() does not tell us whether a redirect happened or not, so we guess by comparing the
// request and response URLs. This isn't a perfect test though, since a server can serve a redirect to the same URL that was
- // requested.
- if (request.url() != response.url() && !isAllowedRedirect(response.url())) {
+ // requested. Also comparing the request and response URLs as strings will fail if the requestURL still has its credentials.
+ if (requestURL != response.url() && !isAllowedRedirect(response.url())) {
m_client->didFailRedirectCheck();
return;
}
--- WebCore/loader/HistoryController.cpp
+++ WebCore/loader/HistoryController.cpp
@@ -656,15 +656,17 @@
void HistoryController::replaceState(PassRefPtr<SerializedScriptValue> stateObject, const String& title, const String& urlString)
{
- Page* page = m_frame->page();
- ASSERT(page);
- HistoryItem* current = page->backForwardList()->currentItem();
- ASSERT(current);
+ // FIXME: We should always have m_currentItem here!!
+ // https://bugs.webkit.org/show_bug.cgi?id=36464
+ if (!m_currentItem) {
+ ASSERT_NOT_REACHED();
+ return;
+ }
if (!urlString.isEmpty())
- current->setURLString(urlString);
- current->setTitle(title);
- current->setStateObject(stateObject);
+ m_currentItem->setURLString(urlString);
+ m_currentItem->setTitle(title);
+ m_currentItem->setStateObject(stateObject);
}
} // namespace WebCore
--- WebCore/page/EventHandler.cpp
+++ WebCore/page/EventHandler.cpp
@@ -2151,7 +2151,9 @@
if (initialKeyEvent.type() == PlatformKeyboardEvent::RawKeyDown) {
node->dispatchEvent(keydown, ec);
- return keydown->defaultHandled() || keydown->defaultPrevented();
+ // If frame changed as a result of keydown dispatch, then return true to avoid sending a subsequent keypress message to the new frame.
+ bool changedFocusedFrame = m_frame->page() && m_frame != m_frame->page()->focusController()->focusedOrMainFrame();
+ return keydown->defaultHandled() || keydown->defaultPrevented() || changedFocusedFrame;
}
// Run input method in advance of DOM event handling. This may result in the IM
@@ -2171,7 +2173,9 @@
}
node->dispatchEvent(keydown, ec);
- bool keydownResult = keydown->defaultHandled() || keydown->defaultPrevented();
+ // If frame changed as a result of keydown dispatch, then return early to avoid sending a subsequent keypress message to the new frame.
+ bool changedFocusedFrame = m_frame->page() && m_frame != m_frame->page()->focusController()->focusedOrMainFrame();
+ bool keydownResult = keydown->defaultHandled() || keydown->defaultPrevented() || changedFocusedFrame;
if (handledByInputMethod || (keydownResult && !backwardCompatibilityMode))
return keydownResult;
@@ -2631,7 +2635,7 @@
void EventHandler::sendScrollEvent()
{
setFrameWasScrolledByUser();
- if (m_frame->view())
+ if (m_frame->view() && m_frame->document())
m_frame->document()->dispatchEvent(Event::create(eventNames().scrollEvent, true, false));
}
@@ -2713,21 +2717,21 @@
// Increment the platform touch id by 1 to avoid storing a key of 0 in the hashmap.
unsigned touchPointTargetKey = point.id() + 1;
- EventTarget* touchTarget = 0;
+ RefPtr<EventTarget> touchTarget;
if (point.state() == PlatformTouchPoint::TouchPressed) {
m_originatingTouchPointTargets.set(touchPointTargetKey, target);
touchTarget = target;
} else if (point.state() == PlatformTouchPoint::TouchReleased || point.state() == PlatformTouchPoint::TouchCancelled) {
// The target should be the original target for this touch, so get it from the hashmap. As it's a release or cancel
// we also remove it from the map.
- touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey).get();
+ touchTarget = m_originatingTouchPointTargets.take(touchPointTargetKey);
} else
- touchTarget = m_originatingTouchPointTargets.get(touchPointTargetKey).get();
+ touchTarget = m_originatingTouchPointTargets.get(touchPointTargetKey);
- if (!touchTarget)
+ if (!touchTarget.get())
continue;
- RefPtr<Touch> touch = Touch::create(doc->frame(), touchTarget, point.id(),
+ RefPtr<Touch> touch = Touch::create(doc->frame(), touchTarget.get(), point.id(),
point.screenPos().x(), point.screenPos().y(),
adjustedPageX, adjustedPageY);
--- WebCore/page/FrameView.cpp
+++ WebCore/page/FrameView.cpp
@@ -1275,14 +1275,13 @@
{
ASSERT(m_frame->view() == this);
- if (!m_layoutSchedulingEnabled || (m_frame->contentRenderer()
- && m_frame->contentRenderer()->needsLayout())) {
+ if (m_frame->contentRenderer() && m_frame->contentRenderer()->needsLayout()) {
if (relayoutRoot)
relayoutRoot->markContainingBlocksForLayout(false);
return;
}
- if (layoutPending()) {
+ if (layoutPending() || !m_layoutSchedulingEnabled) {
if (m_layoutRoot != relayoutRoot) {
if (isObjectAncestorContainerOf(m_layoutRoot, relayoutRoot)) {
// Keep the current root
@@ -1299,7 +1298,7 @@
relayoutRoot->markContainingBlocksForLayout(false);
}
}
- } else {
+ } else if (m_layoutSchedulingEnabled) {
int delay = m_frame->document()->minimumLayoutDelay();
m_layoutRoot = relayoutRoot;
m_delayedLayout = delay != 0;
@@ -1568,7 +1567,7 @@
// Set our clip rect to be our contents.
IntRect clipRect = contentsToWindow(visibleContentRect(!clipToContents));
- if (!m_frame || !m_frame->document()->ownerElement())
+ if (!m_frame || !m_frame->document() || !m_frame->document()->ownerElement())
return clipRect;
// Take our owner element and get the clip rect from the enclosing layer.
--- WebCore/page/Geolocation.cpp
+++ WebCore/page/Geolocation.cpp
@@ -29,7 +29,6 @@
#include "Geolocation.h"
#include "Chrome.h"
-#include "Document.h"
#include "Frame.h"
#include "Page.h"
#include <wtf/CurrentTime.h>
@@ -220,6 +219,7 @@
void Geolocation::disconnectFrame()
{
+ stopTimers();
stopUpdating();
if (m_frame) {
if (m_frame->document())
@@ -232,6 +232,8 @@
Geoposition* Geolocation::lastPosition()
{
+ ASSERT(isAllowed());
+
#if ENABLE(CLIENT_BASED_GEOLOCATION)
if (!m_frame)
return 0;
@@ -379,22 +381,6 @@
stopUpdating();
}
-void Geolocation::suspend()
-{
-#if !ENABLE(CLIENT_BASED_GEOLOCATION)
- if (hasListeners())
- m_service->suspend();
-#endif
-}
-
-void Geolocation::resume()
-{
-#if !ENABLE(CLIENT_BASED_GEOLOCATION)
- if (hasListeners())
- m_service->resume();
-#endif
-}
-
void Geolocation::setIsAllowed(bool allowed)
{
// This may be due to either a new position from the service, or a cached
--- WebCore/page/Geolocation.h
+++ WebCore/page/Geolocation.h
@@ -35,13 +35,6 @@
#include "PositionErrorCallback.h"
#include "PositionOptions.h"
#include "Timer.h"
-#include <wtf/HashMap.h>
-#include <wtf/HashSet.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
namespace WebCore {
@@ -60,26 +53,15 @@
public:
static PassRefPtr<Geolocation> create(Frame* frame) { return adoptRef(new Geolocation(frame)); }
- virtual ~Geolocation();
+ ~Geolocation();
void disconnectFrame();
- Geoposition* lastPosition();
-
void getCurrentPosition(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>);
int watchPosition(PassRefPtr<PositionCallback>, PassRefPtr<PositionErrorCallback>, PassRefPtr<PositionOptions>);
void clearWatch(int watchId);
- void suspend();
- void resume();
-
void setIsAllowed(bool);
- bool isAllowed() const { return m_allowGeolocation == Yes; }
- bool isDenied() const { return m_allowGeolocation == No; }
-
- void setShouldClearCache(bool shouldClearCache) { m_shouldClearCache = shouldClearCache; }
- bool shouldClearCache() const { return m_shouldClearCache; }
- Frame* frame() const { return m_frame; }
#if ENABLE(CLIENT_BASED_GEOLOCATION)
void setPosition(GeolocationPosition*);
@@ -89,6 +71,11 @@
#endif
private:
+ Geoposition* lastPosition();
+
+ bool isAllowed() const { return m_allowGeolocation == Yes; }
+ bool isDenied() const { return m_allowGeolocation == No; }
+
Geolocation(Frame*);
class GeoNotifier : public RefCounted<GeoNotifier> {
--- WebCore/page/Geolocation.idl
+++ WebCore/page/Geolocation.idl
@@ -26,8 +26,6 @@
module core {
interface [OmitConstructor] Geolocation {
- readonly attribute Geoposition lastPosition;
-
[Custom] void getCurrentPosition(in PositionCallback successCallback, in PositionErrorCallback errorCallback, in PositionOptions options);
[Custom] long watchPosition(in PositionCallback successCallback, in PositionErrorCallback errorCallback, in PositionOptions options);
--- WebCore/page/Settings.cpp
+++ WebCore/page/Settings.cpp
@@ -72,6 +72,7 @@
, m_privateBrowsingEnabled(false)
, m_caretBrowsingEnabled(false)
, m_areImagesEnabled(true)
+ , m_isMediaEnabled(true)
, m_arePluginsEnabled(false)
, m_localStorageEnabled(false)
, m_isJavaScriptEnabled(false)
@@ -79,6 +80,7 @@
, m_allowUniversalAccessFromFileURLs(true)
, m_allowFileAccessFromFileURLs(true)
, m_javaScriptCanOpenWindowsAutomatically(false)
+ , m_javaScriptCanAccessClipboard(false)
, m_shouldPrintBackgrounds(false)
, m_textAreasAreResizable(false)
#if ENABLE(DASHBOARD_SUPPORT)
@@ -262,6 +264,11 @@
m_areImagesEnabled = areImagesEnabled;
}
+void Settings::setMediaEnabled(bool isMediaEnabled)
+{
+ m_isMediaEnabled = isMediaEnabled;
+}
+
void Settings::setPluginsEnabled(bool arePluginsEnabled)
{
m_arePluginsEnabled = arePluginsEnabled;
@@ -291,6 +298,11 @@
m_javaScriptCanOpenWindowsAutomatically = javaScriptCanOpenWindowsAutomatically;
}
+void Settings::setJavaScriptCanAccessClipboard(bool javaScriptCanAccessClipboard)
+{
+ m_javaScriptCanAccessClipboard = javaScriptCanAccessClipboard;
+}
+
void Settings::setDefaultTextEncodingName(const String& defaultTextEncodingName)
{
m_defaultTextEncodingName = defaultTextEncodingName;
--- WebCore/page/Settings.h
+++ WebCore/page/Settings.h
@@ -122,6 +122,9 @@
void setJavaScriptCanOpenWindowsAutomatically(bool);
bool javaScriptCanOpenWindowsAutomatically() const { return m_javaScriptCanOpenWindowsAutomatically; }
+ void setJavaScriptCanAccessClipboard(bool);
+ bool javaScriptCanAccessClipboard() const { return m_javaScriptCanAccessClipboard; }
+
void setSpatialNavigationEnabled(bool);
bool isSpatialNavigationEnabled() const { return m_isSpatialNavigationEnabled; }
@@ -131,6 +134,9 @@
void setImagesEnabled(bool);
bool areImagesEnabled() const { return m_areImagesEnabled; }
+ void setMediaEnabled(bool);
+ bool isMediaEnabled() const { return m_isMediaEnabled; }
+
void setPluginsEnabled(bool);
bool arePluginsEnabled() const { return m_arePluginsEnabled; }
@@ -323,6 +329,7 @@
bool m_privateBrowsingEnabled : 1;
bool m_caretBrowsingEnabled : 1;
bool m_areImagesEnabled : 1;
+ bool m_isMediaEnabled : 1;
bool m_arePluginsEnabled : 1;
bool m_localStorageEnabled : 1;
bool m_isJavaScriptEnabled : 1;
@@ -330,6 +337,7 @@
bool m_allowUniversalAccessFromFileURLs: 1;
bool m_allowFileAccessFromFileURLs: 1;
bool m_javaScriptCanOpenWindowsAutomatically : 1;
+ bool m_javaScriptCanAccessClipboard : 1;
bool m_shouldPrintBackgrounds : 1;
bool m_textAreasAreResizable : 1;
#if ENABLE(DASHBOARD_SUPPORT)
--- WebCore/page/gtk/EventHandlerGtk.cpp
+++ WebCore/page/gtk/EventHandlerGtk.cpp
@@ -96,7 +96,7 @@
PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
{
- return ClipboardGtk::create(ClipboardWritable, true);
+ return ClipboardGtk::create(ClipboardWritable, DataObjectGtk::create(), true);
}
bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
--- WebCore/platform/PlatformMouseEvent.h
+++ WebCore/platform/PlatformMouseEvent.h
@@ -118,6 +118,7 @@
#if PLATFORM(GTK)
PlatformMouseEvent(GdkEventButton*);
PlatformMouseEvent(GdkEventMotion*);
+ void setClickCount(int count) { m_clickCount = count; }
#endif
#if PLATFORM(MAC)
--- WebCore/platform/graphics/ImageBuffer.cpp
+++ WebCore/platform/graphics/ImageBuffer.cpp
@@ -42,7 +42,6 @@
(dstColorSpace != LinearRGB && dstColorSpace != DeviceRGB))
return;
- Vector<int> lookUpTable;
if (dstColorSpace == LinearRGB) {
if (m_linearRgbLUT.isEmpty()) {
for (unsigned i = 0; i < 256; i++) {
@@ -57,8 +56,8 @@
} else if (dstColorSpace == DeviceRGB) {
if (m_deviceRgbLUT.isEmpty()) {
for (unsigned i = 0; i < 256; i++) {
- float color = i / 255.0f;
- color = pow(1.055f * color, 1.0f / 2.4f) - 0.055f;
+ float color = i / 255.0f;
+ color = (powf(color, 1.0f / 2.4f) * 1.055f) - 0.055f;
color = std::max(0.0f, color);
color = std::min(1.0f, color);
m_deviceRgbLUT.append(static_cast<int>(color * 255));
--- WebCore/platform/graphics/cairo/FontCairo.cpp
+++ WebCore/platform/graphics/cairo/FontCairo.cpp
@@ -138,12 +138,14 @@
}
} else if (context->fillPattern()) {
AffineTransform affine;
- cairo_set_source(cr, context->fillPattern()->createPlatformPattern(affine));
+ cairo_pattern_t* pattern = context->fillPattern()->createPlatformPattern(affine);
+ cairo_set_source(cr, pattern);
if (context->getAlpha() < 1.0f) {
cairo_push_group(cr);
cairo_paint_with_alpha(cr, context->getAlpha());
cairo_pop_group_to_source(cr);
}
+ cairo_pattern_destroy(pattern);
} else {
float red, green, blue, alpha;
fillColor.getRGBA(red, green, blue, alpha);
@@ -172,12 +174,14 @@
}
} else if (context->strokePattern()) {
AffineTransform affine;
- cairo_set_source(cr, context->strokePattern()->createPlatformPattern(affine));
+ cairo_pattern_t* pattern = context->strokePattern()->createPlatformPattern(affine);
+ cairo_set_source(cr, pattern);
if (context->getAlpha() < 1.0f) {
cairo_push_group(cr);
cairo_paint_with_alpha(cr, context->getAlpha());
cairo_pop_group_to_source(cr);
}
+ cairo_pattern_destroy(pattern);
} else {
Color strokeColor = context->strokeColor();
float red, green, blue, alpha;
--- WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
+++ WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
@@ -75,10 +75,12 @@
static inline void setPlatformFill(GraphicsContext* context, cairo_t* cr, GraphicsContextPrivate* gcp)
{
+ cairo_pattern_t* pattern = 0;
cairo_save(cr);
if (gcp->state.fillPattern) {
AffineTransform affine;
- cairo_set_source(cr, gcp->state.fillPattern->createPlatformPattern(affine));
+ pattern = gcp->state.fillPattern->createPlatformPattern(affine);
+ cairo_set_source(cr, pattern);
} else if (gcp->state.fillGradient)
cairo_set_source(cr, gcp->state.fillGradient->platformGradient());
else
@@ -86,14 +88,18 @@
cairo_clip_preserve(cr);
cairo_paint_with_alpha(cr, gcp->state.globalAlpha);
cairo_restore(cr);
+ if (pattern)
+ cairo_pattern_destroy(pattern);
}
static inline void setPlatformStroke(GraphicsContext* context, cairo_t* cr, GraphicsContextPrivate* gcp)
{
+ cairo_pattern_t* pattern = 0;
cairo_save(cr);
if (gcp->state.strokePattern) {
AffineTransform affine;
- cairo_set_source(cr, gcp->state.strokePattern->createPlatformPattern(affine));
+ pattern = gcp->state.strokePattern->createPlatformPattern(affine);
+ cairo_set_source(cr, pattern);
} else if (gcp->state.strokeGradient)
cairo_set_source(cr, gcp->state.strokeGradient->platformGradient());
else {
@@ -107,6 +113,8 @@
}
cairo_stroke_preserve(cr);
cairo_restore(cr);
+ if (pattern)
+ cairo_pattern_destroy(pattern);
}
// A fillRect helper
--- WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.cpp
+++ WebCore/platform/graphics/gstreamer/GOwnPtrGStreamer.cpp
@@ -30,6 +30,6 @@
if (ptr)
gst_object_unref(ptr);
}
-#endif
}
+#endif
--- WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h
+++ WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h
@@ -20,7 +20,6 @@
#ifndef _HAVE_WEBKIT_VIDEO_SINK_H
#define _HAVE_WEBKIT_VIDEO_SINK_H
-#include <cairo.h>
#include <glib-object.h>
#include <gst/video/gstvideosink.h>
--- WebCore/platform/gtk/ClipboardGtk.cpp
+++ WebCore/platform/gtk/ClipboardGtk.cpp
@@ -334,8 +334,7 @@
String actualLabel(label);
if (actualLabel.isEmpty())
actualLabel = url;
-
- m_dataObject->setText(url.string());
+ m_dataObject->setText(actualLabel);
Vector<UChar> markup;
append(markup, "<a href=\"");
--- WebCore/platform/gtk/ClipboardGtk.h
+++ WebCore/platform/gtk/ClipboardGtk.h
@@ -45,9 +45,9 @@
return adoptRef(new ClipboardGtk(policy, clipboard));
}
- static PassRefPtr<ClipboardGtk> create(ClipboardAccessPolicy policy, bool isForDragging)
+ static PassRefPtr<ClipboardGtk> create(ClipboardAccessPolicy policy, PassRefPtr<DataObjectGtk> dataObject, bool isForDragging)
{
- return adoptRef(new ClipboardGtk(policy, DataObjectGtk::create(), isForDragging));
+ return adoptRef(new ClipboardGtk(policy, dataObject, isForDragging));
}
virtual ~ClipboardGtk();
@@ -73,6 +73,9 @@
virtual bool hasData();
+ PasteboardHelper* helper() { return m_helper; }
+ PassRefPtr<DataObjectGtk> dataObject() { return m_dataObject; }
+
private:
ClipboardGtk(ClipboardAccessPolicy, GtkClipboard*);
ClipboardGtk(ClipboardAccessPolicy, PassRefPtr<DataObjectGtk>, bool);
--- WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp
+++ WebCore/platform/gtk/ClipboardUtilitiesGtk.cpp
+/*
+ * Copyright (C) 2010, Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "ClipboardUtilitiesGtk.h"
+
+namespace WebCore {
+
+GdkDragAction dragOperationToGdkDragActions(DragOperation coreAction)
+{
+ GdkDragAction gdkAction = static_cast<GdkDragAction>(0);
+ if (coreAction == DragOperationNone)
+ return gdkAction;
+
+ if (coreAction & DragOperationCopy)
+ gdkAction = static_cast<GdkDragAction>(GDK_ACTION_COPY | gdkAction);
+ if (coreAction & DragOperationMove)
+ gdkAction = static_cast<GdkDragAction>(GDK_ACTION_MOVE | gdkAction);
+ if (coreAction & DragOperationLink)
+ gdkAction = static_cast<GdkDragAction>(GDK_ACTION_LINK | gdkAction);
+ if (coreAction & DragOperationPrivate)
+ gdkAction = static_cast<GdkDragAction>(GDK_ACTION_PRIVATE | gdkAction);
+
+ return gdkAction;
+}
+
+DragOperation gdkDragActionToDragOperation(GdkDragAction gdkAction)
+{
+ unsigned int action = DragOperationNone;
+ if (gdkAction & GDK_ACTION_COPY)
+ action |= DragOperationCopy;
+ if (gdkAction & GDK_ACTION_MOVE)
+ action |= DragOperationMove;
+ if (gdkAction & GDK_ACTION_LINK)
+ action |= DragOperationLink;
+ if (gdkAction & GDK_ACTION_PRIVATE)
+ action |= DragOperationPrivate;
+ return static_cast<DragOperation>(action);
+}
+
+}
--- WebCore/platform/gtk/ClipboardUtilitiesGtk.h
+++ WebCore/platform/gtk/ClipboardUtilitiesGtk.h
+/*
+ * Copyright (C) 2010, Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef ClipboardUtilitiesGtk_h
+#define ClipboardUtilitiesGtk_h
+
+#include "DragActions.h"
+#include <gdk/gdk.h>
+
+namespace WebCore {
+
+GdkDragAction dragOperationToGdkDragActions(DragOperation);
+DragOperation gdkDragActionToDragOperation(GdkDragAction);
+
+}
+
+#endif // ClipboardUtilitiesGtk_h
--- WebCore/platform/gtk/GOwnPtrGtk.cpp
+++ WebCore/platform/gtk/GOwnPtrGtk.cpp
+/*
+ * Copyright (C) 2010 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "GOwnPtrGtk.h"
+
+#include <gdk/gdk.h>
+#include <glib.h>
+
+namespace WTF {
+
+template <> void freeOwnedGPtr<GdkEvent>(GdkEvent* ptr)
+{
+ if (ptr)
+ gdk_event_free(ptr);
+}
+
+}
--- WebCore/platform/gtk/GOwnPtrGtk.h
+++ WebCore/platform/gtk/GOwnPtrGtk.h
+/*
+ * Copyright (C) 2010 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GOwnPtrGtk_h
+#define GOwnPtrGtk_h
+
+#include "GOwnPtr.h"
+
+typedef union _GdkEvent GdkEvent;
+
+namespace WTF {
+
+template<> void freeOwnedGPtr<GdkEvent>(GdkEvent*);
+
+}
+
+#endif
--- WebCore/platform/gtk/PasteboardHelper.h
+++ WebCore/platform/gtk/PasteboardHelper.h
@@ -2,6 +2,7 @@
* Copyright (C) 2007 Luca Bruno <lethalman88 at gmail.com>
* Copyright (C) 2009 Holger Hans Peter Freyther
* Copyright (C) 2010 Martin Robinson <mrobinson at webkit.org>
+ * Copyright (C) 2010 Igalia S.L.
* All rights reserved.
*
* This library is free software; you can redistribute it and/or
@@ -49,6 +50,7 @@
GtkClipboard* getClipboard(Frame*) const;
GtkClipboard* getPrimarySelectionClipboard(Frame*) const;
GtkTargetList* targetList() const;
+ GtkTargetList* targetListForDataObject(DataObjectGtk*);
void fillSelectionData(GtkSelectionData*, guint, DataObjectGtk*);
void writeClipboardContents(GtkClipboard*, GClosure* closure = 0);
void getClipboardContents(GtkClipboard*);
@@ -62,7 +64,6 @@
private:
GtkTargetList* m_targetList;
- GtkTargetList* targetListForDataObject(DataObjectGtk*);
};
}
--- WebCore/platform/gtk/RenderThemeGtk.cpp
+++ WebCore/platform/gtk/RenderThemeGtk.cpp
@@ -285,14 +285,17 @@
static bool paintMozillaGtkWidget(const RenderThemeGtk* theme, GtkThemeWidgetType type, RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& rect)
{
- // No GdkWindow to render to, so return true to fall back
- if (!i.context->gdkDrawable())
- return true;
+ GRefPtr<GdkDrawable> pixmap;
// Painting is disabled so just claim to have succeeded
if (i.context->paintingDisabled())
return false;
+ // No GdkWindow to render to, so return true to fall back
+ if (!i.context->gdkDrawable())
+ // This is slow, used only during printing process
+ pixmap = adoptGRef(gdk_pixmap_new(0, rect.width(), rect.height(), gdk_visual_get_system()->depth));
+
GtkWidgetState mozState;
setMozillaState(theme, &mozState, o);
@@ -312,11 +315,28 @@
break;
}
+ GtkTextDirection direction = gtkTextDirection(o->style()->direction());
+
+ if (pixmap) {
+ GdkRectangle gdkRect = IntRect(0, 0, rect.width(), rect.height());
+
+ moz_gtk_use_theme_parts(theme->partsForDrawable(pixmap.get()));
+
+ bool result = moz_gtk_widget_paint(type, pixmap.get(), &gdkRect, &gdkRect, &mozState, flags, direction) != MOZ_GTK_SUCCESS;
+
+ if (!result) {
+ cairo_t* cr = i.context->platformContext();
+ gdk_cairo_set_source_pixmap(cr, pixmap.get(), rect.x(), rect.y());
+ cairo_paint(cr);
+ }
+
+ return result;
+ }
+
AffineTransform ctm = i.context->getCTM();
IntPoint pos = ctm.mapPoint(rect.location());
GdkRectangle gdkRect = IntRect(pos.x(), pos.y(), rect.width(), rect.height());
- GtkTextDirection direction = gtkTextDirection(o->style()->direction());
// Find the clip rectangle
cairo_t* cr = i.context->platformContext();
--- WebCore/platform/gtk/ScrollViewGtk.cpp
+++ WebCore/platform/gtk/ScrollViewGtk.cpp
@@ -106,40 +106,7 @@
m_horizontalAdjustment = hadj;
m_verticalAdjustment = vadj;
- // Reset the adjustments to a sane default
- if (m_horizontalAdjustment) {
- ScrollbarGtk* hScrollbar = reinterpret_cast<ScrollbarGtk*>(horizontalScrollbar());
- if (hScrollbar)
- hScrollbar->attachAdjustment(m_horizontalAdjustment);
-
- ScrollbarGtk* vScrollbar = reinterpret_cast<ScrollbarGtk*>(verticalScrollbar());
- if (vScrollbar)
- vScrollbar->attachAdjustment(m_verticalAdjustment);
-
- // We used to reset everything to 0 here, but when page cache
- // is enabled we reuse FrameViews that are cached. Since their
- // size is not going to change when being restored, (which is
- // what would cause the upper limit in the adjusments to be
- // set in the normal case), we make sure they are up-to-date
- // here. This is needed for the parent scrolling widget to be
- // able to report correct values.
-
- int horizontalPageStep = max(max<int>(frameRect().width() * Scrollbar::minFractionToStepWhenPaging(), frameRect().width() - Scrollbar::maxOverlapBetweenPages()), 1);
- gtk_adjustment_configure(m_horizontalAdjustment,
- resetValues ? 0 : scrollOffset().width(), 0,
- resetValues ? 0 : contentsSize().width(),
- resetValues ? 0 : Scrollbar::pixelsPerLineStep(),
- resetValues ? 0 : horizontalPageStep,
- resetValues ? 0 : frameRect().width());
-
- int verticalPageStep = max(max<int>(frameRect().height() * Scrollbar::minFractionToStepWhenPaging(), frameRect().height() - Scrollbar::maxOverlapBetweenPages()), 1);
- gtk_adjustment_configure(m_verticalAdjustment,
- resetValues ? 0 : scrollOffset().height(), 0,
- resetValues ? 0 : contentsSize().height(),
- resetValues ? 0 : Scrollbar::pixelsPerLineStep(),
- resetValues ? 0 : verticalPageStep,
- resetValues ? 0 : frameRect().height());
- } else {
+ if (!m_horizontalAdjustment) {
ScrollbarGtk* hScrollbar = reinterpret_cast<ScrollbarGtk*>(horizontalScrollbar());
if (hScrollbar)
hScrollbar->detachAdjustment();
@@ -147,11 +114,44 @@
ScrollbarGtk* vScrollbar = reinterpret_cast<ScrollbarGtk*>(verticalScrollbar());
if (vScrollbar)
vScrollbar->detachAdjustment();
+
+ return;
}
- /* reconsider having a scrollbar */
- setHasVerticalScrollbar(false);
- setHasHorizontalScrollbar(false);
+ // We may be lacking scrollbars when returning to a cached
+ // page, this kicks the page to recreate the scrollbars.
+ setHasVerticalScrollbar(true);
+ setHasHorizontalScrollbar(true);
+
+ ScrollbarGtk* hScrollbar = reinterpret_cast<ScrollbarGtk*>(horizontalScrollbar());
+ hScrollbar->attachAdjustment(m_horizontalAdjustment);
+
+ ScrollbarGtk* vScrollbar = reinterpret_cast<ScrollbarGtk*>(verticalScrollbar());
+ vScrollbar->attachAdjustment(m_verticalAdjustment);
+
+ // We used to reset everything to 0 here, but when page cache
+ // is enabled we reuse FrameViews that are cached. Since their
+ // size is not going to change when being restored, (which is
+ // what would cause the upper limit in the adjusments to be
+ // set in the normal case), we make sure they are up-to-date
+ // here. This is needed for the parent scrolling widget to be
+ // able to report correct values.
+
+ int horizontalPageStep = max(max<int>(frameRect().width() * Scrollbar::minFractionToStepWhenPaging(), frameRect().width() - Scrollbar::maxOverlapBetweenPages()), 1);
+ gtk_adjustment_configure(m_horizontalAdjustment,
+ resetValues ? 0 : scrollOffset().width(), 0,
+ resetValues ? 0 : contentsSize().width(),
+ resetValues ? 0 : Scrollbar::pixelsPerLineStep(),
+ resetValues ? 0 : horizontalPageStep,
+ resetValues ? 0 : frameRect().width());
+
+ int verticalPageStep = max(max<int>(frameRect().height() * Scrollbar::minFractionToStepWhenPaging(), frameRect().height() - Scrollbar::maxOverlapBetweenPages()), 1);
+ gtk_adjustment_configure(m_verticalAdjustment,
+ resetValues ? 0 : scrollOffset().height(), 0,
+ resetValues ? 0 : contentsSize().height(),
+ resetValues ? 0 : Scrollbar::pixelsPerLineStep(),
+ resetValues ? 0 : verticalPageStep,
+ resetValues ? 0 : frameRect().height());
}
void ScrollView::platformAddChild(Widget* child)
--- WebCore/platform/network/soup/ResourceHandleSoup.cpp
+++ WebCore/platform/network/soup/ResourceHandleSoup.cpp
@@ -195,6 +195,9 @@
if (d->client())
d->client()->willSendRequest(handle, request, response);
+ if (d->m_cancelled)
+ return;
+
#ifdef HAVE_LIBSOUP_2_29_90
// Update the first party in case the base URL changed with the redirect
String firstPartyString = request.firstPartyForCookies().string();
--- WebCore/platform/text/TextBreakIteratorICU.cpp
+++ WebCore/platform/text/TextBreakIteratorICU.cpp
@@ -24,7 +24,6 @@
#include "PlatformString.h"
#include "TextBreakIteratorInternalICU.h"
-
#include <unicode/ubrk.h>
#include <wtf/Assertions.h>
@@ -38,7 +37,7 @@
if (!createdIterator) {
UErrorCode openStatus = U_ZERO_ERROR;
- iterator = static_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
+ iterator = reinterpret_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
createdIterator = true;
ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
}
@@ -46,7 +45,7 @@
return 0;
UErrorCode setTextStatus = U_ZERO_ERROR;
- ubrk_setText(iterator, string, length, &setTextStatus);
+ ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
if (U_FAILURE(setTextStatus))
return 0;
@@ -85,44 +84,44 @@
staticSentenceBreakIterator, UBRK_SENTENCE, string, length);
}
-int textBreakFirst(TextBreakIterator* bi)
+int textBreakFirst(TextBreakIterator* iterator)
{
- return ubrk_first(bi);
+ return ubrk_first(reinterpret_cast<UBreakIterator*>(iterator));
}
-int textBreakLast(TextBreakIterator* bi)
+int textBreakLast(TextBreakIterator* iterator)
{
- return ubrk_last(bi);
+ return ubrk_last(reinterpret_cast<UBreakIterator*>(iterator));
}
-int textBreakNext(TextBreakIterator* bi)
+int textBreakNext(TextBreakIterator* iterator)
{
- return ubrk_next(bi);
+ return ubrk_next(reinterpret_cast<UBreakIterator*>(iterator));
}
-int textBreakPrevious(TextBreakIterator* bi)
+int textBreakPrevious(TextBreakIterator* iterator)
{
- return ubrk_previous(bi);
+ return ubrk_previous(reinterpret_cast<UBreakIterator*>(iterator));
}
-int textBreakPreceding(TextBreakIterator* bi, int pos)
+int textBreakPreceding(TextBreakIterator* iterator, int pos)
{
- return ubrk_preceding(bi, pos);
+ return ubrk_preceding(reinterpret_cast<UBreakIterator*>(iterator), pos);
}
-int textBreakFollowing(TextBreakIterator* bi, int pos)
+int textBreakFollowing(TextBreakIterator* iterator, int pos)
{
- return ubrk_following(bi, pos);
+ return ubrk_following(reinterpret_cast<UBreakIterator*>(iterator), pos);
}
-int textBreakCurrent(TextBreakIterator* bi)
+int textBreakCurrent(TextBreakIterator* iterator)
{
- return ubrk_current(bi);
+ return ubrk_current(reinterpret_cast<UBreakIterator*>(iterator));
}
-bool isTextBreak(TextBreakIterator* bi, int pos)
+bool isTextBreak(TextBreakIterator* iterator, int position)
{
- return ubrk_isBoundary(bi, pos);
+ return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), position);
}
#ifndef BUILDING_ON_TIGER
@@ -136,7 +135,7 @@
UParseError parseStatus;
UErrorCode openStatus = U_ZERO_ERROR;
String rules(breakRules);
- iterator = static_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
+ iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
createdIterator = true;
ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
}
@@ -144,7 +143,7 @@
return 0;
UErrorCode setTextStatus = U_ZERO_ERROR;
- ubrk_setText(iterator, string, length, &setTextStatus);
+ ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
if (U_FAILURE(setTextStatus))
return 0;
--- WebCore/rendering/FixedTableLayout.cpp
+++ WebCore/rendering/FixedTableLayout.cpp
@@ -166,8 +166,7 @@
int usedSpan = 0;
int i = 0;
- while (usedSpan < span) {
- ASSERT(cCol + i < nEffCols);
+ while (usedSpan < span && cCol + i < nEffCols) {
int eSpan = m_table->spanOfEffCol(cCol + i);
// Only set if no col element has already set it.
if (m_width[cCol + i].isAuto() && w.type() != Auto) {
--- WebCore/rendering/RenderBlock.cpp
+++ WebCore/rendering/RenderBlock.cpp
@@ -2358,8 +2358,14 @@
DeprecatedPtrListIterator<FloatingObject> it(*m_floatingObjects);
while (it.current()) {
if (it.current()->m_renderer == o) {
- if (childrenInline())
- markLinesDirtyInVerticalRange(0, it.current()->m_bottom);
+ if (childrenInline()) {
+ int bottom = it.current()->m_bottom;
+ // Special-case zero- and less-than-zero-height floats: those don't touch
+ // the line that they're on, but it still needs to be dirtied. This is
+ // accomplished by pretending they have a height of 1.
+ bottom = max(bottom, it.current()->m_top + 1);
+ markLinesDirtyInVerticalRange(0, bottom);
+ }
m_floatingObjects->removeRef(it.current());
}
++it;
@@ -3010,8 +3016,8 @@
addIntrudingFloats(block, xoffset, offset);
if (childrenInline()) {
- int changeTop = INT_MAX;
- int changeBottom = INT_MIN;
+ int changeTop = numeric_limits<int>::max();
+ int changeBottom = numeric_limits<int>::min();
if (m_floatingObjects) {
for (FloatingObject* f = m_floatingObjects->first(); f; f = m_floatingObjects->next()) {
FloatingObject* oldFloatingObject = floatMap.get(f->m_renderer);
@@ -4639,7 +4645,7 @@
// Drill into inlines looking for our first text child.
RenderObject* currChild = firstLetterBlock->firstChild();
- while (currChild && currChild->needsLayout() && (!currChild->isReplaced() || currChild->isFloatingOrPositioned()) && !currChild->isText()) {
+ while (currChild && currChild->needsLayout() && ((!currChild->isReplaced() && !currChild->isRenderButton() && !currChild->isMenuList()) || currChild->isFloatingOrPositioned()) && !currChild->isText()) {
if (currChild->isFloatingOrPositioned()) {
if (currChild->style()->styleType() == FIRST_LETTER)
break;
--- WebCore/rendering/RenderBlockLineLayout.cpp
+++ WebCore/rendering/RenderBlockLineLayout.cpp
@@ -646,7 +646,6 @@
bool endLineMatched = false;
bool checkForEndLineMatch = endLine;
bool checkForFloatsFromLastLine = false;
- int lastHeight = height();
bool isLineEmpty = true;
@@ -771,8 +770,7 @@
} else
m_floatingObjects->first();
for (FloatingObject* f = m_floatingObjects->current(); f; f = m_floatingObjects->next()) {
- if (f->m_bottom > lastHeight)
- lastRootBox()->floats().append(f->m_renderer);
+ lastRootBox()->floats().append(f->m_renderer);
ASSERT(f->m_renderer == floats[floatIndex].object);
// If a float's geometry has changed, give up on syncing with clean lines.
if (floats[floatIndex].rect != IntRect(f->m_left, f->m_top, f->m_width, f->m_bottom - f->m_top))
@@ -782,7 +780,6 @@
lastFloat = m_floatingObjects->last();
}
- lastHeight = height();
lineMidpointState.reset();
resolver.setPosition(end);
}
@@ -842,10 +839,8 @@
m_floatingObjects->next();
} else
m_floatingObjects->first();
- for (FloatingObject* f = m_floatingObjects->current(); f; f = m_floatingObjects->next()) {
- if (f->m_bottom > lastHeight)
- lastRootBox()->floats().append(f->m_renderer);
- }
+ for (FloatingObject* f = m_floatingObjects->current(); f; f = m_floatingObjects->next())
+ lastRootBox()->floats().append(f->m_renderer);
lastFloat = m_floatingObjects->last();
}
size_t floatCount = floats.size();
--- WebCore/rendering/RenderButton.h
+++ WebCore/rendering/RenderButton.h
@@ -57,12 +57,14 @@
virtual bool canHaveChildren() const;
-protected:
+private:
virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
virtual bool hasLineIfEmpty() const { return true; }
+ virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+
void timerFired(Timer<RenderButton>*);
RenderTextFragment* m_buttonText;
--- WebCore/rendering/RenderDataGrid.h
+++ WebCore/rendering/RenderDataGrid.h
@@ -53,6 +53,8 @@
private:
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+ virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+
RenderStyle* columnStyle(DataGridColumn*);
RenderStyle* headerStyle(DataGridColumn*);
void recalcStyleForColumns();
--- WebCore/rendering/RenderFileUploadControl.h
+++ WebCore/rendering/RenderFileUploadControl.h
@@ -56,6 +56,8 @@
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+ virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+
// FileChooserClient methods.
void valueChanged();
void repaint() { RenderBlock::repaint(); }
--- WebCore/rendering/RenderInline.cpp
+++ WebCore/rendering/RenderInline.cpp
@@ -274,7 +274,7 @@
// has to move into the inline continuation. Call updateBeforeAfterContent to ensure that the inline's :after
// content gets properly destroyed.
if (document()->usesBeforeAfterRules())
- inlineCurr->children()->updateBeforeAfterContent(this, AFTER);
+ inlineCurr->children()->updateBeforeAfterContent(inlineCurr, AFTER);
// Now we need to take all of the children starting from the first child
// *after* currChild and append them all to the clone.
--- WebCore/rendering/RenderListItem.h
+++ WebCore/rendering/RenderListItem.h
@@ -63,6 +63,8 @@
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+ virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+
void updateMarkerLocation();
inline int calcValue() const;
void updateValueNow() const;
--- WebCore/rendering/RenderListMarker.cpp
+++ WebCore/rendering/RenderListMarker.cpp
@@ -101,8 +101,10 @@
int length = 1;
if (type == AlphabeticSequence) {
- while ((numberShadow /= sequenceSize) > 0)
- letters[lettersSize - ++length] = sequence[numberShadow % sequenceSize - 1];
+ while ((numberShadow /= sequenceSize) > 0) {
+ --numberShadow;
+ letters[lettersSize - ++length] = sequence[numberShadow % sequenceSize];
+ }
} else {
while ((numberShadow /= sequenceSize) > 0)
letters[lettersSize - ++length] = sequence[numberShadow % sequenceSize];
--- WebCore/rendering/RenderMedia.h
+++ WebCore/rendering/RenderMedia.h
@@ -118,6 +118,8 @@
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+ virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+
RefPtr<HTMLElement> m_controlsShadowRoot;
RefPtr<MediaControlElement> m_panel;
RefPtr<MediaControlMuteButtonElement> m_muteButton;
--- WebCore/rendering/RenderMenuList.h
+++ WebCore/rendering/RenderMenuList.h
@@ -72,6 +72,8 @@
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+ virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+
// PopupMenuClient methods
virtual String itemText(unsigned listIndex) const;
virtual String itemToolTip(unsigned listIndex) const;
--- WebCore/rendering/RenderObject.h
+++ WebCore/rendering/RenderObject.h
@@ -322,6 +322,8 @@
bool cellWidthChanged() const { return m_cellWidthChanged; }
void setCellWidthChanged(bool b = true) { m_cellWidthChanged = b; }
+ virtual bool requiresForcedStyleRecalcPropagation() const { return false; }
+
#if ENABLE(MATHML)
virtual bool isRenderMathMLBlock() const { return false; }
#endif // ENABLE(MATHML)
@@ -412,7 +414,6 @@
void drawArcForBoxSide(GraphicsContext*, int x, int y, float thickness, IntSize radius, int angleStart,
int angleSpan, BoxSide, Color, EBorderStyle, bool firstCorner);
-public:
// The pseudo element style can be cached or uncached. Use the cached method if the pseudo element doesn't respect
// any pseudo classes (and therefore has no concept of changing state).
RenderStyle* getCachedPseudoStyle(PseudoId, RenderStyle* parentStyle = 0) const;
--- WebCore/rendering/RenderProgress.h
+++ WebCore/rendering/RenderProgress.h
@@ -39,7 +39,8 @@
virtual void calcPrefWidths();
virtual void layout();
virtual void updateFromElement();
-};
+
+ virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
inline RenderProgress* toRenderProgress(RenderObject* object)
{
--- WebCore/rendering/RenderSlider.h
+++ WebCore/rendering/RenderSlider.h
@@ -58,6 +58,8 @@
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+ virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+
PassRefPtr<RenderStyle> createThumbStyle(const RenderStyle* parentStyle);
int trackSize();
--- WebCore/rendering/RenderText.cpp
+++ WebCore/rendering/RenderText.cpp
@@ -203,7 +203,7 @@
PassRefPtr<StringImpl> RenderText::originalText() const
{
Node* e = node();
- return e ? static_cast<Text*>(e)->dataImpl() : 0;
+ return (e && e->isTextNode()) ? static_cast<Text*>(e)->dataImpl() : 0;
}
void RenderText::absoluteRects(Vector<IntRect>& rects, int tx, int ty)
--- WebCore/rendering/RenderTextControl.h
+++ WebCore/rendering/RenderTextControl.h
@@ -107,6 +107,8 @@
virtual bool canBeProgramaticallyScrolled(bool) const { return true; }
+ virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+
String finishText(Vector<UChar>&) const;
bool m_wasChangedSinceLastChangeEvent;
--- WebCore/rendering/RenderTextFragment.cpp
+++ WebCore/rendering/RenderTextFragment.cpp
@@ -47,7 +47,7 @@
PassRefPtr<StringImpl> RenderTextFragment::originalText() const
{
Node* e = node();
- RefPtr<StringImpl> result = (e ? static_cast<Text*>(e)->dataImpl() : contentString());
+ RefPtr<StringImpl> result = ((e && e->isTextNode()) ? static_cast<Text*>(e)->dataImpl() : contentString());
if (result && (start() > 0 || start() < result->length()))
result = result->substring(start(), end());
return result.release();
@@ -80,7 +80,7 @@
{
if (start()) {
Node* e = node();
- StringImpl* original = (e ? static_cast<Text*>(e)->dataImpl() : contentString());
+ StringImpl* original = ((e && e->isTextNode()) ? static_cast<Text*>(e)->dataImpl() : contentString());
if (original)
return (*original)[start() - 1];
}
--- WebCore/svg/graphics/SVGImage.cpp
+++ WebCore/svg/graphics/SVGImage.cpp
@@ -247,6 +247,7 @@
// The comment said that the Cache code does not know about CachedImages
// holding Frames and won't know to break the cycle. But
m_page.set(new Page(m_chromeClient.get(), dummyContextMenuClient, dummyEditorClient, dummyDragClient, dummyInspectorClient, 0, 0));
+ m_page->settings()->setMediaEnabled(false);
m_page->settings()->setJavaScriptEnabled(false);
m_page->settings()->setPluginsEnabled(false);
--- WebKit/gtk/ChangeLog
+++ WebKit/gtk/ChangeLog
@@ -1,3 +1,123 @@
+2010-05-03 Abhishek Arya <inferno at chromium.org>
+
+ Reviewed by Adam Barth.
+
+ Add support for controlling clipboard access from javascript.
+ Clipboard access from javascript is disabled by default.
+ https://bugs.webkit.org/show_bug.cgi?id=27751
+
+ * webkit/webkitwebsettings.cpp:
+ (webkit_web_settings_class_init):
+ (webkit_web_settings_set_property):
+ (webkit_web_settings_get_property):
+ (webkit_web_settings_copy):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_update_settings):
+ (webkit_web_view_settings_notify):
+
+2010-06-04 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Drag gesture can take mouse grab indefinitely
+ https://bugs.webkit.org/show_bug.cgi?id=32840
+
+ Initiate drag events with the current GTK+ event instead of synthesizing
+ an event. Something about synthesized events is causing a drag freeze in
+ certain situations.
+
+ * WebCoreSupport/DragClientGtk.cpp:
+ (WebKit::DragClient::startDrag): Start the drag with the current GTK+ event.
+
+2010-06-01 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] Double clicks cause three button press events
+ https://bugs.webkit.org/show_bug.cgi?id=38853
+
+ Handle click counting much like the Windows port. GTK+ only
+ counts triple-clicks natively, so use GTK+ double-click settings
+ to count clicks with even larger click counts. Also filter the
+ extra GDK_BUTTON_PRESS before GDK_{2,3}BUTTON_PRESS events using
+ gdk_event_peek().
+
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_button_press_event): Count clicks manually. Filter extra events.
+
+2010-05-22 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] webkit_web_view_drag_end should call EventHandler::dragSourceEndedAt
+ https://bugs.webkit.org/show_bug.cgi?id=39465
+
+ Properly call EventHandler::dragSourceEndedAt so that dragEnd events are processed in the DOM.
+ dragSourceEndedAt is responsible for calling the dragEnd DOM event as well as cleaning up assets
+ (such as the Clipboard) associated with the drag source.
+
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_drag_end): Remember to call dragSourceEndedAt here.
+
+2010-05-22 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] WebKit/gtk/WebCoreSupport/DragClientGtk::startDrag should use the Clipboard::sourceOperation
+ https://bugs.webkit.org/show_bug.cgi?id=39459
+
+ * WebCoreSupport/DragClientGtk.cpp:
+ (WebKit::DragClient::startDrag):
+ Use Clipboard::sourceOperation instead of trying to figure out the GdkDragAction
+ manually. The DOM may have changed the appropriate list of actions anyhow.
+
+2010-03-25 Sergio Villar Senín <svillar at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ Added new API webkit_web_back_forward_list_clear. This function
+ clears the back forward list
+
+ [GTK] http/history tests are failing
+ https://bugs.webkit.org/show_bug.cgi?id=36173
+
+ * tests/testwebbackforwardlist.c:
+ (test_webkit_web_back_forward_list_clear):
+ (main): added new unit test for the new API
+ * webkit/webkitwebbackforwardlist.cpp:
+ (webkit_web_back_forward_list_clear):
+ * webkit/webkitwebbackforwardlist.h: new function that clears the
+ back forward list
+
+2010-05-18 Martin Robinson <mrobinson at igalia.com>
+
+ Reviewed by Xan Lopez.
+
+ [GTK] DragClientGtk::startDrag leaks GdkEvents
+ https://bugs.webkit.org/show_bug.cgi?id=39322
+
+ * WebCoreSupport/DragClientGtk.cpp:
+ (WebKit::DragClient::startDrag): Properly clean up allocated GdkEvent.
+
+2010-05-06 Martin Robinson <mrobinson at webkit.org>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ [GTK] Enable DOM clipboard and drag-and-drop access
+ https://bugs.webkit.org/show_bug.cgi?id=30623
+
+ Convert dragging portion of drag-and-drop to use DataObjectGtk.
+
+ * WebCoreSupport/DragClientGtk.cpp:
+ (WebKit::DragClient::willPerformDragDestinationAction): Remove the notImplemented. It is implemented, it's just a no-op.
+ (WebKit::DragClient::startDrag): Start the drag context via the ClipboardGtk and PasteboardHelper now.
+ * WebCoreSupport/DragClientGtk.h: Small style fix.
+ * webkit/webkitprivate.h: Add a HashMap of contexts and DataObjects here to to represent all current drag operations.
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_dispose): Clear all data objects during disposal.
+ (webkit_web_view_drag_end): When a drag is over, just remove it from the map.
+ (webkit_web_view_drag_data_get): To get the drag data, just grab it from the DataObject.
+
2010-05-06 Martin Robinson <mrobinson at webkit.org>
Reviewed by Xan Lopez.
--- WebKit/gtk/NEWS
+++ WebKit/gtk/NEWS
@@ -1,4 +1,40 @@
================
+WebKitGTK+ 1.2.3
+================
+
+What's new in WebKitGTK+ 1.2.3?
+
+ - New stable release, API and ABI compatible with previous 1.2.x
+ versions;
+ - Includes a fix to build WebKit with ICU 4.4.1
+ - The patches to fix the following CVEs are included, thanks to the
+ work done by Michael Gilbert <michael.s.gilbert at gmail.com> for the
+ Debian security team:
+
+ CVE-2010-1386 CVE-2010-1392 CVE-2010-1405 CVE-2010-1407
+ CVE-2010-1416 CVE-2010-1417 CVE-2010-1665 CVE-2010-1418
+ CVE-2010-1421 CVE-2010-1422 CVE-2010-1501 CVE-2010-1767
+ CVE-2010-1664 CVE-2010-1758 CVE-2010-1759 CVE-2010-1760
+ CVE-2010-1761 CVE-2010-1762 CVE-2010-1770 CVE-2010-1771
+ CVE-2010-1772 CVE-2010-1773 CVE-2010-1774
+
+================
+WebKitGTK+ 1.2.2
+================
+
+What's new in WebKitGTK+ 1.2.2?
+
+ - New stable release, API and ABI compatible with previous 1.2.x
+ versions;
+ - A number of crashes discovered since the 1.2.1 release have been
+ fixed;
+ - A new function has been added toc clear the back/forward
+ list:
+ webkit_web_back_forward_list_clear;
+ - The infamous "cursor hangs when dragging" bug has been squashed;
+ - Scrollbars no longer working after going back has also been fixed.
+
+================
WebKitGTK+ 1.2.0
================
--- WebKit/gtk/WebCoreSupport/DragClientGtk.cpp
+++ WebKit/gtk/WebCoreSupport/DragClientGtk.cpp
@@ -1,4 +1,6 @@
/*
+ * Copyright (C) Igalia S.L.
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -17,11 +19,19 @@
#include "config.h"
#include "DragClientGtk.h"
+#include "ClipboardGtk.h"
+#include "ClipboardUtilitiesGtk.h"
+#include "DataObjectGtk.h"
#include "Document.h"
+#include "DragController.h"
#include "Element.h"
#include "Frame.h"
+#include "GOwnPtrGtk.h"
+#include "GRefPtrGtk.h"
#include "NotImplemented.h"
+#include "PasteboardHelper.h"
#include "RenderObject.h"
+#include "webkitprivate.h"
#include "webkitwebview.h"
#include <gtk/gtk.h>
@@ -41,7 +51,6 @@
void DragClient::willPerformDragDestinationAction(DragDestinationAction, DragData*)
{
- notImplemented();
}
void DragClient::willPerformDragSourceAction(DragSourceAction, const IntPoint& startPos, Clipboard*)
@@ -61,50 +70,22 @@
return DragSourceActionAny;
}
-void DragClient::startDrag(DragImageRef image, const IntPoint& dragImageOrigin, const IntPoint& eventPos, Clipboard*, Frame* frame, bool linkDrag)
+void DragClient::startDrag(DragImageRef image, const IntPoint& dragImageOrigin, const IntPoint& eventPos, Clipboard* clipboard, Frame* frame, bool linkDrag)
{
- Element* targetElement = frame->document()->elementFromPoint(m_startPos.x(), m_startPos.y());
- bool imageDrag = false;
+ ClipboardGtk* clipboardGtk = reinterpret_cast<ClipboardGtk*>(clipboard);
- if (targetElement)
- imageDrag = targetElement->renderer()->isImage();
+ WebKitWebView* webView = webkit_web_frame_get_web_view(kit(frame));
+ RefPtr<DataObjectGtk> dataObject = clipboardGtk->dataObject();
+ GRefPtr<GtkTargetList> targetList(clipboardGtk->helper()->targetListForDataObject(dataObject.get()));
+ GOwnPtr<GdkEvent> currentEvent(gtk_get_current_event());
- GdkAtom textHtml = gdk_atom_intern_static_string("text/html");
- GdkAtom netscapeUrl = gdk_atom_intern_static_string("_NETSCAPE_URL");
-
- GtkTargetList* targetList = gtk_target_list_new(NULL, 0);
- gtk_target_list_add(targetList, textHtml, 0, WEBKIT_WEB_VIEW_TARGET_INFO_HTML);
- gtk_target_list_add_text_targets(targetList, WEBKIT_WEB_VIEW_TARGET_INFO_TEXT);
-
- if (linkDrag || imageDrag) {
- gtk_target_list_add(targetList, netscapeUrl, 0, WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL);
- gtk_target_list_add_uri_targets(targetList, WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST);
- }
-
- if (imageDrag)
- gtk_target_list_add_image_targets(targetList, WEBKIT_WEB_VIEW_TARGET_INFO_IMAGE, false);
-
- GdkDragAction dragAction = GDK_ACTION_COPY;
- if (linkDrag) {
- dragAction = GDK_ACTION_LINK;
- if (imageDrag)
- dragAction = (GdkDragAction)(dragAction | GDK_ACTION_COPY);
- }
-
- GdkEvent* event = gdk_event_new(GDK_BUTTON_PRESS);
- reinterpret_cast<GdkEventButton*>(event)->window = gtk_widget_get_window(GTK_WIDGET(m_webView));
- reinterpret_cast<GdkEventButton*>(event)->time = GDK_CURRENT_TIME;
-
- GdkDragContext* context = gtk_drag_begin(GTK_WIDGET(m_webView),
- targetList, dragAction, 1, event);
- g_object_ref(context);
+ GdkDragContext* context = gtk_drag_begin(GTK_WIDGET(m_webView), targetList.get(), dragOperationToGdkDragActions(clipboard->sourceOperation()), 1, currentEvent.get());
+ webView->priv->draggingDataObjects.set(context, dataObject);
if (image)
gtk_drag_set_icon_pixbuf(context, image, eventPos.x() - dragImageOrigin.x(), eventPos.y() - dragImageOrigin.y());
else
gtk_drag_set_icon_default(context);
-
- gtk_target_list_unref(targetList);
}
DragImageRef DragClient::createDragImageForLink(KURL&, const String&, Frame*)
--- WebKit/gtk/WebCoreSupport/DragClientGtk.h
+++ WebKit/gtk/WebCoreSupport/DragClientGtk.h
@@ -51,9 +51,9 @@
virtual void dragControllerDestroyed();
- private:
- WebKitWebView* m_webView;
- WebCore::IntPoint m_startPos;
+ private:
+ WebKitWebView* m_webView;
+ WebCore::IntPoint m_startPos;
};
}
--- WebKit/gtk/docs/GNUmakefile.in
+++ WebKit/gtk/docs/GNUmakefile.in
@@ -114,8 +114,6 @@
GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@
GEOCLUE_LIBS = @GEOCLUE_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GIRDIR = @GIRDIR@
-GIRTYPELIBDIR = @GIRTYPELIBDIR@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
GLIB_LIBS = @GLIB_LIBS@
@@ -184,6 +182,8 @@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PNG_LIBS = @PNG_LIBS@
RANLIB = @RANLIB@
SED = @SED@
@@ -599,8 +599,11 @@
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
@echo 'gtk-doc: Scanning header files'
@-chmod -R u+w $(srcdir)
- @cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+ @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+ _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ done ; \
+ cd $(srcdir) && \
+ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
@@ -633,8 +636,11 @@
sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@echo 'gtk-doc: Building XML'
@-chmod -R u+w $(srcdir)
- @cd $(srcdir) && \
- gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+ @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+ _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ done ; \
+ cd $(srcdir) && \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
@touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
--- WebKit/gtk/po/#ChangeLog#
+++ WebKit/gtk/po/#ChangeLog#
-2010-03-24 Gustavo Noronha Silva <gns at gnome.org>
-
- Updating all localization files.
-
- * de.po:
- * en_GB.po:
- * es.po:
- * et.po:
- * gu.po:
- * he.po:
- * it.po:
- * lt.po:
- * lv.po:
- * nl.po:
- * pa.po:
- * pt.po:
- * pt_BR.po:
- * ru.po:
- * sl.po:
- * sr.po:
- * sr at latin.po:
- * sv.po:
- * vi.po:
- * webkit.pot:
- * zh_CN.po:
-
-2010-03-16 Matej Urbančič <mateju at svn.gnome.org>
-
- Reviewed by Gustavo Noronha.
-
- Slovenian translation.
-
- * sl.po: Added.
-
-2010-03-16 António Lima <amrlima at gmail.com>
-
- Reviewed by Gustavo Noronha.
-
- Translation for pt (Portuguese)
- https://bugs.webkit.org/show_bug.cgi?id=36148
-
- * pt.po: Added.
-
-2010-03-10 Priit Laes <plaes at plaes.org>
-
- Reviewed by Gustavo Noronha.
-
- Estonian translation.
-
- * et.po: Added.
-
-2010-03-09 Peteris Krisjanis <pecisk at gmail.com>
-
- Reviewed by Gustavo Noronha.
-
- Latvian translation.
-
- * lv.po: Added.
-
-2010-03-09 Duy Nguyen <pclouds at gmail.com>
-
- Reviewed by Gustavo Noronha.
-
- Vietnamese translation update.
-
- * vi.po:
-
-2010-03-09 Rimas Kudelis <rq at akl.lt>
-
- Reviewed by Gustavo Noronha.
-
- Lithuanian translation update.
-
- * lt.po:
-
-2010-02-25 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
-
- Updated to accomodate the change done to the localized string.
-
- * de.po:
- * en_GB.po:
- * es.po:
- * gu.po:
- * he.po:
- * it.po:
- * lt.po:
- * nl.po:
- * pa.po:
- * pt_BR.po:
- * ru.po:
- * sr.po:
- * sr at latin.po:
- * sv.po:
- * vi.po:
- * webkit.pot:
- * zh_CN.po:
-
-2010-02-23 Mario Blättermann <mariobl at freenet.de>
-
- Reviewed by Gustavo Noronha.
-
- German translation update.
-
- * de.po:
-
-2010-02-23 Daniel Nylander <po at danielnylander.se>
-
- Reviewed by Gustavo Noronha.
-
- Swedish translation update.
-
- * sv.po:
-
-2010-02-23 Ankit Patel <ankit at redhat.com>
-
- Reviewed by Gustavo Noronha.
-
- Gujarati translation.
-
- * gu.po: Added.
-
-2010-02-18 A S Alam <amanpreet.alam at gmail.com>
-
- Punjabi translation.
-
- * pa.po: Added.
-
-2010-02-16 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
-
- Refreshed all localization-related files, so that they are
- up-to-date with the code.
-
- * de.po: Updated.
- * en_GB.po: Updated.
- * es.po: Updated.
- * it.po: Updated.
- * lt.po: Updated.
- * nl.po: Updated.
- * pt_BR.po: Updated.
- * ru.po: Updated.
- * sr.po: Updated.
- * sr at latin.po: Updated.
- * sv.po: Updated.
- * vi.po: Updated.
- * webkit.pot: Updated.
- * zh_CN.po: Updated.
-
-2010-02-16 Gil Osher <gilosher at gmail.com>
-
- Reviewed by Gustavo Noronha.
-
- Localization of WebKitGTK+ in Hebrew.
-
- * he.po: Added.
-
-2009-10-19 Daniel Macks <dmacks at netspace.org>
-
- Reviewed by Adam Barth.
-
- Inconsistent handling of gettext domain can cause compile failure
- https://bugs.webkit.org/show_bug.cgi?id=30292
-
- * GNUmakefile.am: Use DOMAIN variable instead of hard-coded value
-
-2009-10-15 Jan Michael Alonzo <jmalonzo at webkit.org>
-
- Reviewed by Xan Lopez.
-
- [GTK] marshal stamp files are not cleaned after a distclean
- https://bugs.webkit.org/show_bug.cgi?id=30156
-
- Add stamp-po to CLEANFILES.
-
- * GNUmakefile.am:
-
-2009-10-09 Rimas Kudelis <rq at akl.lt>
-
- Rubber-stamped by Gustavo Noronha
-
- https://bugs.webkit.org/show_bug.cgi?id=30054
- Localization of WebKit GTK into Lithuanian
-
- * lt.po: Added.
-
-2009-07-18 Jorge González <aloriel at gmail.com>
-
- Rubber-stamped by Jan Alonzo.
-
- es translation
- https://bugs.webkit.org/show_bug.cgi?id=26319
-
- * es.po: Added.
-
-2009-07-15 Aron Xu <aronmalache at 163.com>
-
- Rubber-stamped by Jan Alonzo.
-
- Simplified Chinese translation
- https://bugs.webkit.org/show_bug.cgi?id=27252
-
- * zh_CN.po: Added.
-
-2009-07-15 Bruce Cowan <bugs at bcowan.fastmail.co.uk>
-
- Rubber-stamped by Jan Alonzo.
-
- [Gtk] en_GB translation
- https://bugs.webkit.org/show_bug.cgi?id=27244
-
- * en_GB.po: Added.
-
-2009-07-13 Reinout van Schouwen <reinouts at gnome.org>
-
- <https://bugs.webkit.org/show_bug.cgi?id=26980> [Gtk] Updated Dutch translation
-
- Rubber-stamped by Jan Alonzo.
-
- * nl.po: Added.
-
-2009-06-28 Miloš Popović <gpopac at gmail.com>
-
- Rubber-stamped by Jan Alonzo.
-
- New Serbian translation.
-
- * sr.po: Added.
- * sr at latin.po: Added.
-
-2009-06-25 Duy Nguyen <pclouds at gmail.com>
-
- Rubber-stamped by Jan Alonzo.
-
- Gtk port Vietnamese translation
- https://bugs.webkit.org/show_bug.cgi?id=26739
-
- * vi.po: Added.
-
-2009-05-13 Luca Ferretti <elle.uca at libero.it>
-
- Rubber-stamped by Xan Lopez.
-
- New Italian translation.
-
- * it.po: Added.
-
-2009-05-11 Anton Shestakov <engored at ya.ru>
-
- Rubber-stamped by Gustavo Noronha.
-
- New Russian translation.
-
- * ru.po: Added.
-
-2009-05-06 Daniel Nylander <po at danielnylander.se>
-
- Rubber-stamped by Gustavo Noronha.
-
- Swedish translation for WebKitGTK+.
-
- * sv.po: Added.
-
-2009-04-23 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
-
- Rubber-stamped by Xan Lopez.
-
- * pt_BR.po: translation update.
-
-2009-04-17 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
-
- Unreviewed build fix to generate all .mo files at the correct
- location.
-
- * GNUmakefile.am:
-
-2009-04-10 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
-
- Reviewed by Holger Freyther.
-
- https://bugs.webkit.org/show_bug.cgi?id=25124
- [GTK] many strings still missing translation calls
-
- Extracting translation for the files that got translation calls.
-
- * POTFILES:
- * de.po:
- * pt_BR.po:
- * webkit.pot:
-
-2009-04-06 Christian Dywan <christian at twotoasts.de>
-
- Rubber-stamped by Oliver Hunt.
-
- * de.po: Added German translation for WebKitGTK+.
-
-2009-04-06 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
-
- Rubber-stamped by Sam Weinig.
-
- * pt_BR.po: Added Brazilian Portuguese translation for WebKitGTK+.
-
-2009-04-06 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
-
- Rubber-stamped by Sam Weinig.
-
- * GNUmakefile.am, POTFILES, webkit.pot: Initial setup of the
- localization infra-structure.
-
--- WebKit/gtk/po/cs.po~
+++ WebKit/gtk/po/cs.po~
+# Czech translation for webkit.
+# Copyright (C) 2010 webkit's COPYRIGHT HOLDER
+# This file is distributed under the same license as the webkit package.
+# Lucas Lommer <llommer at svn.gnome.org>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: webkit HEAD\n"
+"Report-Msgid-Bugs-To: http://bugs.webkit.org/\n"
+"POT-Creation-Date: 2010-02-25 15:53-0300\n"
+"PO-Revision-Date: 2010-03-31 13:07+0100\n"
+"Last-Translator: Lucas Lommer <llommer at svn.gnome.org>\n"
+"Language-Team: Czech <gnome-cs-list at gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:535
+msgid "Upload File"
+msgstr "Nahrát soubor"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:61
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:143
+msgid "Input _Methods"
+msgstr "Vstupní _metody"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:78
+msgid "LRM _Left-to-right mark"
+msgstr "LRM - značka z_leva doprava"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:79
+msgid "RLM _Right-to-left mark"
+msgstr "RLM - značka zp_rava doleva"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:80
+msgid "LRE Left-to-right _embedding"
+msgstr "LRE - _zapouzdření zleva doprava"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:81
+msgid "RLE Right-to-left e_mbedding"
+msgstr "RLE - z_apouzdření zprava doleva"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:82
+msgid "LRO Left-to-right _override"
+msgstr "LRO - _přepisování zleva doprava"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:83
+msgid "RLO Right-to-left o_verride"
+msgstr "RLO - př_episování zprava doleva"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:84
+msgid "PDF _Pop directional formatting"
+msgstr "PDF - zrušení směrovaného _formátování"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:85
+msgid "ZWS _Zero width space"
+msgstr "ZWS - mezera _nulové šířky"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:86
+msgid "ZWJ Zero width _joiner"
+msgstr "ZWJ - _spojovač nulové šířky"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:87
+msgid "ZWNJ Zero width _non-joiner"
+msgstr "ZWNJ - nespojovač n_ulové šířky"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:109
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:138
+msgid "_Insert Unicode Control Character"
+msgstr "Vloži_t řídící znak Unicode"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:266
+msgid "Network Request"
+msgstr "Síťový požadavek"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:267
+msgid "The network request for the URI that should be downloaded"
+msgstr "Síťový požadavek na adresu URI, která má být stažena"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:281
+msgid "Network Response"
+msgstr "Síťová odpověď"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:282
+msgid "The network response for the URI that should be downloaded"
+msgstr "Síťová odpověď na adresu URI, která má být stažena"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:296
+msgid "Destination URI"
+msgstr "Cílová adresa URI"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:297
+msgid "The destination URI where to save the file"
+msgstr "Cílová adresa URI, kam soubor uložit"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:311
+msgid "Suggested Filename"
+msgstr "Navrhovaný název souboru"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:312
+msgid "The filename suggested as default when saving"
+msgstr "Výchozí název souboru při uložení"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:329
+msgid "Progress"
+msgstr "Průběh"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:330
+msgid "Determines the current progress of the download"
+msgstr "Údaj o aktuálním průběhu stahování"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:343
+msgid "Status"
+msgstr "Stav"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:344
+msgid "Determines the current status of the download"
+msgstr "Údaj o aktuálním stavu stahování"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:359
+msgid "Current Size"
+msgstr "Aktuální velikost"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:360
+msgid "The length of the data already downloaded"
+msgstr "Objem již stažených dat"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:374
+msgid "Total Size"
+msgstr "Celková velikost"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:375
+msgid "The total size of the file"
+msgstr "Celková velikost souboru"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:526
+msgid "User cancelled the download"
+msgstr "Stahování zrušeno uživatelem"
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:248
+#, c-format
+msgid "A username and password are being requested by the site %s"
+msgstr "Požadované uživatelské jméno a heslo, které je vyžadováno stránkou %s"
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:278
+msgid "Server message:"
+msgstr "Zpráva serveru:"
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:291
+msgid "Username:"
+msgstr "Uživatelské jméno:"
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:293
+msgid "Password:"
+msgstr "Heslo:"
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:302
+msgid "_Remember password"
+msgstr "Za_pamatovat si heslo"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:298
+msgid "Name"
+msgstr "Název"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:299
+msgid "The name of the frame"
+msgstr "Název rámu"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:305
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:146
+#: WebKit/gtk/webkit/webkitwebview.cpp:2318
+msgid "Title"
+msgstr "Nadpis"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:306
+msgid "The document title of the frame"
+msgstr "Nadpis dokumentu rámu"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:312
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:178
+#: WebKit/gtk/webkit/webkitwebview.cpp:2332
+msgid "URI"
+msgstr "Adresa URI"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:313
+msgid "The current URI of the contents displayed by the frame"
+msgstr "Aktuální adresa URI obsahu zobrazeného v rámci"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:344
+msgid "Horizontal Scrollbar Policy"
+msgstr "Strategie pro vodorovný posuvník"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:345
+msgid ""
+"Determines the current policy for the horizontal scrollbar of the frame."
+msgstr "Údaj o aktuální strategii horizontálního posuvníku rámce."
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:362
+msgid "Vertical Scrollbar Policy"
+msgstr "Strategie pro svislý posuvník"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:363
+msgid "Determines the current policy for the vertical scrollbar of the frame."
+msgstr "Údaj o aktuální strategii vertikálního posuvníku rámce."
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:147
+msgid "The title of the history item"
+msgstr "Nadpis položky historie"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:162
+msgid "Alternate Title"
+msgstr "Alternativní nadpis"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:163
+msgid "The alternate title of the history item"
+msgstr "Alternativní nadpis položky historie"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:179
+msgid "The URI of the history item"
+msgstr "Adresa URI položky historie"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:194
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:173
+msgid "Original URI"
+msgstr "Původní adresa URI"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:195
+msgid "The original URI of the history item"
+msgstr "Původní adresa URI položky historie"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:210
+msgid "Last visited Time"
+msgstr "Čas poslední návštěvy"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:211
+msgid "The time at which the history item was last visited"
+msgstr "Čas, kdy byla položka historie naposledy navštívena"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:268
+msgid "Web View"
+msgstr "Zobrazení WWW"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:269
+msgid "The Web View that renders the Web Inspector itself"
+msgstr "Zobrazení WWW, které vykresluje samotné Zkoumání WWW"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:282
+msgid "Inspected URI"
+msgstr "Zkoumaná adresa URI"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:283
+msgid "The URI that is currently being inspected"
+msgstr "Adresa URI, která je právě zkoumána"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:299
+msgid "Enable JavaScript profiling"
+msgstr "Povolit profilování jazyka JavaScript"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:300
+msgid "Profile the executed JavaScript."
+msgstr "Profilovat spuštěné skripty jazyka JavaScript."
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:315
+msgid "Enable Timeline profiling"
+msgstr "Povolit profilování časové osy"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:316
+msgid "Profile the WebCore instrumentation."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:158
+msgid "Reason"
+msgstr "Důvod"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:159
+msgid "The reason why this navigation is occurring"
+msgstr "Důvod, proč se objevila tato navigace"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:174
+msgid "The URI that was requested as the target for the navigation"
+msgstr "Adresa URI, která byla požadována jako cíl navigace"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:188
+msgid "Button"
+msgstr "Tlačítko"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:189
+msgid "The button used to click"
+msgstr "Tlačítko používané ke klepnutí"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:204
+msgid "Modifier state"
+msgstr "Stav modifikátoru"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:205
+msgid "A bitmask representing the state of the modifier keys"
+msgstr "Bitová maska reprezentující stav modifikátorových kláves"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:220
+msgid "Target frame"
+msgstr "Cílový rám"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:221
+msgid "The target frame for the navigation"
+msgstr "Cílový rám navigace"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:237
+msgid "Default Encoding"
+msgstr "Výchozí kódování"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:238
+msgid "The default encoding used to display text."
+msgstr "Výchozí kódování textu použité k zobrazení textu."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:246
+msgid "Cursive Font Family"
+msgstr "Rodina písma kurzíva"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:247
+msgid "The default Cursive font family used to display text."
+msgstr "Výchozí písmo z rodiny kurzíva použité k zobrazení textu."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:255
+msgid "Default Font Family"
+msgstr "Výchozí rodina písma"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:256
+msgid "The default font family used to display text."
+msgstr "Výchozí rodina písma použitého k zobrazení textu."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:264
+msgid "Fantasy Font Family"
+msgstr "Rodina písma Fantasy"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:265
+msgid "The default Fantasy font family used to display text."
+msgstr "Výchozí rodina písma Fantasy použitého k zobrazení textu."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:273
+msgid "Monospace Font Family"
+msgstr "Rodina písma s pevnou šířkou"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:274
+msgid "The default font family used to display monospace text."
+msgstr "Výchozí rodina písma použitého k zobrazení textu s pevnou šířkou."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:282
+msgid "Sans Serif Font Family"
+msgstr "Rodina písem Sans Serif"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:283
+msgid "The default Sans Serif font family used to display text."
+msgstr "Výchozí písmo z rodiny Sans Serif použité k zobrazení textu."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:291
+msgid "Serif Font Family"
+msgstr "Rodina písma Sans Serif"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:292
+msgid "The default Serif font family used to display text."
+msgstr "Výchozí písmo z rodiny Serif použité k zobrazení textu."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:300
+msgid "Default Font Size"
+msgstr "Výchozí velikost písma"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:301
+msgid "The default font size used to display text."
+msgstr "Výchozí velikost písma použitá k zobrazení textu."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:309
+msgid "Default Monospace Font Size"
+msgstr "Výchozí velikost písma s pevnou šířkou"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:310
+msgid "The default font size used to display monospace text."
+msgstr "Výchozí velikost písma použitá k zobrazení textu s pevnou šířkou."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:318
+msgid "Minimum Font Size"
+msgstr "Minimální velikost písma"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:319
+msgid "The minimum font size used to display text."
+msgstr "Minimální velikost písma použitá k zobrazení textu."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:327
+msgid "Minimum Logical Font Size"
+msgstr "Minimální logická velikost písma"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:328
+msgid "The minimum logical font size used to display text."
+msgstr "Minimální logická velikost písma použítá k zobrazení textu."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:347
+msgid "Enforce 96 DPI"
+msgstr "Vynutit 96 DPI"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:348
+msgid "Enforce a resolution of 96 DPI"
+msgstr "Vynutit rozlišení 96 DPI"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:356
+msgid "Auto Load Images"
+msgstr "Obrázky automaticky"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:357
+msgid "Load images automatically."
+msgstr "Automatický načíst obrázky."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:365
+msgid "Auto Shrink Images"
+msgstr "Zmenšovat obrázky"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:366
+msgid "Automatically shrink standalone images to fit."
+msgstr ""
+"Automaticky zmenšovat samostatně zobrazené obrázky tak, aby se vešly na "
+"obrazovku."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:374
+msgid "Print Backgrounds"
+msgstr "Tisknout pozadí"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:375
+msgid "Whether background images should be printed."
+msgstr "Zda mají být tisknuty obrázky na pozadí."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:383
+msgid "Enable Scripts"
+msgstr "Povolit skripty"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:384
+msgid "Enable embedded scripting languages."
+msgstr "Povolit vložené skriptovací jazyky."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:392
+msgid "Enable Plugins"
+msgstr "Povolit zásuvné moduly"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:393
+msgid "Enable embedded plugin objects."
+msgstr "Povolit vložené objekty zásuvných modulů."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:401
+msgid "Resizable Text Areas"
+msgstr "Měnitelná velikost textového pole"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:402
+msgid "Whether text areas are resizable."
+msgstr "Jestli je možno měnit velikost textového pole."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:409
+msgid "User Stylesheet URI"
+msgstr "Cesta k předpisu vzhledu uživatele"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:410
+msgid "The URI of a stylesheet that is applied to every page."
+msgstr ""
+"Adresa URI, kde se nachází předpis vzhledu, který bude aplikován na každou "
+"stránku."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:425
+msgid "Zoom Stepping Value"
+msgstr "Hodnota kroků změn velikosti"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:426
+msgid "The value by which the zoom level is changed when zooming in or out."
+msgstr "Hodnota změn velikosti jednotlivých kroků při zmenšování a zvětšování."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:444
+msgid "Enable Developer Extras"
+msgstr "Povolit rozšíření pro vývojáře"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:445
+msgid "Enables special extensions that help developers"
+msgstr "Povolit zvláštní rozšíření pomáhající vývojářům"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:465
+msgid "Enable Private Browsing"
+msgstr "Povolit soukromé prohlížení"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:466
+msgid "Enables private browsing mode"
+msgstr "Povolit režim soukromého prohlížení stránek"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:481
+msgid "Enable Spell Checking"
+msgstr "Povolit kontrolu pravopisu"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:482
+msgid "Enables spell checking while typing"
+msgstr "Povolit kontrolu pravopisu při psaní"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:505
+msgid "Languages to use for spell checking"
+msgstr "Jazyk, který použít ke kontrole pravopisu"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:506
+msgid "Comma separated list of languages to use for spell checking"
+msgstr "Seznam jazyků použitých ke kontrole pravopisu, oddělený čárkami"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:520
+msgid "Enable Caret Browsing"
+msgstr "Povolit prohlížení s kurzorem"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:521
+msgid "Whether to enable accesibility enhanced keyboard navigation"
+msgstr "Jestli povolit zpřístupnění pomocí navigace klávesnicí"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:536
+msgid "Enable HTML5 Database"
+msgstr "Povolit databázi HTML5"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:537
+msgid "Whether to enable HTML5 database support"
+msgstr "Jeslti povolit podporu pro databázi HTML5"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:552
+msgid "Enable HTML5 Local Storage"
+msgstr "Povolit místní úložiště HTML5"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:553
+msgid "Whether to enable HTML5 Local Storage support"
+msgstr "Jestli má být povolena podpora místního úložiště HTML5"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:567
+msgid "Enable XSS Auditor"
+msgstr "Povolit revizi XSS"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:568
+msgid "Whether to enable teh XSS auditor"
+msgstr "Jestli povolit revizi XSS"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:586
+msgid "User Agent"
+msgstr "Identifikace prohlížeče"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:587
+msgid "The User-Agent string used by WebKitGtk"
+msgstr "Řetězec identifikace prohlížeče (User agent), který WebKitGtk použije"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:602
+msgid "JavaScript can open windows automatically"
+msgstr "JavaScript smí automaticky otevírat okna"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:603
+msgid "Whether JavaScript can open windows automatically"
+msgstr "Jestli smí JavaScript automaticky otevírat okna"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:618
+msgid "Enable offline web application cache"
+msgstr "Povolit ukládání stránek do vyrovnávací paměti"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:619
+msgid "Whether to enable offline web application cache"
+msgstr "Povolit ukládání stránek do vyrovnávací paměti k použití při odpojení"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:646
+msgid "Editing behavior"
+msgstr "Chování při úpravách"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:647
+msgid "The behavior mode to use in editing mode"
+msgstr "Režim chování v režimu úprav"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:663
+msgid "Enable universal access from file URIs"
+msgstr "Povolit univerzální přístup ze souboru s URI"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:664
+msgid "Whether to allow universal access from file URIs"
+msgstr "Povolit univerzální přístup ze souboru s adresami URI"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:679
+msgid "Enable DOM paste"
+msgstr "Povolit vkládání DOM"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:680
+msgid "Whether to enable DOM paste"
+msgstr "Jestli povolit vkládání DOM"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:698
+msgid "Tab key cycles through elements"
+msgstr "Tabulátor cyklicky prochází prvky"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:699
+msgid "Whether the tab key cycles through elements on the page."
+msgstr "Jestli klávesa tabulátoru prochází cyklicky prvky stránky."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:719
+msgid "Enable Default Context Menu"
+msgstr "Povolit výchozí kontextovou nabídku"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:720
+msgid ""
+"Enables the handling of right-clicks for the creation of the default context "
+"menu"
+msgstr ""
+"Poboluje správu tvorby výchozí kontextové nabídky při klepnutí pravým "
+"tlačítkem"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:740
+#, fuzzy
+msgid "Enable Site Specific Quirks"
+msgstr "Povolit řešení kompatibility"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:741
+msgid "Enables the site-specific compatibility workarounds"
+msgstr "Povolit řešení komapatibility specifických stránek"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:763
+msgid "Enable page cache"
+msgstr "Povolit vyrovnávací paměť stránky"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:764
+msgid "Whether the page cache should be used"
+msgstr "Jestli použít vyrovnávací paměť pro stránky"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:784
+msgid "Auto Resize Window"
+msgstr "Automatická změna velikosti okna"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:785
+msgid "Automatically resize the toplevel window when a page requests it"
+msgstr "Automaticky změnit velikost okna, pokud o to stránka požádá"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:817
+msgid "Enable Java Applet"
+msgstr "Povolit applet jazyka Java"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:818
+msgid "Whether Java Applet support through <applet> should be enabled"
+msgstr "Jestli má být povolena podpora jazyka JavaScript skrze značku <applet>"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2319
+msgid "Returns the @web_view's document title"
+msgstr "Vrací název dokumentu @web_view"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2333
+msgid "Returns the current URI of the contents displayed by the @web_view"
+msgstr "Vrací aktuální adresu URI obsahu zobrazeného pomocí @web_view"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2346
+msgid "Copy target list"
+msgstr "Seznam cílů kopírování"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2347
+msgid "The list of targets this web view supports for clipboard copying"
+msgstr ""
+"Seznam cílů, které zobrazení stránky podporuje pro operace kopírování pomocí "
+"schránky"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2360
+msgid "Paste target list"
+msgstr "Seznam cílů vkládání"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2361
+msgid "The list of targets this web view supports for clipboard pasting"
+msgstr ""
+"Seznam cílů, které zobrazení stránky podporuje pro operace vkládání pomocí "
+"schránky"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2367
+msgid "Settings"
+msgstr "Nastavení"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2368
+msgid "An associated WebKitWebSettings instance"
+msgstr "Asociovaná instance WebKitWebSettings"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2381
+msgid "Web Inspector"
+msgstr "Zkoumání WWW"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2382
+msgid "The associated WebKitWebInspector instance"
+msgstr "Asociovaná instance WebKitWebInspector"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2402
+msgid "Editable"
+msgstr "Upravitelné"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2403
+msgid "Whether content can be modified by the user"
+msgstr "Jestli uživatel může upravovat obsah"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2409
+msgid "Transparent"
+msgstr "Průhledné"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2410
+msgid "Whether content has a transparent background"
+msgstr "Jestli má obsah průhledné pozadí"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2423
+msgid "Zoom level"
+msgstr "Úroveň zvětšení"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2424
+msgid "The level of zoom of the content"
+msgstr "Úroveň zvětšení obsahu"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2439
+msgid "Full content zoom"
+msgstr "Změna velikosti celého obsahu"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2440
+msgid "Whether the full content is scaled when zooming"
+msgstr "Jestli má být prováděna změna velikosti celého obsahu"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2453
+msgid "Encoding"
+msgstr "Kódování"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2454
+msgid "The default encoding of the web view"
+msgstr "Výchozí kódování zobrazení WWW"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2467
+msgid "Custom Encoding"
+msgstr "Vlastní kódování"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2468
+msgid "The custom encoding of the web view"
+msgstr "Vlastní kódování zobrazení WWW"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2520
+msgid "Icon URI"
+msgstr "Adresa URI ikony"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2521
+msgid "The URI for the favicon for the #WebKitWebView."
+msgstr "Adresa URI ikony stránky pro #WebKitWebView."
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:55
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:60
+msgid "Submit"
+msgstr "Potvrdit"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:65
+msgid "Reset"
+msgstr "Reset"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:70
+msgid "This is a searchable index. Enter search keywords: "
+msgstr "Tento seznam lze prohledávat. Zadejte klíčová slova hledání:"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:75
+msgid "Choose File"
+msgstr "Vybrat soubor"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:80
+msgid "(None)"
+msgstr "(Nic)"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:85
+msgid "Open Link in New _Window"
+msgstr "Otevřít odkaz v novém _okně"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:90
+msgid "_Download Linked File"
+msgstr "_Uložit odkazovaný soubor"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:95
+msgid "Copy Link Loc_ation"
+msgstr "_Kopírovat adresu odkazu"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:100
+msgid "Open _Image in New Window"
+msgstr "Otevřít o_brázek v novém okně"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:105
+msgid "Sa_ve Image As"
+msgstr "_Uložit obrázek jako"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:110
+msgid "Cop_y Image"
+msgstr "Ko_pírovat obrázek"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:115
+msgid "Open _Frame in New Window"
+msgstr "Otevřít _rám v novém okně"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:166
+msgid "_Reload"
+msgstr "_Obnovit"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:183
+msgid "No Guesses Found"
+msgstr "Nebyly nalezeny žádné návrhy"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:188
+msgid "_Ignore Spelling"
+msgstr "_Ignorovat kontrolu pravopisu"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:193
+msgid "_Learn Spelling"
+msgstr "_Učit se kontrolu pravopisu"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:198
+msgid "_Search the Web"
+msgstr "_Vyhledat na WWW"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:203
+msgid "_Look Up in Dictionary"
+msgstr "Vyh_ledat ve slovníku"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:208
+msgid "_Open Link"
+msgstr "_Otevřít odkaz"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:213
+msgid "Ignore _Grammar"
+msgstr "Ignorovat _gramatiku"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:218
+msgid "Spelling and _Grammar"
+msgstr "Kontrola pravopisu a _gramatiky"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:223
+msgid "_Show Spelling and Grammar"
+msgstr "_Zobrazit kontrolu pravopisu a gramatiky"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:223
+msgid "_Hide Spelling and Grammar"
+msgstr "_Skrýt kontrolu pravopisu a gramatiky"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:228
+msgid "_Check Document Now"
+msgstr "_Zkontrolovat dokument"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:233
+msgid "Check Spelling While _Typing"
+msgstr "_Kontrola pravopisu během psaní"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:238
+msgid "Check _Grammar With Spelling"
+msgstr "Kontrolovat _gramatiku pomocí pravopisu"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:243
+msgid "_Font"
+msgstr "_Písmo"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:266
+msgid "_Outline"
+msgstr "K_ontury"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:271
+msgid "Inspect _Element"
+msgstr "Zkoumat _prvek"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:276
+msgid "No recent searches"
+msgstr "Žádná nedávná hledání"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:281
+msgid "Recent searches"
+msgstr "Nedávná hledání"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:286
+msgid "_Clear recent searches"
+msgstr "_Vymazat nedávná hledání"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:291
+msgid "term"
+msgstr "výraz"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:296
+msgid "definition"
+msgstr "definice"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:301
+msgid "press"
+msgstr "stisknutí"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:306
+msgid "select"
+msgstr "výběr"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:311
+msgid "activate"
+msgstr "aktivovat"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:316
+msgid "uncheck"
+msgstr "zrušení výběru"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:321
+msgid "check"
+msgstr "kontrola"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:326
+msgid "jump"
+msgstr "přeskočit"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:342
+msgid " files"
+msgstr " soubory"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:347
+msgid "Unknown"
+msgstr "Neznámé"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:364
+msgid "Loading..."
+msgstr "Načítá se…"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:369
+msgid "Live Broadcast"
+msgstr "Živý přenos"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:375
+msgid "audio element controller"
+msgstr "ovladač prvku zvuku"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:377
+msgid "video element controller"
+msgstr "ovladač prvku videa"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:379
+msgid "mute"
+msgstr "ztlumení"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:381
+msgid "unmute"
+msgstr "zrušit ztlumení"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:383
+msgid "play"
+msgstr "přehrát"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:385
+msgid "pause"
+msgstr "pozastavit"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:387
+msgid "movie time"
+msgstr "čas videa"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:389
+msgid "timeline slider thumb"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:391
+msgid "back 30 seconds"
+msgstr "zpět 30 sekund"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:393
+msgid "return to realtime"
+msgstr "vrátit se do reálného času"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:395
+msgid "elapsed time"
+msgstr "uplynulý čas"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:397
+msgid "remaining time"
+msgstr "zbývající čas"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:399
+msgid "status"
+msgstr "stav"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:401
+msgid "fullscreen"
+msgstr "celá obrazovka"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:403
+msgid "fast forward"
+msgstr "rychle vpřed"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:405
+msgid "fast reverse"
+msgstr "rychle zpět"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:407
+msgid "show closed captions"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:409
+msgid "hide closed captions"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:418
+msgid "audio element playback controls and status display"
+msgstr "zobrazení ovládacích prvků a stavu prvku zvuku"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:420
+msgid "video element playback controls and status display"
+msgstr "zobrazení ovládacích prvků a stavu prvku videa"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:422
+msgid "mute audio tracks"
+msgstr "ztlumit hudební stopy"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:424
+msgid "unmute audio tracks"
+msgstr "zrušit ztlumení hudebních stop"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:426
+msgid "begin playback"
+msgstr "začít přehrávání"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:428
+msgid "pause playback"
+msgstr "pozastavit přehrávání"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:430
+msgid "movie time scrubber"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:432
+msgid "movie time scrubber thumb"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:434
+msgid "seek movie back 30 seconds"
+msgstr "přeskočit ve videu 30 sekund zpět"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:436
+msgid "return streaming movie to real time"
+msgstr "vrátit se v promítání videa do reálného šasu"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:438
+msgid "current movie time in seconds"
+msgstr "čas aktuálního videa v sekundách"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:440
+msgid "number of seconds of movie remaining"
+msgstr "počet zbývajících vteřin videa"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:442
+msgid "current movie status"
+msgstr "aktuální stav videa"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:444
+msgid "seek quickly back"
+msgstr "rychlý přechod zpět"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:446
+msgid "seek quickly forward"
+msgstr "rychlý přechod vpřed"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:448
+msgid "Play movie in fullscreen mode"
+msgstr "Přehrát video na celou obrazovku"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:450
+msgid "start displaying closed captions"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:452
+msgid "stop displaying closed captions"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:461
+msgid "indefinite time"
+msgstr "Nejasný čas"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:491
+msgid "value missing"
+msgstr "chybějící hodnota"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:497
+msgid "type mismatch"
+msgstr "typ nesouhlasí"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:502
+msgid "pattern mismatch"
+msgstr "vzor nesouhlasí"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:507
+msgid "too long"
+msgstr "příliš dlouhé"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:512
+msgid "range underflow"
+msgstr "nedostatečně velký rozsah"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:517
+msgid "range overflow"
+msgstr "příliš velký rozsah"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:522
+#, fuzzy
+msgid "step mismatch"
+msgstr "krok nesouhlasí"
--- WebKit/gtk/po/de.po~
+++ WebKit/gtk/po/de.po~
@@ -3,14 +3,13 @@
# Copyright (C) 2009 Christian Dywan <christian at twotoasts.de>, 2009.
# Mario Blättermann <mariobl at gnome.org>, 2010.
# Christian Kirbach <Christian.Kirbach at googlemail.com>, 2010.
-#
msgid ""
msgstr ""
"Project-Id-Version: webkit 1.1.21\n"
"Report-Msgid-Bugs-To: http://bugs.webkit.org/\n"
"POT-Creation-Date: 2010-02-25 15:53-0300\n"
-"PO-Revision-Date: 2010-02-18 12:14+0100\n"
-"Last-Translator: Mario Blättermann <mariobl at gnome.org>\n"
+"PO-Revision-Date: 2010-03-21 21:14+0100\n"
+"Last-Translator: Christian Kirbach <Christian.Kirbach at googlemail.com>\n"
"Language-Team: Deutsch <gnome-de at gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -148,7 +147,7 @@
#: WebKit/gtk/webkit/webkitsoupauthdialog.c:278
msgid "Server message:"
-msgstr ""
+msgstr "Server-Nachricht:"
#: WebKit/gtk/webkit/webkitsoupauthdialog.c:291
msgid "Username:"
@@ -636,13 +635,12 @@
"anpassen"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:817
-#, fuzzy
msgid "Enable Java Applet"
-msgstr "JavaScript-Profiling aktivieren"
+msgstr "Java-Applet aktivieren"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:818
msgid "Whether Java Applet support through <applet> should be enabled"
-msgstr ""
+msgstr "Legt fest, ob Java-Applets mittels <applet> unterstützt werden sollen"
#: WebKit/gtk/webkit/webkitwebview.cpp:2319
msgid "Returns the @web_view's document title"
@@ -755,7 +753,7 @@
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:70
msgid "This is a searchable index. Enter search keywords: "
-msgstr ""
+msgstr "Dieser Index ist durchsuchbar. Geben Sie Suchbegriffe ein: "
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:75
msgid "Choose File"
@@ -951,7 +949,7 @@
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:389
msgid "timeline slider thumb"
-msgstr ""
+msgstr "Rollbalken-Schieber der Zeitleiste"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:391
msgid "back 30 seconds"
@@ -987,11 +985,11 @@
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:407
msgid "show closed captions"
-msgstr ""
+msgstr "geschlossene Beschriftung zeigen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:409
msgid "hide closed captions"
-msgstr ""
+msgstr "geschlossene Beschriftung verbergen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:418
msgid "audio element playback controls and status display"
@@ -1019,11 +1017,11 @@
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:430
msgid "movie time scrubber"
-msgstr ""
+msgstr "Zeitschieber für Filme"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:432
msgid "movie time scrubber thumb"
-msgstr ""
+msgstr "Zeitschiebergriff für Filme"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:434
msgid "seek movie back 30 seconds"
@@ -1059,11 +1057,11 @@
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:450
msgid "start displaying closed captions"
-msgstr ""
+msgstr "beginnen, geschlossene Beschriftung zu zeigen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:452
msgid "stop displaying closed captions"
-msgstr ""
+msgstr "beenden, geschlossene Beschriftung zu zeigen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:461
msgid "indefinite time"
--- WebKit/gtk/po/gl.po~
+++ WebKit/gtk/po/gl.po~
+# Galician translation for webkit.
+# Copyright (C) 2009 webkit's COPYRIGHT HOLDER
+# This file is distributed under the same license as the webkit package.
+# Fran Diéguez <frandieguez at ubuntu.com>, 2009, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: webkit HEAD\n"
+"Report-Msgid-Bugs-To: http://bugs.webkit.org/\n"
+"POT-Creation-Date: 2010-02-25 15:53-0300\n"
+"PO-Revision-Date: 2010-05-23 01:14+0200\n"
+"Last-Translator: Fran Diéguez <frandieguez at ubuntu.com>\n"
+"Language-Team: Galician <gnome at g11.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\\\n"
+
+#: WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:535
+msgid "Upload File"
+msgstr "Subir ficheiro"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:61
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:143
+msgid "Input _Methods"
+msgstr "_Métodos de entrada"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:78
+msgid "LRM _Left-to-right mark"
+msgstr "Marca de _esquerda-a-derita [LRM]"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:79
+msgid "RLM _Right-to-left mark"
+msgstr "Marca de _dereita-a-esquerda [RLM]"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:80
+msgid "LRE Left-to-right _embedding"
+msgstr "In_crustamento de esquerda-a-dereita [LRE]"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:81
+msgid "RLE Right-to-left e_mbedding"
+msgstr "Inc_rustamento de dereita-a-esquerda [RLE]"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:82
+msgid "LRO Left-to-right _override"
+msgstr "_Prevalencia de esquerda-a-dereita [LRO]"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:83
+msgid "RLO Right-to-left o_verride"
+msgstr "Pre_valencia de dereita-a-esquerda [RLO]"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:84
+msgid "PDF _Pop directional formatting"
+msgstr "Formatadeo d_ireccional emerxente de PDF"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:85
+msgid "ZWS _Zero width space"
+msgstr "Espazo de anchura _cero [ZWS]"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:86
+msgid "ZWJ Zero width _joiner"
+msgstr "En_samblador de ancho cero [ZWJ]"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:87
+msgid "ZWNJ Zero width _non-joiner"
+msgstr "_Non ensamblador de anchura cero [ZWNJ]"
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:109
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:138
+msgid "_Insert Unicode Control Character"
+msgstr "_Insertar un carácter de control Unicode"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:266
+msgid "Network Request"
+msgstr "Solicitude de rede"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:267
+msgid "The network request for the URI that should be downloaded"
+msgstr "A solicitude de rede para o URI que debe descargarse"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:281
+#| msgid "Network Request"
+msgid "Network Response"
+msgstr "Resposta de rede"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:282
+#| msgid "The network request for the URI that should be downloaded"
+msgid "The network response for the URI that should be downloaded"
+msgstr "A resposta de rede do URI que debería ser descargado"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:296
+msgid "Destination URI"
+msgstr "URI de destino"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:297
+msgid "The destination URI where to save the file"
+msgstr "A URI de destino onde gardar o ficheiro"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:311
+msgid "Suggested Filename"
+msgstr "Nome do ficheiro suxerido"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:312
+msgid "The filename suggested as default when saving"
+msgstr "O nome de ficheiro suxerido como predefinido ao gardar"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:329
+msgid "Progress"
+msgstr "Progreso"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:330
+msgid "Determines the current progress of the download"
+msgstr "Determina o progreso actual da descarga"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:343
+msgid "Status"
+msgstr "Estado"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:344
+msgid "Determines the current status of the download"
+msgstr "Determina o estado actual da descarga"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:359
+msgid "Current Size"
+msgstr "Tamaño actual"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:360
+msgid "The length of the data already downloaded"
+msgstr "A lonxitude dos datos xa descargados"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:374
+msgid "Total Size"
+msgstr "Tamaño total"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:375
+msgid "The total size of the file"
+msgstr "O tamaño total do ficheiro"
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:526
+msgid "User cancelled the download"
+msgstr "O usuario cancelou a descarga"
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:248
+#, c-format
+msgid "A username and password are being requested by the site %s"
+msgstr "O sitio %s solicitou un nome de usuario e unha contrasinal"
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:278
+msgid "Server message:"
+msgstr "Mensaxe do servidor:"
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:291
+msgid "Username:"
+msgstr "Nome de usuario:"
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:293
+msgid "Password:"
+msgstr "Contrasinal:"
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:302
+#| msgid "Remember password"
+msgid "_Remember password"
+msgstr "_Lembrar o contrasinal"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:298
+msgid "Name"
+msgstr "Nome"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:299
+msgid "The name of the frame"
+msgstr "O nome do marco"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:305
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:146
+#: WebKit/gtk/webkit/webkitwebview.cpp:2318
+msgid "Title"
+msgstr "Título"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:306
+msgid "The document title of the frame"
+msgstr "O título do documento do marco"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:312
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:178
+#: WebKit/gtk/webkit/webkitwebview.cpp:2332
+msgid "URI"
+msgstr "URI"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:313
+msgid "The current URI of the contents displayed by the frame"
+msgstr "O URI actual dos contidos mostrados no marco"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:344
+msgid "Horizontal Scrollbar Policy"
+msgstr "Normativa da barra de desprazamento horizontal"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:345
+#| msgid "Determines the current progress of the download"
+msgid ""
+"Determines the current policy for the horizontal scrollbar of the frame."
+msgstr ""
+"Determina a normativa actual para a barra de desprazamento horizontal para o "
+"marco."
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:362
+msgid "Vertical Scrollbar Policy"
+msgstr "Normativa da barra de desprazamento vertical"
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:363
+#| msgid "Determines the current progress of the download"
+msgid "Determines the current policy for the vertical scrollbar of the frame."
+msgstr ""
+"Determina a normativa actual para a barra de desprazamento vertical para o "
+"marco."
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:147
+msgid "The title of the history item"
+msgstr "O título do elemento do historial"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:162
+msgid "Alternate Title"
+msgstr "Título alternativo"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:163
+msgid "The alternate title of the history item"
+msgstr "O título alternativo do elemento do historial"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:179
+msgid "The URI of the history item"
+msgstr "O URI do elemento do historial"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:194
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:173
+msgid "Original URI"
+msgstr "URI orixinal"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:195
+msgid "The original URI of the history item"
+msgstr "O URI orixinal do elemento do historial"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:210
+msgid "Last visited Time"
+msgstr "Tempo da última visita"
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:211
+msgid "The time at which the history item was last visited"
+msgstr "O tempo no cal o elemento do historial foi visitado a última vez"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:268
+msgid "Web View"
+msgstr "Visualización web"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:269
+msgid "The Web View that renders the Web Inspector itself"
+msgstr "A visualización web que renderiza o propio Inspector web"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:282
+msgid "Inspected URI"
+msgstr "URI inspeccionada"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:283
+msgid "The URI that is currently being inspected"
+msgstr "O URI que está sendo inspeccionada actualmente"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:299
+msgid "Enable JavaScript profiling"
+msgstr "Activar o perfilado de JavaScript"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:300
+msgid "Profile the executed JavaScript."
+msgstr "Perfilar o JavaScript executado."
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:315
+#| msgid "Enable JavaScript profiling"
+msgid "Enable Timeline profiling"
+msgstr "Activar o perfilado da Liña de tempo"
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:316
+msgid "Profile the WebCore instrumentation."
+msgstr "Perfilar a instrumentación de WebCore."
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:158
+msgid "Reason"
+msgstr "Razón"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:159
+msgid "The reason why this navigation is occurring"
+msgstr "A razón pola que esta navegación está ocorrendo"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:174
+msgid "The URI that was requested as the target for the navigation"
+msgstr "O URI que foi solicitado como destino para a navegación"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:188
+msgid "Button"
+msgstr "Botón"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:189
+msgid "The button used to click"
+msgstr "O botón empregado para premer"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:204
+msgid "Modifier state"
+msgstr "Estado dos modificadores"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:205
+msgid "A bitmask representing the state of the modifier keys"
+msgstr "A máscara de bits representa o estado das teclas modificadoras"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:220
+#| msgid "The name of the frame"
+msgid "Target frame"
+msgstr "Marco de destino"
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:221
+#| msgid "The URI that was requested as the target for the navigation"
+msgid "The target frame for the navigation"
+msgstr "O marco de destino para a navegación"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:237
+msgid "Default Encoding"
+msgstr "Codificación predefinida"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:238
+msgid "The default encoding used to display text."
+msgstr "A codificación predefinida empregada para mostrar o texto."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:246
+msgid "Cursive Font Family"
+msgstr "Familia de tipo de fonte cursiva"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:247
+msgid "The default Cursive font family used to display text."
+msgstr "A familia de tipo de fonte cursiva empregado para mostrar texto."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:255
+msgid "Default Font Family"
+msgstr "Familia de tipo de fonte predefinida"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:256
+msgid "The default font family used to display text."
+msgstr "A familia de fonte predefinida para mostrar texto."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:264
+msgid "Fantasy Font Family"
+msgstr "Familia de tipo de fonte Fantasy"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:265
+msgid "The default Fantasy font family used to display text."
+msgstr "A familia de tipo de fonte Fantasy empregado para mostrar texto."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:273
+msgid "Monospace Font Family"
+msgstr "Familia de tipo de fonte Monospace"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:274
+msgid "The default font family used to display monospace text."
+msgstr "A familia de tipo de fonte predefinido empregado para mostrar texto."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:282
+msgid "Sans Serif Font Family"
+msgstr "Familia de tipo de fonte Sans Serif"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:283
+msgid "The default Sans Serif font family used to display text."
+msgstr "A familia de tipo de fonte Sans Serif empregado para mostrar texto."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:291
+msgid "Serif Font Family"
+msgstr "Familia de tipo de fonte Serif"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:292
+msgid "The default Serif font family used to display text."
+msgstr "A familia de tipo de fonte Serif empregado para mostrar texto."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:300
+msgid "Default Font Size"
+msgstr "Tamaño do tipo de fonte predefinido"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:301
+msgid "The default font size used to display text."
+msgstr "O tamaño do tipo de fonte predefinido para mostrar o texto."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:309
+msgid "Default Monospace Font Size"
+msgstr "Tamaño predefinido do tipo de fonte monoespaciado"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:310
+msgid "The default font size used to display monospace text."
+msgstr ""
+"O tamaño predefinido de tipo de fonte para mostrar o texto monoespaciado"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:318
+msgid "Minimum Font Size"
+msgstr "Tamaño mínimo para o tipo de fonte"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:319
+msgid "The minimum font size used to display text."
+msgstr "Tamaño mínimo do tipo de fonte empregado para mostrar o texto."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:327
+msgid "Minimum Logical Font Size"
+msgstr "O tamaño lóxico de fonte mínimo"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:328
+msgid "The minimum logical font size used to display text."
+msgstr "O tamaño lóxico de fonte mínimo a empregar para mostrar texto."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:347
+msgid "Enforce 96 DPI"
+msgstr "Forzar 96 DPI."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:348
+msgid "Enforce a resolution of 96 DPI"
+msgstr "Forzar unha resolución de 96 DPI"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:356
+msgid "Auto Load Images"
+msgstr "Cargar imaxes automáticamente"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:357
+msgid "Load images automatically."
+msgstr "Carga imaxes automaticamente."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:365
+msgid "Auto Shrink Images"
+msgstr "Recortar imaxes automaticamente"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:366
+msgid "Automatically shrink standalone images to fit."
+msgstr "Recorta de forma automática as imaxes para que se axusten."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:374
+msgid "Print Backgrounds"
+msgstr "Imprimir fondos"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:375
+msgid "Whether background images should be printed."
+msgstr "Indica se se deben imprimir as imaxes de fondo."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:383
+msgid "Enable Scripts"
+msgstr "Activar scripts"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:384
+msgid "Enable embedded scripting languages."
+msgstr "Activa as linguaxes de scripting incrustadas."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:392
+msgid "Enable Plugins"
+msgstr "Activar complementos"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:393
+msgid "Enable embedded plugin objects."
+msgstr "Activar os obxectos de complementos incrustados."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:401
+msgid "Resizable Text Areas"
+msgstr "Áreas de texto retamañábeis"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:402
+msgid "Whether text areas are resizable."
+msgstr "Indica se as áreas de texto son retamañábeis."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:409
+msgid "User Stylesheet URI"
+msgstr "URI da folla de estilos do usuario"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:410
+msgid "The URI of a stylesheet that is applied to every page."
+msgstr "O URI dunha folla de estilos que se aplica en cada páxina."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:425
+msgid "Zoom Stepping Value"
+msgstr "Valor de salto do zoom"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:426
+msgid "The value by which the zoom level is changed when zooming in or out."
+msgstr ""
+"O valor polo cal o nivel de zoom se cambiará ao incrementar o zoom ou "
+"reducilo."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:444
+msgid "Enable Developer Extras"
+msgstr "Activar extras do desenvolvedor"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:445
+msgid "Enables special extensions that help developers"
+msgstr "Activa as extensións especiais que axudan aos desenvolvedores"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:465
+msgid "Enable Private Browsing"
+msgstr "Activar a navegación privada"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:466
+msgid "Enables private browsing mode"
+msgstr "Activa o modo privado de navegación"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:481
+msgid "Enable Spell Checking"
+msgstr "Activar a corrección ortográfica"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:482
+#| msgid "Check Spelling While _Typing"
+msgid "Enables spell checking while typing"
+msgstr "Comprobar ortografía ao escribir"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:505
+msgid "Languages to use for spell checking"
+msgstr "Idiomas a usar na corrección ortográfica"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:506
+msgid "Comma separated list of languages to use for spell checking"
+msgstr ""
+"Lista de separada por comas das linguaxes a usar na comprobación ortográfica"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:520
+#| msgid "Enable Private Browsing"
+msgid "Enable Caret Browsing"
+msgstr "Activar a navegación cos cursores"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:521
+msgid "Whether to enable accesibility enhanced keyboard navigation"
+msgstr ""
+"Indica se activar a navegación mellorada por teclado para a accesibilidade"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:536
+msgid "Enable HTML5 Database"
+msgstr "Activar a base de datos de HTML5"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:537
+msgid "Whether to enable HTML5 database support"
+msgstr "Indica se activar a compatibilidade de HTML5"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:552
+msgid "Enable HTML5 Local Storage"
+msgstr "Activar o almacenamento local de HTML5"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:553
+msgid "Whether to enable HTML5 Local Storage support"
+msgstr "Indica se activar a compatibilidade de almacenamento local de HTML5"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:567
+#| msgid "Enable Scripts"
+msgid "Enable XSS Auditor"
+msgstr "Activar o auditor de XSS"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:568
+msgid "Whether to enable teh XSS auditor"
+msgstr "Indica se activar o auditor de XSS"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:586
+msgid "User Agent"
+msgstr "Axente de usuario"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:587
+msgid "The User-Agent string used by WebKitGtk"
+msgstr "A cadea User-Agent usada polo WebKitGtk"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:602
+msgid "JavaScript can open windows automatically"
+msgstr "JavaScript pode abrir xanelas automáticamente"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:603
+msgid "Whether JavaScript can open windows automatically"
+msgstr "Indica se JavaScript pode abrir xanelas automaticamente"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:618
+msgid "Enable offline web application cache"
+msgstr "Activar a caché de aplicativo web fóra de liña"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:619
+msgid "Whether to enable offline web application cache"
+msgstr "Indica"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:646
+msgid "Editing behavior"
+msgstr "Comportamento de edición"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:647
+msgid "The behavior mode to use in editing mode"
+msgstr "O modo de comportamento no modo de edición"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:663
+msgid "Enable universal access from file URIs"
+msgstr "Activar o acceso universal para os URIs de ficheiro"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:664
+msgid "Whether to allow universal access from file URIs"
+msgstr "Indica se permitir o acceso universal desde os URI de ficheiro"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:679
+#| msgid "Enable Scripts"
+msgid "Enable DOM paste"
+msgstr "Activar o pegado de DOM"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:680
+msgid "Whether to enable DOM paste"
+msgstr "Indica se activar o pegado de DOM"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:698
+msgid "Tab key cycles through elements"
+msgstr "A tecla de tabulación móvese ciclicamente a través dos elementos"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:699
+msgid "Whether the tab key cycles through elements on the page."
+msgstr ""
+"Indica se a tecla de tabulación móvese ciclicamente a través dos elementos "
+"nunha da páxina."
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:719
+msgid "Enable Default Context Menu"
+msgstr "Activar o menú contextual predefinido"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:720
+msgid ""
+"Enables the handling of right-clicks for the creation of the default context "
+"menu"
+msgstr ""
+"Activa a xestión dos clic dereitos para a creación do menú contextual "
+"predefinido"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:740
+msgid "Enable Site Specific Quirks"
+msgstr "Activar as solucións específicas dun sitio"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:741
+msgid "Enables the site-specific compatibility workarounds"
+msgstr "Activa os arranxos de compatibilidade específicos dun sitio"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:763
+msgid "Enable page cache"
+msgstr "Activar a caché de páxina"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:764
+#| msgid "Whether background images should be printed."
+msgid "Whether the page cache should be used"
+msgstr "Indica se se debería usar a caché de páxina"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:784
+msgid "Auto Resize Window"
+msgstr "Autoredimentsionar a xanela"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:785
+msgid "Automatically resize the toplevel window when a page requests it"
+msgstr ""
+"Redimensionar automaticamente a xanela de nivel superior cando a páxina o "
+"solicite"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:817
+#| msgid "Enable JavaScript profiling"
+msgid "Enable Java Applet"
+msgstr "Activar os Applet de Java"
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:818
+msgid "Whether Java Applet support through <applet> should be enabled"
+msgstr ""
+"Indica se se debería activar a compatibilidade dos Applet de Java a través "
+"de <applet>"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2319
+msgid "Returns the @web_view's document title"
+msgstr "Devolve o título do documento do @web_view"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2333
+msgid "Returns the current URI of the contents displayed by the @web_view"
+msgstr "Devolve o URI actual dos contidos mostrados polo @web_view"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2346
+msgid "Copy target list"
+msgstr "Copiar lista de destinos"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2347
+msgid "The list of targets this web view supports for clipboard copying"
+msgstr ""
+"A lista de destinos para os cales esta visualización web ten compatibilidade "
+"para copiar no portarretallos"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2360
+msgid "Paste target list"
+msgstr "Pegar lista de destinos"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2361
+msgid "The list of targets this web view supports for clipboard pasting"
+msgstr ""
+"A lista de destinos para os que esta visualización web ten compatibilidade "
+"para pegar no portarretallos"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2367
+msgid "Settings"
+msgstr "Configuracións"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2368
+msgid "An associated WebKitWebSettings instance"
+msgstr "Unha instancia de WebKitWebSettings asociada"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2381
+msgid "Web Inspector"
+msgstr "Inspector web"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2382
+msgid "The associated WebKitWebInspector instance"
+msgstr "A instancia de WebKitWebInspector asociada"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2402
+msgid "Editable"
+msgstr "Editábel"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2403
+msgid "Whether content can be modified by the user"
+msgstr "Indica se o contido pode ser modificado polo usuario"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2409
+msgid "Transparent"
+msgstr "Transparente"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2410
+msgid "Whether content has a transparent background"
+msgstr "Indica se o contido pode ter un fondo transparente"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2423
+msgid "Zoom level"
+msgstr "Nivel de zoom"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2424
+msgid "The level of zoom of the content"
+msgstr "O nivel de zoom do contido"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2439
+msgid "Full content zoom"
+msgstr "Zoom de contido completo"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2440
+msgid "Whether the full content is scaled when zooming"
+msgstr "Indica se o contido completo é escalado ao facer zoom"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2453
+msgid "Encoding"
+msgstr "Codificación"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2454
+msgid "The default encoding of the web view"
+msgstr "A codificación predefinida para a visualización web"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2467
+msgid "Custom Encoding"
+msgstr "Codificación personalizada"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2468
+msgid "The custom encoding of the web view"
+msgstr "A codificación personalizada para a visualización web"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2520
+msgid "Icon URI"
+msgstr "URI da icona"
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2521
+msgid "The URI for the favicon for the #WebKitWebView."
+msgstr "O URI do favicon para o #WebKitWebView."
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:55
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:60
+msgid "Submit"
+msgstr "Enviar"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:65
+msgid "Reset"
+msgstr "Restabelecer"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:70
+msgid "This is a searchable index. Enter search keywords: "
+msgstr "Este é un índice buscábel. Insira as palabras chave de búsqueda:"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:75
+msgid "Choose File"
+msgstr "Seleccionar ficheiro"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:80
+msgid "(None)"
+msgstr "(ningún)"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:85
+msgid "Open Link in New _Window"
+msgstr "Abrir a ligazón nunha nova _xanela"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:90
+msgid "_Download Linked File"
+msgstr "_Descargar o ficheiro ligado"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:95
+msgid "Copy Link Loc_ation"
+msgstr "Copiar a loc_alización da ligazón"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:100
+msgid "Open _Image in New Window"
+msgstr "Abrir _imaxe nunha nova xanela"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:105
+msgid "Sa_ve Image As"
+msgstr "Gar_dar imaxe como"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:110
+msgid "Cop_y Image"
+msgstr "Co_piar imaxe"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:115
+msgid "Open _Frame in New Window"
+msgstr "Abrir _marco nunha nova xanela"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:166
+msgid "_Reload"
+msgstr "_Recargar"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:183
+msgid "No Guesses Found"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:188
+msgid "_Ignore Spelling"
+msgstr "_Ignorar corrección ortográfica"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:193
+msgid "_Learn Spelling"
+msgstr "Apren_er corrección ortográfica"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:198
+msgid "_Search the Web"
+msgstr "_Buscar na web"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:203
+msgid "_Look Up in Dictionary"
+msgstr "_Buscar no dicionario"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:208
+msgid "_Open Link"
+msgstr "_Abrir ligazón"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:213
+msgid "Ignore _Grammar"
+msgstr "Ignorar _gramática"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:218
+msgid "Spelling and _Grammar"
+msgstr "Corrección ortográfica e _gramatical"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:223
+msgid "_Show Spelling and Grammar"
+msgstr "_Mostrar corrección ortográfica e gramatical"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:223
+msgid "_Hide Spelling and Grammar"
+msgstr "_Agochar corrección ortográfica e gramatical"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:228
+msgid "_Check Document Now"
+msgstr "_Comprobar o documento agora"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:233
+msgid "Check Spelling While _Typing"
+msgstr "Comprobar ortografía ao _escribir"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:238
+msgid "Check _Grammar With Spelling"
+msgstr "Comprobar _gramática ao escribir"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:243
+msgid "_Font"
+msgstr "_Tipo de fonte"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:266
+msgid "_Outline"
+msgstr "_Contorno"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:271
+msgid "Inspect _Element"
+msgstr "Inspeccionar _elemento"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:276
+msgid "No recent searches"
+msgstr "Non hai buscas recentes"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:281
+msgid "Recent searches"
+msgstr "Buscas recentes"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:286
+msgid "_Clear recent searches"
+msgstr "_Limpar as buscas recentes"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:291
+msgid "term"
+msgstr "termo"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:296
+msgid "definition"
+msgstr "definición"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:301
+msgid "press"
+msgstr "premer"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:306
+msgid "select"
+msgstr "seleccionar"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:311
+msgid "activate"
+msgstr "activado"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:316
+msgid "uncheck"
+msgstr "desmarcar"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:321
+msgid "check"
+msgstr "marcar"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:326
+msgid "jump"
+msgstr "saltar"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:342
+msgid " files"
+msgstr " ficheiros"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:347
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:364
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:369
+msgid "Live Broadcast"
+msgstr "Retransmisión en vivo"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:375
+msgid "audio element controller"
+msgstr "controlador do elemento de son"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:377
+msgid "video element controller"
+msgstr "controlador de elemento de vídeo"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:379
+msgid "mute"
+msgstr "enmudecer"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:381
+msgid "unmute"
+msgstr "desenmudecer"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:383
+msgid "play"
+msgstr "reproducir"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:385
+msgid "pause"
+msgstr "pausar"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:387
+msgid "movie time"
+msgstr "tempo do filme"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:389
+msgid "timeline slider thumb"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:391
+msgid "back 30 seconds"
+msgstr "abrás 30 segundos"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:393
+msgid "return to realtime"
+msgstr "voltar ao tempo real"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:395
+msgid "elapsed time"
+msgstr "tempo transcorrido"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:397
+msgid "remaining time"
+msgstr "tempo restante"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:399
+#| msgid "Status"
+msgid "status"
+msgstr "estado"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:401
+msgid "fullscreen"
+msgstr "pantalla completa"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:403
+msgid "fast forward"
+msgstr "avance rápido"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:405
+msgid "fast reverse"
+msgstr "retroceso rápido"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:407
+msgid "show closed captions"
+msgstr "mostrar os subtítulos pechados"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:409
+msgid "hide closed captions"
+msgstr "ocultar os subtítulos pechados"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:418
+msgid "audio element playback controls and status display"
+msgstr "controis e xanela de estado de reprodución dos elementos de son"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:420
+msgid "video element playback controls and status display"
+msgstr "controis e xanela de estado de reprodución dos elementos de vídeo"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:422
+msgid "mute audio tracks"
+msgstr "enmudecer as pistas de son"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:424
+msgid "unmute audio tracks"
+msgstr "desenmudecer as pistas de son"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:426
+msgid "begin playback"
+msgstr "comezar a reprodución"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:428
+msgid "pause playback"
+msgstr "pausar a reprodución"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:430
+msgid "movie time scrubber"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:432
+msgid "movie time scrubber thumb"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:434
+msgid "seek movie back 30 seconds"
+msgstr "buscar cara atrás no filme 30 segundos"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:436
+msgid "return streaming movie to real time"
+msgstr "devolver a reprodución en vivo do filme ao tempo real"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:438
+msgid "current movie time in seconds"
+msgstr "tempo actual do filme en segundos"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:440
+msgid "number of seconds of movie remaining"
+msgstr "números de segundos que faltan do filme"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:442
+msgid "current movie status"
+msgstr "estado do filme actual"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:444
+msgid "seek quickly back"
+msgstr "buscar cara atrás rápidamente"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:446
+msgid "seek quickly forward"
+msgstr "buscar cara adiante rápidamente"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:448
+msgid "Play movie in fullscreen mode"
+msgstr "Reproducir o filme en pantalla completa"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:450
+msgid "start displaying closed captions"
+msgstr "comezar a mostrar os subtítulos pechados"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:452
+msgid "stop displaying closed captions"
+msgstr "parar de mostrar os subtítulos pechados"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:461
+#| msgid "definition"
+msgid "indefinite time"
+msgstr "tempo non definido"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:491
+msgid "value missing"
+msgstr "falta o valor"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:497
+msgid "type mismatch"
+msgstr "tipo non coincidente"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:502
+msgid "pattern mismatch"
+msgstr "patron non coincidente"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:507
+msgid "too long"
+msgstr "demasiado longo"
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:512
+msgid "range underflow"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:517
+msgid "range overflow"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:522
+msgid "step mismatch"
+msgstr "paso non coincidente"
+
+#~ msgid "_Searchable Index"
+#~ msgstr "Índice bu_scábel"
--- WebKit/gtk/po/it.po~
+++ WebKit/gtk/po/it.po~
@@ -1,19 +1,18 @@
# This is the Italian locale translation for WebKitGtk
# Copyright (C) 2009 Free Software Foundation, Inc.
-#
-# Luca Ferretti <elle.uca at libero.it>, 2009.
+# Luca Ferretti <lferrett at gnome.org>, 2009, 2010.
msgid ""
msgstr ""
"Project-Id-Version: WebKitGtk\n"
"Report-Msgid-Bugs-To: http://bugs.webkit.org/\n"
"POT-Creation-Date: 2010-02-25 15:53-0300\n"
-"PO-Revision-Date: 2009-05-11 14:10+0200\n"
-"Last-Translator: Luca Ferretti <elle.uca at libero.it>\n"
+"PO-Revision-Date: 2010-03-18 22:13+0100\n"
+"Last-Translator: Luca Ferretti <lferrett at gnome.org>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:535
msgid "Upload File"
@@ -22,63 +21,63 @@
#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:61
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:143
msgid "Input _Methods"
-msgstr "_Metodi di input"
+msgstr "Met_odi di input"
# merge da gtk
#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:78
msgid "LRM _Left-to-right mark"
-msgstr "LRM marcatura _sinistra-destra"
+msgstr "LRM - Contrassegno _sinistra-destra"
# merge da gtk
#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:79
msgid "RLM _Right-to-left mark"
-msgstr "RLM marcatura _destra-sinistra"
+msgstr "RLM - Contrassegno _destra-sinistra"
# merge da gtk
#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:80
msgid "LRE Left-to-right _embedding"
-msgstr "LRE _inserimento sinistra-destra"
+msgstr "LRE - _Inserimento sinistra-destra"
# merge da gtk
#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:81
msgid "RLE Right-to-left e_mbedding"
-msgstr "RLE i_nserimento destra-sinistra"
+msgstr "RLE - I_nserimento destra-sinistra"
# merge da gtk
#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:82
msgid "LRO Left-to-right _override"
-msgstr "LRO _forza sinistra-destra"
+msgstr "LRO - _Forza sinistra-destra"
# merge da gtk
#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:83
msgid "RLO Right-to-left o_verride"
-msgstr "RLO f_orza destra-sinistra"
+msgstr "RLO - F_orza destra-sinistra"
# merge da gtk
#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:84
msgid "PDF _Pop directional formatting"
-msgstr "PDF cancella formattazione direzionale"
+msgstr "PDF - Ca_ttura formattazione direzionale"
# merge da gtk
#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:85
msgid "ZWS _Zero width space"
-msgstr "ZWS spa_zio a larghezza nulla"
+msgstr "ZWS - Spa_zio a larghezza nulla"
# merge da gtk
#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:86
msgid "ZWJ Zero width _joiner"
-msgstr "ZWJ spazio di _unione a larghezza nulla"
+msgstr "ZWJ - Spazio di _unione a larghezza nulla"
# merge da gtk
#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:87
msgid "ZWNJ Zero width _non-joiner"
-msgstr "ZWNJ spazio _non di unione a larghezza nulla"
+msgstr "ZWNJ - Spazio non di unione a _larghezza nulla"
# merge da gtk
#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:109
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:138
msgid "_Insert Unicode Control Character"
-msgstr "_Inserisci carattere di controllo unicode"
+msgstr "Inserisci carattere di controllo _Unicode"
#: WebKit/gtk/webkit/webkitdownload.cpp:266
msgid "Network Request"
@@ -89,14 +88,12 @@
msgstr "La richiesta di rete per l'URI che dovrebbe essere scaricato"
#: WebKit/gtk/webkit/webkitdownload.cpp:281
-#, fuzzy
msgid "Network Response"
-msgstr "Richiesta di rete"
+msgstr "Risposta di rete"
#: WebKit/gtk/webkit/webkitdownload.cpp:282
-#, fuzzy
msgid "The network response for the URI that should be downloaded"
-msgstr "La richiesta di rete per l'URI che dovrebbe essere scaricato"
+msgstr "La risposta di rete per l'URI che dovrebbe essere scaricato"
#: WebKit/gtk/webkit/webkitdownload.cpp:296
msgid "Destination URI"
@@ -157,7 +154,7 @@
#: WebKit/gtk/webkit/webkitsoupauthdialog.c:278
msgid "Server message:"
-msgstr ""
+msgstr "Messaggio del server:"
#: WebKit/gtk/webkit/webkitsoupauthdialog.c:291
msgid "Username:"
@@ -169,9 +166,8 @@
# checkbox
#: WebKit/gtk/webkit/webkitsoupauthdialog.c:302
-#, fuzzy
msgid "_Remember password"
-msgstr "Ricordare la password"
+msgstr "_Ricordare la password"
#: WebKit/gtk/webkit/webkitwebframe.cpp:298
msgid "Name"
@@ -203,22 +199,24 @@
#: WebKit/gtk/webkit/webkitwebframe.cpp:344
msgid "Horizontal Scrollbar Policy"
-msgstr ""
+msgstr "Politica barra scorrimento orizzontale"
#: WebKit/gtk/webkit/webkitwebframe.cpp:345
-#, fuzzy
msgid ""
"Determines the current policy for the horizontal scrollbar of the frame."
-msgstr "Determina l'avanzamento corrente dello scaricamento"
+msgstr ""
+"Determina la politica attuale per la barra di scorrimento orizzontale della "
+"cornice."
#: WebKit/gtk/webkit/webkitwebframe.cpp:362
msgid "Vertical Scrollbar Policy"
-msgstr ""
+msgstr "Politica barra scorrimento verticale"
#: WebKit/gtk/webkit/webkitwebframe.cpp:363
-#, fuzzy
msgid "Determines the current policy for the vertical scrollbar of the frame."
-msgstr "Determina l'avanzamento corrente dello scaricamento"
+msgstr ""
+"Determina la politica attuale per la barra di scorrimento verticale del "
+"cornice."
#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:147
msgid "The title of the history item"
@@ -274,7 +272,7 @@
#: WebKit/gtk/webkit/webkitwebinspector.cpp:299
msgid "Enable JavaScript profiling"
-msgstr "Abilitare profiling JavaScript"
+msgstr "Abilita profiling JavaScript"
# FIXME
# oppure Esegue il profiling?
@@ -283,13 +281,12 @@
msgstr "Traccia un profilo del codice JavaScript eseguito."
#: WebKit/gtk/webkit/webkitwebinspector.cpp:315
-#, fuzzy
msgid "Enable Timeline profiling"
-msgstr "Abilitare profiling JavaScript"
+msgstr "Abilita profiling Timeline"
#: WebKit/gtk/webkit/webkitwebinspector.cpp:316
msgid "Profile the WebCore instrumentation."
-msgstr ""
+msgstr "Traccia un profilo della strumentazione WebCore."
#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:158
msgid "Reason"
@@ -320,14 +317,12 @@
msgstr "Una maschera di bit che rappresenta lo stato dei tasti modificatori"
#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:220
-#, fuzzy
msgid "Target frame"
-msgstr "Il nome della cornice"
+msgstr "Cornice destinazione"
#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:221
-#, fuzzy
msgid "The target frame for the navigation"
-msgstr "L'URI che è stata richiesta come destinazione della navigazione"
+msgstr "La cornice di destinazione per la navigazione"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:237
msgid "Default Encoding"
@@ -545,155 +540,159 @@
#: WebKit/gtk/webkit/webkitwebsettings.cpp:481
msgid "Enable Spell Checking"
-msgstr ""
+msgstr "Abilita controllo ortografico"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:482
-#, fuzzy
msgid "Enables spell checking while typing"
-msgstr "Controlla ortografia durante _digitazione"
+msgstr "Abilita il controllo ortografico durante la digitazione"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:505
msgid "Languages to use for spell checking"
-msgstr ""
+msgstr "Lingue da usare per controllo ortografico"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:506
msgid "Comma separated list of languages to use for spell checking"
msgstr ""
+"Elenco separato da virgole delle lingue da usare per il controllo ortografico"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:520
-#, fuzzy
msgid "Enable Caret Browsing"
-msgstr "Abilita navigazione privata"
+msgstr "Abilita navigazione con cursore"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:521
msgid "Whether to enable accesibility enhanced keyboard navigation"
msgstr ""
+"Indica se abilitare la navigazione da tastiera ottimizzata per "
+"l'accessibilità"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:536
msgid "Enable HTML5 Database"
-msgstr ""
+msgstr "Abilita Database HTML5"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:537
msgid "Whether to enable HTML5 database support"
-msgstr ""
+msgstr "Indica se abilitare il supporto ai database di HTML5"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:552
msgid "Enable HTML5 Local Storage"
-msgstr ""
+msgstr "Abilita Local Storage HTML5"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:553
msgid "Whether to enable HTML5 Local Storage support"
-msgstr ""
+msgstr "Indica se abilitare il supporto a local storage di HTML5"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:567
-#, fuzzy
msgid "Enable XSS Auditor"
-msgstr "Abilita script"
+msgstr "Abilita auditor XSS"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:568
msgid "Whether to enable teh XSS auditor"
-msgstr ""
+msgstr "Indica se abilitare l'auditor XSS"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:586
msgid "User Agent"
-msgstr ""
+msgstr "User Agent"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:587
msgid "The User-Agent string used by WebKitGtk"
-msgstr ""
+msgstr "La stringa User-Agent usata da WebKitGtk"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:602
msgid "JavaScript can open windows automatically"
-msgstr ""
+msgstr "JavaScript può aprire automatamente le fineste"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:603
msgid "Whether JavaScript can open windows automatically"
-msgstr ""
+msgstr "Indica se JavaScript può aprire automatamente le fineste"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:618
msgid "Enable offline web application cache"
-msgstr ""
+msgstr "Abilita cache per applicazioni web fuori rete"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:619
msgid "Whether to enable offline web application cache"
-msgstr ""
+msgstr "Indica se abilitare la cache per le applicazioni web fuori rete"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:646
msgid "Editing behavior"
-msgstr ""
+msgstr "Comportamento editing"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:647
msgid "The behavior mode to use in editing mode"
-msgstr ""
+msgstr "La modalità di comportamento da usare in modalità editing"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:663
msgid "Enable universal access from file URIs"
-msgstr ""
+msgstr "Abilita accesso univesale dagli URI di file"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:664
msgid "Whether to allow universal access from file URIs"
-msgstr ""
+msgstr "Indica se abilitare l'accesso univesale dagli URI di file"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:679
-#, fuzzy
msgid "Enable DOM paste"
-msgstr "Abilita script"
+msgstr "Abilita DOM pasting"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:680
msgid "Whether to enable DOM paste"
-msgstr ""
+msgstr "Indica se abilitare il DOM pasting"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:698
msgid "Tab key cycles through elements"
-msgstr ""
+msgstr "Tasto TAB per passare tra gli elementi"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:699
msgid "Whether the tab key cycles through elements on the page."
msgstr ""
+"Indica se il tasto TAB permette di passare ciclicamente tra gli elementi "
+"della pagina."
#: WebKit/gtk/webkit/webkitwebsettings.cpp:719
msgid "Enable Default Context Menu"
-msgstr ""
+msgstr "Abilita menù contestuale predefinito"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:720
msgid ""
"Enables the handling of right-clicks for the creation of the default context "
"menu"
msgstr ""
+"Abilita la gestione dei clic destri per la creazione del menù contestuale "
+"predefinito"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:740
msgid "Enable Site Specific Quirks"
-msgstr ""
+msgstr "Abilita scappatoie specifiche per siti"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:741
msgid "Enables the site-specific compatibility workarounds"
msgstr ""
+"Abilita delle correzioni di compatibilità specifiche per determinati siti"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:763
msgid "Enable page cache"
-msgstr ""
+msgstr "Abilita la cache di pagina"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:764
-#, fuzzy
msgid "Whether the page cache should be used"
-msgstr "Indica se le immagini di sfondo devono essere stampate."
+msgstr "Indica se usare la cache delle pagine"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:784
msgid "Auto Resize Window"
-msgstr ""
+msgstr "Ridimensionamento automatico finestra"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:785
msgid "Automatically resize the toplevel window when a page requests it"
msgstr ""
+"Ridimensiona automaticamente la finestra di livello principale quando "
+"richiesto da una pagina"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:817
-#, fuzzy
msgid "Enable Java Applet"
-msgstr "Abilitare profiling JavaScript"
+msgstr "Abilita applet Java"
#: WebKit/gtk/webkit/webkitwebsettings.cpp:818
msgid "Whether Java Applet support through <applet> should be enabled"
-msgstr ""
+msgstr "Indica se abilitare il supporto alle applet Java attraverso <applet>"
#: WebKit/gtk/webkit/webkitwebview.cpp:2319
msgid "Returns the @web_view's document title"
@@ -791,11 +790,11 @@
#: WebKit/gtk/webkit/webkitwebview.cpp:2520
msgid "Icon URI"
-msgstr ""
+msgstr "URI di icona"
#: WebKit/gtk/webkit/webkitwebview.cpp:2521
msgid "The URI for the favicon for the #WebKitWebView."
-msgstr ""
+msgstr "L'URI per la favicon della #WebKitWebView."
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:55
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:60
@@ -809,6 +808,7 @@
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:70
msgid "This is a searchable index. Enter search keywords: "
msgstr ""
+"Questo indice consente ricerche. Inserire la parole chiave da cercare: "
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:75
msgid "Choose File"
@@ -984,193 +984,188 @@
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:364
msgid "Loading..."
-msgstr ""
+msgstr "Caricamento..."
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:369
msgid "Live Broadcast"
-msgstr ""
+msgstr "Diffusione live"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:375
msgid "audio element controller"
-msgstr ""
+msgstr "controllore elemento audio"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:377
msgid "video element controller"
-msgstr ""
+msgstr "controllore elemento video"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:379
msgid "mute"
-msgstr ""
+msgstr "escludi audio"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:381
msgid "unmute"
-msgstr ""
+msgstr "abilita audio"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:383
msgid "play"
-msgstr ""
+msgstr "riproduci"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:385
msgid "pause"
-msgstr ""
+msgstr "pausa"
+# name == "Slider"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:387
msgid "movie time"
-msgstr ""
+msgstr "tempo filmato"
+# name == "SliderThumb"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:389
msgid "timeline slider thumb"
-msgstr ""
+msgstr "cursore dello scorrevole per linea temporale"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:391
msgid "back 30 seconds"
-msgstr ""
+msgstr "indietro 30 secondi"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:393
msgid "return to realtime"
-msgstr ""
+msgstr "ritorna a tempo effettivo"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:395
msgid "elapsed time"
-msgstr ""
+msgstr "tempo trascorso"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:397
msgid "remaining time"
-msgstr ""
+msgstr "tempo rimanente"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:399
-#, fuzzy
msgid "status"
-msgstr "Stato"
+msgstr "stato"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:401
msgid "fullscreen"
-msgstr ""
+msgstr "schermo intero"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:403
msgid "fast forward"
-msgstr ""
+msgstr "avanti veloce"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:405
msgid "fast reverse"
-msgstr ""
+msgstr "indietro veloce"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:407
msgid "show closed captions"
-msgstr ""
+msgstr "mostra sottotitoli"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:409
msgid "hide closed captions"
-msgstr ""
+msgstr "nascondi sottotitoli"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:418
msgid "audio element playback controls and status display"
-msgstr ""
+msgstr "controlli di riproduzione e visualizzazione stato di elementi audio"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:420
msgid "video element playback controls and status display"
-msgstr ""
+msgstr "controlli di riproduzione e visualizzazione stato di elementi video"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:422
msgid "mute audio tracks"
-msgstr ""
+msgstr "escludi tracce audio"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:424
msgid "unmute audio tracks"
-msgstr ""
+msgstr "abilita tracce audio"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:426
msgid "begin playback"
-msgstr ""
+msgstr "inizia la riproduzione"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:428
msgid "pause playback"
-msgstr ""
+msgstr "mette in pausa la riproduzione"
+# non so se è corretto... per induzione dovrebbe
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:430
msgid "movie time scrubber"
-msgstr ""
+msgstr "cambia con trascinamento il tempo del filmato"
+# non so se è corretto... per induzione dovrebbe
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:432
msgid "movie time scrubber thumb"
-msgstr ""
+msgstr "cursore per cambiare con trascinamento il tempo del filmato"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:434
msgid "seek movie back 30 seconds"
-msgstr ""
+msgstr "posiziona il filmato indietro di 30 secondi"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:436
msgid "return streaming movie to real time"
-msgstr ""
+msgstr "riporta il filmato in streaming al tempo reale"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:438
msgid "current movie time in seconds"
-msgstr ""
+msgstr "tempo corrente del filmato in secondi"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:440
msgid "number of seconds of movie remaining"
-msgstr ""
+msgstr "numero di secondi rimanenti del filmato"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:442
msgid "current movie status"
-msgstr ""
+msgstr "stato attuale del filmato"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:444
msgid "seek quickly back"
-msgstr ""
+msgstr "posiziona indietro rapidamente"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:446
msgid "seek quickly forward"
-msgstr ""
+msgstr "posiziona avanti rapidamente"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:448
msgid "Play movie in fullscreen mode"
-msgstr ""
+msgstr "Riproduce il filmato in modalità schermo intero"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:450
msgid "start displaying closed captions"
-msgstr ""
+msgstr "avvia la visualizzazione dei sottotitoli"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:452
msgid "stop displaying closed captions"
-msgstr ""
+msgstr "interrompe la visualizzazione dei sottotitoli"
-# String AXDefinitionListDefinitionText()
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:461
-#, fuzzy
msgid "indefinite time"
-msgstr "definizione"
+msgstr "tempo indefinito"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:491
msgid "value missing"
-msgstr ""
+msgstr "valore mancante"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:497
msgid "type mismatch"
-msgstr ""
+msgstr "discrepanza di tipo"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:502
msgid "pattern mismatch"
-msgstr ""
+msgstr "discrepanza di modello"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:507
msgid "too long"
-msgstr ""
+msgstr "troppo lungo"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:512
msgid "range underflow"
-msgstr ""
+msgstr "superamento limite inferiore dell'intervallo"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:517
msgid "range overflow"
-msgstr ""
+msgstr "superamento limite superiore dell'intervallo"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:522
msgid "step mismatch"
-msgstr ""
-
-# FIXME
-# https://bugs.webkit.org/show_bug.cgi?id=25375
-# Aperto bug chiedeno lumi...
-#~ msgid "_Searchable Index"
-#~ msgstr "Indice _cercabile"
+msgstr "discrepanza di passo"
--- WebKit/gtk/po/nl.po~
+++ WebKit/gtk/po/nl.po~
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: webkit 1.1.10\n"
"Report-Msgid-Bugs-To: http://bugs.webkit.org/\n"
-"POT-Creation-Date: 2010-02-25 15:53-0300\n"
-"PO-Revision-Date: 2009-07-05 18:58+0100\n"
+"POT-Creation-Date: 2010-02-16 15:01-0200\n"
+"PO-Revision-Date: 2010-03-22 00:27+0100\n"
"Last-Translator: Reinout van Schouwen <reinouts at gnome.org>\n"
"Language-Team: Dutch <vertaling at vrijschrift.org>\n"
"MIME-Version: 1.0\n"
@@ -68,97 +68,90 @@
msgid "_Insert Unicode Control Character"
msgstr "_Unicode controleteken invoegen "
-#: WebKit/gtk/webkit/webkitdownload.cpp:266
+#: WebKit/gtk/webkit/webkitdownload.cpp:262
msgid "Network Request"
msgstr "Netwerkaanvraag"
-#: WebKit/gtk/webkit/webkitdownload.cpp:267
+#: WebKit/gtk/webkit/webkitdownload.cpp:263
msgid "The network request for the URI that should be downloaded"
msgstr "De netwerkaanvraag voor de te downloaden URI"
-#: WebKit/gtk/webkit/webkitdownload.cpp:281
-#, fuzzy
+#: WebKit/gtk/webkit/webkitdownload.cpp:277
msgid "Network Response"
-msgstr "Netwerkaanvraag"
+msgstr "Netwerkantwoord"
-#: WebKit/gtk/webkit/webkitdownload.cpp:282
-#, fuzzy
+#: WebKit/gtk/webkit/webkitdownload.cpp:278
msgid "The network response for the URI that should be downloaded"
-msgstr "De netwerkaanvraag voor de te downloaden URI"
+msgstr "Het netwerkantwoord voor de te downloaden URI"
-#: WebKit/gtk/webkit/webkitdownload.cpp:296
+#: WebKit/gtk/webkit/webkitdownload.cpp:292
msgid "Destination URI"
msgstr "Bestemmings-URI"
-#: WebKit/gtk/webkit/webkitdownload.cpp:297
+#: WebKit/gtk/webkit/webkitdownload.cpp:293
msgid "The destination URI where to save the file"
msgstr "De bestemmings-URI waar dit bestand opgeslagen moet worden"
-#: WebKit/gtk/webkit/webkitdownload.cpp:311
+#: WebKit/gtk/webkit/webkitdownload.cpp:307
msgid "Suggested Filename"
msgstr "Gesuggereerde bestandsnaam"
-#: WebKit/gtk/webkit/webkitdownload.cpp:312
+#: WebKit/gtk/webkit/webkitdownload.cpp:308
msgid "The filename suggested as default when saving"
msgstr "De standaard gesuggereerde bestandsnaam bij het opslaan"
-#: WebKit/gtk/webkit/webkitdownload.cpp:329
+#: WebKit/gtk/webkit/webkitdownload.cpp:325
msgid "Progress"
msgstr "Voortgang"
-#: WebKit/gtk/webkit/webkitdownload.cpp:330
+#: WebKit/gtk/webkit/webkitdownload.cpp:326
msgid "Determines the current progress of the download"
msgstr "Bepaalt de huidige voortgang van de download"
-#: WebKit/gtk/webkit/webkitdownload.cpp:343
+#: WebKit/gtk/webkit/webkitdownload.cpp:339
msgid "Status"
msgstr "Status"
-#: WebKit/gtk/webkit/webkitdownload.cpp:344
+#: WebKit/gtk/webkit/webkitdownload.cpp:340
msgid "Determines the current status of the download"
msgstr "Bepaalt de huidige status van de download"
-#: WebKit/gtk/webkit/webkitdownload.cpp:359
+#: WebKit/gtk/webkit/webkitdownload.cpp:355
msgid "Current Size"
msgstr "Huidige grootte"
-#: WebKit/gtk/webkit/webkitdownload.cpp:360
+#: WebKit/gtk/webkit/webkitdownload.cpp:356
msgid "The length of the data already downloaded"
msgstr "De hoeveelheid reeds gedownloade data"
-#: WebKit/gtk/webkit/webkitdownload.cpp:374
+#: WebKit/gtk/webkit/webkitdownload.cpp:370
msgid "Total Size"
msgstr "Totale grootte"
-#: WebKit/gtk/webkit/webkitdownload.cpp:375
+#: WebKit/gtk/webkit/webkitdownload.cpp:371
msgid "The total size of the file"
msgstr "De totale grootte van het bestand"
-#: WebKit/gtk/webkit/webkitdownload.cpp:526
+#: WebKit/gtk/webkit/webkitdownload.cpp:522
msgid "User cancelled the download"
msgstr "Downloaden door gebruiker gestopt"
-#: WebKit/gtk/webkit/webkitsoupauthdialog.c:248
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:244
#, c-format
msgid "A username and password are being requested by the site %s"
msgstr "De site %s vraagt een gebruikersnaam en wachtwoord"
-#: WebKit/gtk/webkit/webkitsoupauthdialog.c:278
-msgid "Server message:"
-msgstr ""
-
-#: WebKit/gtk/webkit/webkitsoupauthdialog.c:291
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:269
msgid "Username:"
msgstr "Gebruikersnaam:"
-#: WebKit/gtk/webkit/webkitsoupauthdialog.c:293
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:271
msgid "Password:"
msgstr "Wachtwoord:"
-#: WebKit/gtk/webkit/webkitsoupauthdialog.c:302
-#, fuzzy
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:280
msgid "_Remember password"
-msgstr "Wachtwoord onthouden"
+msgstr "_Wachtwoord onthouden"
#: WebKit/gtk/webkit/webkitwebframe.cpp:298
msgid "Name"
@@ -170,7 +163,7 @@
#: WebKit/gtk/webkit/webkitwebframe.cpp:305
#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:146
-#: WebKit/gtk/webkit/webkitwebview.cpp:2318
+#: WebKit/gtk/webkit/webkitwebview.cpp:2315
msgid "Title"
msgstr "Titel"
@@ -180,7 +173,7 @@
#: WebKit/gtk/webkit/webkitwebframe.cpp:312
#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:178
-#: WebKit/gtk/webkit/webkitwebview.cpp:2332
+#: WebKit/gtk/webkit/webkitwebview.cpp:2329
msgid "URI"
msgstr "URI"
@@ -190,22 +183,21 @@
#: WebKit/gtk/webkit/webkitwebframe.cpp:344
msgid "Horizontal Scrollbar Policy"
-msgstr ""
+msgstr "Beleid voor horizontale schuifbalk"
#: WebKit/gtk/webkit/webkitwebframe.cpp:345
-#, fuzzy
msgid ""
"Determines the current policy for the horizontal scrollbar of the frame."
-msgstr "Bepaalt de huidige voortgang van de download"
+msgstr ""
+"Bepaalt het beleid voor de horizontale schuifbalk van het frame"
#: WebKit/gtk/webkit/webkitwebframe.cpp:362
msgid "Vertical Scrollbar Policy"
-msgstr ""
+msgstr "Beleid voor verticale schuifbalk"
#: WebKit/gtk/webkit/webkitwebframe.cpp:363
-#, fuzzy
msgid "Determines the current policy for the vertical scrollbar of the frame."
-msgstr "Bepaalt de huidige voortgang van de download"
+msgstr "Bepaalt het huidige beleid voor de verticale schuifbalk van het frame."
#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:147
msgid "The title of the history item"
@@ -234,7 +226,7 @@
#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:210
msgid "Last visited Time"
-msgstr "Laatst bezocht op:"
+msgstr "Laatst bezocht op"
#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:211
msgid "The time at which the history item was last visited"
@@ -265,13 +257,12 @@
msgstr "De uitgevoerde JavaScript profileren."
#: WebKit/gtk/webkit/webkitwebinspector.cpp:315
-#, fuzzy
msgid "Enable Timeline profiling"
-msgstr "JavaScript-profilering inschakelen"
+msgstr "Tijdslijn-profilering inschakelen"
#: WebKit/gtk/webkit/webkitwebinspector.cpp:316
msgid "Profile the WebCore instrumentation."
-msgstr ""
+msgstr "De instrumentering van WebCore profileren."
#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:158
msgid "Reason"
@@ -302,444 +293,430 @@
msgstr "Een bitmask dat de staat van de optietoets representeert"
#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:220
-#, fuzzy
msgid "Target frame"
-msgstr "Naam van het frame"
+msgstr "Doelframe"
#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:221
-#, fuzzy
msgid "The target frame for the navigation"
-msgstr "De URI die werd aangevraagd als bestemming voor de navigatie"
+msgstr "Het doelframe voor de navigatie"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:237
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:233
msgid "Default Encoding"
msgstr "Standaardcodering"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:238
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:234
msgid "The default encoding used to display text."
msgstr "De standaardcodering om tekst weer te geven."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:246
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:242
msgid "Cursive Font Family"
msgstr "Cursive-lettertypefamilie"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:247
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:243
msgid "The default Cursive font family used to display text."
msgstr "De standaard Cursive-lettertypefamilie om tekst weer te geven."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:255
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:251
msgid "Default Font Family"
msgstr "Standaard lettertypefamilie"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:256
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:252
msgid "The default font family used to display text."
msgstr "De standaard lettertypefamilie om tekst weer te geven."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:264
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:260
msgid "Fantasy Font Family"
msgstr "Fantasy-lettertypefamilie"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:265
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:261
msgid "The default Fantasy font family used to display text."
msgstr "De standaard Fantasy-lettertypefamilie om tekst weer te geven."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:273
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:269
msgid "Monospace Font Family"
msgstr "Monospace-lettertypefamilie"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:274
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:270
msgid "The default font family used to display monospace text."
msgstr "De standaard lettertypefamilie om vaste-breedte-tekst weer te geven."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:282
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:278
msgid "Sans Serif Font Family"
msgstr "Sans Serif-lettertypefamilie"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:283
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:279
msgid "The default Sans Serif font family used to display text."
msgstr "De standaard Sans Serif-lettertypefamilie om tekst weer te geven."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:291
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:287
msgid "Serif Font Family"
msgstr "Serif-lettertypefamilie"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:292
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:288
msgid "The default Serif font family used to display text."
msgstr "De standaard Serif-lettertypefamilie om tekst weer te geven."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:300
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:296
msgid "Default Font Size"
msgstr "Standaard korpsgrootte"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:301
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:297
msgid "The default font size used to display text."
msgstr "De standaard korpsgrootte om tekst weer te geven."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:309
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:305
msgid "Default Monospace Font Size"
msgstr "Standaard Monospace-lettergrootte"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:310
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:306
msgid "The default font size used to display monospace text."
msgstr "De standaard lettergrootte om vaste-breedte-tekst weer te geven."
# Korpsgrootte/lettergrootte?
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:318
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:314
msgid "Minimum Font Size"
msgstr "Minimum korpsgrootte"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:319
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:315
msgid "The minimum font size used to display text."
msgstr "De minimum lettergrootte om tekst weer te geven."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:327
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:323
msgid "Minimum Logical Font Size"
msgstr "Minimum logische korpsgrootte"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:328
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:324
msgid "The minimum logical font size used to display text."
msgstr "De minimum logische korpsgrootte om tekst weer te geven."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:347
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:343
msgid "Enforce 96 DPI"
msgstr "96 DPI afdwingen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:348
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:344
msgid "Enforce a resolution of 96 DPI"
msgstr "Een resolutie van 96 DPI afdwingen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:356
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:352
msgid "Auto Load Images"
msgstr "Afbeeldingen automatisch laden"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:357
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:353
msgid "Load images automatically."
msgstr "Automatisch afbeeldingen laden."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:365
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:361
msgid "Auto Shrink Images"
msgstr "Afbeeldingen automatisch verkleinen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:366
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:362
msgid "Automatically shrink standalone images to fit."
msgstr "Automatisch losstaande afbeeldingen passend maken."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:374
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:370
msgid "Print Backgrounds"
msgstr "Achtergronden afdrukken"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:375
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:371
msgid "Whether background images should be printed."
msgstr "Of achtergrondafbeeldingen afgedrukt moeten worden."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:383
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:379
msgid "Enable Scripts"
msgstr "Scripts inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:384
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:380
msgid "Enable embedded scripting languages."
msgstr "Ingebedde scripttalen inschakelen."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:392
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:388
msgid "Enable Plugins"
msgstr "Plugins inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:393
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:389
msgid "Enable embedded plugin objects."
msgstr "Ingebedde plugin-objecten inschakelen."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:401
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:397
msgid "Resizable Text Areas"
msgstr "Tekstgebieden van grootte veranderbaar"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:402
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:398
msgid "Whether text areas are resizable."
msgstr "Of de grootte van tekstgebieden gewijzigd kan worden."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:409
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:405
msgid "User Stylesheet URI"
msgstr "URI van gebruikersstijlblad"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:410
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:406
msgid "The URI of a stylesheet that is applied to every page."
msgstr "De URI van een stijlblad dat wordt toegepast op elke pagina."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:425
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:421
msgid "Zoom Stepping Value"
msgstr "Stapgrootte voor in- en uitzoomen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:426
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:422
msgid "The value by which the zoom level is changed when zooming in or out."
msgstr ""
"De hoeveelheid waarmee het zoomniveau verandert bij het in- en uitzoomen."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:444
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:440
msgid "Enable Developer Extras"
msgstr "Extraatjes voor ontwikkelaars"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:445
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:441
msgid "Enables special extensions that help developers"
msgstr "Schakelt speciale uitbreidingen in die ontwikkelaars helpen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:465
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:461
msgid "Enable Private Browsing"
msgstr "Privé-browsen inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:466
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:462
msgid "Enables private browsing mode"
msgstr "Schakelt de stand voor privé-browsen in"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:481
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:477
msgid "Enable Spell Checking"
-msgstr ""
+msgstr "Spellingcontrole inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:482
-#, fuzzy
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:478
msgid "Enables spell checking while typing"
-msgstr "_Spelling controleren tijdens het typen"
+msgstr "Schakelt spellingcontrole tijdens het typen in"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:505
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:501
msgid "Languages to use for spell checking"
-msgstr ""
+msgstr "Te gebruiken talen bij spellingcontrole"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:506
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:502
msgid "Comma separated list of languages to use for spell checking"
-msgstr ""
+msgstr "Kommagescheiden lijst van talen voor spellingcontrole"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:520
-#, fuzzy
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:516
msgid "Enable Caret Browsing"
-msgstr "Privé-browsen inschakelen"
+msgstr "Cursor-browsen inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:521
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:517
msgid "Whether to enable accesibility enhanced keyboard navigation"
-msgstr ""
+msgstr "Of toegankelijkheidsgeoptimaliseerde toetsenbordnavigatie is ingeschakeld"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:536
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:532
msgid "Enable HTML5 Database"
-msgstr ""
+msgstr "HTML5-database inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:537
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:533
msgid "Whether to enable HTML5 database support"
-msgstr ""
+msgstr "Of HTML5-databaseondersteuning is ingeschakeld"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:552
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:548
msgid "Enable HTML5 Local Storage"
-msgstr ""
+msgstr "HTML5-lokale opslag inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:553
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:549
msgid "Whether to enable HTML5 Local Storage support"
-msgstr ""
+msgstr "Of HTML5-lokale opslag ingeschakeld moet zijn"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:567
-#, fuzzy
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:563
msgid "Enable XSS Auditor"
-msgstr "Scripts inschakelen"
+msgstr "XSS-auditor inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:568
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:564
msgid "Whether to enable teh XSS auditor"
-msgstr ""
+msgstr "Of de XSS-auditor is ingeschakeld"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:586
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:582
msgid "User Agent"
-msgstr ""
+msgstr "User-agent"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:587
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:583
msgid "The User-Agent string used by WebKitGtk"
-msgstr ""
+msgstr "De User-Agent-tekenreeks die WebKitGtk gebruikt"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:602
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:598
msgid "JavaScript can open windows automatically"
-msgstr ""
+msgstr "JavaScript kan automatisch vensters openen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:603
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:599
msgid "Whether JavaScript can open windows automatically"
-msgstr ""
+msgstr "Of JavaScript automatisch vensters kan openen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:618
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:614
msgid "Enable offline web application cache"
-msgstr ""
+msgstr "Offline webapplicatiebuffer inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:619
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:615
msgid "Whether to enable offline web application cache"
-msgstr ""
+msgstr "Of de offline webapplicatiebuffer is ingeschakeld"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:646
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:642
msgid "Editing behavior"
-msgstr ""
+msgstr "Gedrag bij bewerken"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:647
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:643
msgid "The behavior mode to use in editing mode"
-msgstr ""
+msgstr "De gedragsmodus in de bewerkingsstand"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:663
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:659
msgid "Enable universal access from file URIs"
-msgstr ""
+msgstr "Universele toegang vanaf bestands-URI's inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:664
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:660
msgid "Whether to allow universal access from file URIs"
-msgstr ""
+msgstr "Of universele toegang vanaf bestands-URI's is ingeschakeld"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:679
-#, fuzzy
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:675
msgid "Enable DOM paste"
-msgstr "Scripts inschakelen"
+msgstr "DOM-plakken inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:680
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:676
msgid "Whether to enable DOM paste"
-msgstr ""
+msgstr "Of plakken vanuit het DOM is ingeschakeld"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:698
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:694
msgid "Tab key cycles through elements"
-msgstr ""
+msgstr "Tab-toets wandelt door elementen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:699
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:695
msgid "Whether the tab key cycles through elements on the page."
-msgstr ""
+msgstr "Of de tab-toets door de elementen op de pagina wandelt."
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:719
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:715
msgid "Enable Default Context Menu"
-msgstr ""
+msgstr "Standaard-contextmenu inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:720
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:716
msgid ""
"Enables the handling of right-clicks for the creation of the default context "
"menu"
msgstr ""
+"Schakelt het afhandelen van klikken met de tweede muisknop in voor het creëren "
+"van het standaard contextmenu"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:740
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:736
msgid "Enable Site Specific Quirks"
-msgstr ""
+msgstr "Site-specifieke eigenaardigheden inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:741
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:737
msgid "Enables the site-specific compatibility workarounds"
-msgstr ""
+msgstr "Schakelt omzeilingen in voor compatibiliteit met specifieke websites"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:763
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:759
msgid "Enable page cache"
-msgstr ""
+msgstr "Paginabuffer inschakelen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:764
-#, fuzzy
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:760
msgid "Whether the page cache should be used"
-msgstr "Of achtergrondafbeeldingen afgedrukt moeten worden."
+msgstr "Of de paginabuffer gebruikt moet worden"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:784
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:780
msgid "Auto Resize Window"
-msgstr ""
+msgstr "Venstergrootte automatisch aanpassen"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:785
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:781
msgid "Automatically resize the toplevel window when a page requests it"
-msgstr ""
+msgstr "Grootte van topniveauvenster automatisch aanpassen wanneer pagina hierom vraagt"
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:817
-#, fuzzy
-msgid "Enable Java Applet"
-msgstr "JavaScript-profilering inschakelen"
-
-#: WebKit/gtk/webkit/webkitwebsettings.cpp:818
-msgid "Whether Java Applet support through <applet> should be enabled"
-msgstr ""
-
-#: WebKit/gtk/webkit/webkitwebview.cpp:2319
+#: WebKit/gtk/webkit/webkitwebview.cpp:2316
msgid "Returns the @web_view's document title"
msgstr "Geeft de documenttitel van de @web_view terug"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2333
+#: WebKit/gtk/webkit/webkitwebview.cpp:2330
msgid "Returns the current URI of the contents displayed by the @web_view"
msgstr "Geeft de huidige URI terug van de inhoud die de @web_view weergeeft"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2346
+#: WebKit/gtk/webkit/webkitwebview.cpp:2343
msgid "Copy target list"
msgstr "Kopieerdoellijst"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2347
+#: WebKit/gtk/webkit/webkitwebview.cpp:2344
msgid "The list of targets this web view supports for clipboard copying"
msgstr ""
"De lijst met targets die deze webweergave ondersteunt voor het kopiëren van "
"het klembord"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2360
+#: WebKit/gtk/webkit/webkitwebview.cpp:2357
msgid "Paste target list"
msgstr "Plakdoellijst"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2361
+#: WebKit/gtk/webkit/webkitwebview.cpp:2358
msgid "The list of targets this web view supports for clipboard pasting"
msgstr ""
"De lijst met targets die deze webview ondersteunt voor het plakken van het "
"klembord"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2367
+#: WebKit/gtk/webkit/webkitwebview.cpp:2364
msgid "Settings"
msgstr "Instellingen"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2368
+#: WebKit/gtk/webkit/webkitwebview.cpp:2365
msgid "An associated WebKitWebSettings instance"
msgstr "Een geassocieerde instantie van WebKitWebSettings"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2381
+#: WebKit/gtk/webkit/webkitwebview.cpp:2378
msgid "Web Inspector"
msgstr "Web-inspector"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2382
+#: WebKit/gtk/webkit/webkitwebview.cpp:2379
msgid "The associated WebKitWebInspector instance"
msgstr "De geassocieerde instantie van WebKitWebInspector"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2402
+#: WebKit/gtk/webkit/webkitwebview.cpp:2399
msgid "Editable"
msgstr "Bewerkbaar"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2403
+#: WebKit/gtk/webkit/webkitwebview.cpp:2400
msgid "Whether content can be modified by the user"
msgstr "Of de tekst gewijzigd kan worden door de gebruiker"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2409
+#: WebKit/gtk/webkit/webkitwebview.cpp:2406
msgid "Transparent"
msgstr "Transparant"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2410
+#: WebKit/gtk/webkit/webkitwebview.cpp:2407
msgid "Whether content has a transparent background"
msgstr "Of de inhoud een transparante achtergrond heeft"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2423
+#: WebKit/gtk/webkit/webkitwebview.cpp:2420
msgid "Zoom level"
msgstr "Zoomniveau"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2424
+#: WebKit/gtk/webkit/webkitwebview.cpp:2421
msgid "The level of zoom of the content"
msgstr "Zoomfactor van de inhoud"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2439
+#: WebKit/gtk/webkit/webkitwebview.cpp:2436
msgid "Full content zoom"
msgstr "Zoomen op volledige inhoud"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2440
+#: WebKit/gtk/webkit/webkitwebview.cpp:2437
msgid "Whether the full content is scaled when zooming"
msgstr "Of de volledige inhoud op schaal wordt gebracht bij het zoomen"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2453
+#: WebKit/gtk/webkit/webkitwebview.cpp:2450
msgid "Encoding"
msgstr "Codering"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2454
+#: WebKit/gtk/webkit/webkitwebview.cpp:2451
msgid "The default encoding of the web view"
msgstr "Standaard codering van de webweergave"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2467
+#: WebKit/gtk/webkit/webkitwebview.cpp:2464
msgid "Custom Encoding"
msgstr "Aangepaste codering"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2468
+#: WebKit/gtk/webkit/webkitwebview.cpp:2465
msgid "The custom encoding of the web view"
msgstr "De aangepaste codering van de webweergave"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2520
+#: WebKit/gtk/webkit/webkitwebview.cpp:2517
msgid "Icon URI"
-msgstr ""
+msgstr "Pictogram-URI"
-#: WebKit/gtk/webkit/webkitwebview.cpp:2521
+#: WebKit/gtk/webkit/webkitwebview.cpp:2518
msgid "The URI for the favicon for the #WebKitWebView."
-msgstr ""
+msgstr "De URI voor het favicon van de #WebKitWebView."
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:55
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:60
@@ -751,8 +728,8 @@
msgstr "Herinitialiseren"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:70
-msgid "This is a searchable index. Enter search keywords: "
-msgstr ""
+msgid "_Searchable Index"
+msgstr "Door_zoekbare index"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:75
msgid "Choose File"
@@ -914,39 +891,39 @@
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:364
msgid "Loading..."
-msgstr ""
+msgstr "Laden…"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:369
msgid "Live Broadcast"
-msgstr ""
+msgstr "Live-uitzending"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:375
msgid "audio element controller"
-msgstr ""
+msgstr "besturing audio-element"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:377
msgid "video element controller"
-msgstr ""
+msgstr "besturing video-element"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:379
msgid "mute"
-msgstr ""
+msgstr "dempen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:381
msgid "unmute"
-msgstr ""
+msgstr "geluid aan"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:383
msgid "play"
-msgstr ""
+msgstr "afspelen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:385
msgid "pause"
-msgstr ""
+msgstr "pauze"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:387
msgid "movie time"
-msgstr ""
+msgstr "afspeelduur"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:389
msgid "timeline slider thumb"
@@ -954,68 +931,67 @@
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:391
msgid "back 30 seconds"
-msgstr ""
+msgstr "30 seconden terug"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:393
msgid "return to realtime"
-msgstr ""
+msgstr "terug naar realtime"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:395
msgid "elapsed time"
-msgstr ""
+msgstr "verstreken tijd"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:397
msgid "remaining time"
-msgstr ""
+msgstr "tijd te gaan"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:399
-#, fuzzy
msgid "status"
-msgstr "Status"
+msgstr "status"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:401
msgid "fullscreen"
-msgstr ""
+msgstr "volledig scherm"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:403
msgid "fast forward"
-msgstr ""
+msgstr "snel vooruit"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:405
msgid "fast reverse"
-msgstr ""
+msgstr "snel achteruit"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:407
msgid "show closed captions"
-msgstr ""
+msgstr "ondertiteling tonen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:409
msgid "hide closed captions"
-msgstr ""
+msgstr "ondertiteling verbergen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:418
msgid "audio element playback controls and status display"
-msgstr ""
+msgstr "afspeelbesturing en statusweergave audio-element"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:420
msgid "video element playback controls and status display"
-msgstr ""
+msgstr "afspeelbesturing en statusweergave video-element"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:422
msgid "mute audio tracks"
-msgstr ""
+msgstr "audiosporen dempen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:424
msgid "unmute audio tracks"
-msgstr ""
+msgstr "audiosporen laten horen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:426
msgid "begin playback"
-msgstr ""
+msgstr "afspelen beginnen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:428
msgid "pause playback"
-msgstr ""
+msgstr "afspelen pauzeren"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:430
msgid "movie time scrubber"
@@ -1027,76 +1003,72 @@
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:434
msgid "seek movie back 30 seconds"
-msgstr ""
+msgstr "30 seconden terugzoeken in film"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:436
msgid "return streaming movie to real time"
-msgstr ""
+msgstr "terugkeren naar realtime in streamende film"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:438
msgid "current movie time in seconds"
-msgstr ""
+msgstr "huidige filmtijd in seconden"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:440
msgid "number of seconds of movie remaining"
-msgstr ""
+msgstr "aantal seconden film te gaan"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:442
msgid "current movie status"
-msgstr ""
+msgstr "huidige filmstatus"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:444
msgid "seek quickly back"
-msgstr ""
+msgstr "snel achteruit zoeken"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:446
msgid "seek quickly forward"
-msgstr ""
+msgstr "snel vooruit zoeken"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:448
msgid "Play movie in fullscreen mode"
-msgstr ""
+msgstr "Film afspelen in volledig scherm"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:450
msgid "start displaying closed captions"
-msgstr ""
+msgstr "beginnen met tonen van ondertiteling"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:452
msgid "stop displaying closed captions"
-msgstr ""
+msgstr "stoppen met tonen van ondertiteling"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:461
-#, fuzzy
msgid "indefinite time"
-msgstr "definitie"
+msgstr "onbepaalde tijd"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:491
msgid "value missing"
-msgstr ""
+msgstr "waarde ontbreekt"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:497
msgid "type mismatch"
-msgstr ""
+msgstr "type komt niet overeen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:502
msgid "pattern mismatch"
-msgstr ""
+msgstr "patroon komt niet overeen"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:507
msgid "too long"
-msgstr ""
+msgstr "te lang"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:512
msgid "range underflow"
-msgstr ""
+msgstr "onder bereik"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:517
msgid "range overflow"
-msgstr ""
+msgstr "over bereik"
#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:522
msgid "step mismatch"
-msgstr ""
-
-#~ msgid "_Searchable Index"
-#~ msgstr "Door_zoekbare index"
+msgstr "stap komt niet overeen"
--- WebKit/gtk/po/webkit-2.0.pot
+++ WebKit/gtk/po/webkit-2.0.pot
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: webkit 1.3.3\n"
+"Report-Msgid-Bugs-To: http://bugs.webkit.org/\n"
+"POT-Creation-Date: 2010-07-12 23:27-0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:558
+msgid "Upload File"
+msgstr ""
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:61
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:143
+msgid "Input _Methods"
+msgstr ""
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:78
+msgid "LRM _Left-to-right mark"
+msgstr ""
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:79
+msgid "RLM _Right-to-left mark"
+msgstr ""
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:80
+msgid "LRE Left-to-right _embedding"
+msgstr ""
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:81
+msgid "RLE Right-to-left e_mbedding"
+msgstr ""
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:82
+msgid "LRO Left-to-right _override"
+msgstr ""
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:83
+msgid "RLO Right-to-left o_verride"
+msgstr ""
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:84
+msgid "PDF _Pop directional formatting"
+msgstr ""
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:85
+msgid "ZWS _Zero width space"
+msgstr ""
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:86
+msgid "ZWJ Zero width _joiner"
+msgstr ""
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:87
+msgid "ZWNJ Zero width _non-joiner"
+msgstr ""
+
+#: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:109
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:138
+msgid "_Insert Unicode Control Character"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:272
+msgid "Network Request"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:273
+msgid "The network request for the URI that should be downloaded"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:287
+msgid "Network Response"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:288
+msgid "The network response for the URI that should be downloaded"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:302
+msgid "Destination URI"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:303
+msgid "The destination URI where to save the file"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:317
+msgid "Suggested Filename"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:318
+msgid "The filename suggested as default when saving"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:335
+msgid "Progress"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:336
+msgid "Determines the current progress of the download"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:349
+msgid "Status"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:350
+msgid "Determines the current status of the download"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:365
+msgid "Current Size"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:366
+msgid "The length of the data already downloaded"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:380
+msgid "Total Size"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:381
+msgid "The total size of the file"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitdownload.cpp:532
+msgid "User cancelled the download"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:249
+#, c-format
+msgid "A username and password are being requested by the site %s"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:279
+msgid "Server message:"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:292
+msgid "Username:"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:294
+msgid "Password:"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitsoupauthdialog.c:303
+msgid "_Remember password"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:301
+msgid "Name"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:302
+msgid "The name of the frame"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:308
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:146
+#: WebKit/gtk/webkit/webkitwebview.cpp:2608
+msgid "Title"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:309
+msgid "The document title of the frame"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:315
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:178
+#: WebKit/gtk/webkit/webkitwebview.cpp:2622
+msgid "URI"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:316
+msgid "The current URI of the contents displayed by the frame"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:347
+msgid "Horizontal Scrollbar Policy"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:348
+msgid ""
+"Determines the current policy for the horizontal scrollbar of the frame."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:365
+msgid "Vertical Scrollbar Policy"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebframe.cpp:366
+msgid "Determines the current policy for the vertical scrollbar of the frame."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:147
+msgid "The title of the history item"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:162
+msgid "Alternate Title"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:163
+msgid "The alternate title of the history item"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:179
+msgid "The URI of the history item"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:194
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:173
+msgid "Original URI"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:195
+msgid "The original URI of the history item"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:210
+msgid "Last visited Time"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:211
+msgid "The time at which the history item was last visited"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:269
+msgid "Web View"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:270
+msgid "The Web View that renders the Web Inspector itself"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:283
+msgid "Inspected URI"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:284
+msgid "The URI that is currently being inspected"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:300
+msgid "Enable JavaScript profiling"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:301
+msgid "Profile the executed JavaScript."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:316
+msgid "Enable Timeline profiling"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebinspector.cpp:317
+msgid "Profile the WebCore instrumentation."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:158
+msgid "Reason"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:159
+msgid "The reason why this navigation is occurring"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:174
+msgid "The URI that was requested as the target for the navigation"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:188
+msgid "Button"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:189
+msgid "The button used to click"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:204
+msgid "Modifier state"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:205
+msgid "A bitmask representing the state of the modifier keys"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:220
+msgid "Target frame"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:221
+msgid "The target frame for the navigation"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:241
+msgid "Default Encoding"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:242
+msgid "The default encoding used to display text."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:250
+msgid "Cursive Font Family"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:251
+msgid "The default Cursive font family used to display text."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:259
+msgid "Default Font Family"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:260
+msgid "The default font family used to display text."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:268
+msgid "Fantasy Font Family"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:269
+msgid "The default Fantasy font family used to display text."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:277
+msgid "Monospace Font Family"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:278
+msgid "The default font family used to display monospace text."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:286
+msgid "Sans Serif Font Family"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:287
+msgid "The default Sans Serif font family used to display text."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:295
+msgid "Serif Font Family"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:296
+msgid "The default Serif font family used to display text."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:304
+msgid "Default Font Size"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:305
+msgid "The default font size used to display text."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:313
+msgid "Default Monospace Font Size"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:314
+msgid "The default font size used to display monospace text."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:322
+msgid "Minimum Font Size"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:323
+msgid "The minimum font size used to display text."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:331
+msgid "Minimum Logical Font Size"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:332
+msgid "The minimum logical font size used to display text."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:351
+msgid "Enforce 96 DPI"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:352
+msgid "Enforce a resolution of 96 DPI"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:360
+msgid "Auto Load Images"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:361
+msgid "Load images automatically."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:369
+msgid "Auto Shrink Images"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:370
+msgid "Automatically shrink standalone images to fit."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:378
+msgid "Print Backgrounds"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:379
+msgid "Whether background images should be printed."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:387
+msgid "Enable Scripts"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:388
+msgid "Enable embedded scripting languages."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:396
+msgid "Enable Plugins"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:397
+msgid "Enable embedded plugin objects."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:405
+msgid "Resizable Text Areas"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:406
+msgid "Whether text areas are resizable."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:413
+msgid "User Stylesheet URI"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:414
+msgid "The URI of a stylesheet that is applied to every page."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:429
+msgid "Zoom Stepping Value"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:430
+msgid "The value by which the zoom level is changed when zooming in or out."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:448
+msgid "Enable Developer Extras"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:449
+msgid "Enables special extensions that help developers"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:469
+msgid "Enable Private Browsing"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:470
+msgid "Enables private browsing mode"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:485
+msgid "Enable Spell Checking"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:486
+msgid "Enables spell checking while typing"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:509
+msgid "Languages to use for spell checking"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:510
+msgid "Comma separated list of languages to use for spell checking"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:524
+msgid "Enable Caret Browsing"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:525
+msgid "Whether to enable accesibility enhanced keyboard navigation"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:540
+msgid "Enable HTML5 Database"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:541
+msgid "Whether to enable HTML5 database support"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:556
+msgid "Enable HTML5 Local Storage"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:557
+msgid "Whether to enable HTML5 Local Storage support"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:571
+msgid "Enable XSS Auditor"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:572
+msgid "Whether to enable teh XSS auditor"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:590
+msgid "Enable Spatial Navigation"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:591
+msgid "Whether to enable Spatial Navigation"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:608
+msgid "User Agent"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:609
+msgid "The User-Agent string used by WebKitGtk"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:624
+msgid "JavaScript can open windows automatically"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:625
+msgid "Whether JavaScript can open windows automatically"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:639
+msgid "JavaScript can access Clipboard"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:640
+msgid "Whether JavaScript can access Clipboard"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:656
+msgid "Enable offline web application cache"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:657
+msgid "Whether to enable offline web application cache"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:684
+msgid "Editing behavior"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:685
+msgid "The behavior mode to use in editing mode"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:701
+msgid "Enable universal access from file URIs"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:702
+msgid "Whether to allow universal access from file URIs"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:717
+msgid "Enable DOM paste"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:718
+msgid "Whether to enable DOM paste"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:736
+msgid "Tab key cycles through elements"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:737
+msgid "Whether the tab key cycles through elements on the page."
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:757
+msgid "Enable Default Context Menu"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:758
+msgid ""
+"Enables the handling of right-clicks for the creation of the default context "
+"menu"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:778
+msgid "Enable Site Specific Quirks"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:779
+msgid "Enables the site-specific compatibility workarounds"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:801
+msgid "Enable page cache"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:802
+msgid "Whether the page cache should be used"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:822
+msgid "Auto Resize Window"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:823
+msgid "Automatically resize the toplevel window when a page requests it"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:855
+msgid "Enable Java Applet"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebsettings.cpp:856
+msgid "Whether Java Applet support through <applet> should be enabled"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2609
+msgid "Returns the @web_view's document title"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2623
+msgid "Returns the current URI of the contents displayed by the @web_view"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2636
+msgid "Copy target list"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2637
+msgid "The list of targets this web view supports for clipboard copying"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2650
+msgid "Paste target list"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2651
+msgid "The list of targets this web view supports for clipboard pasting"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2657
+msgid "Settings"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2658
+msgid "An associated WebKitWebSettings instance"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2671
+msgid "Web Inspector"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2672
+msgid "The associated WebKitWebInspector instance"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2692
+msgid "Editable"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2693
+msgid "Whether content can be modified by the user"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2699
+msgid "Transparent"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2700
+msgid "Whether content has a transparent background"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2713
+msgid "Zoom level"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2714
+msgid "The level of zoom of the content"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2729
+msgid "Full content zoom"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2730
+msgid "Whether the full content is scaled when zooming"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2743
+msgid "Encoding"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2744
+msgid "The default encoding of the web view"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2757
+msgid "Custom Encoding"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2758
+msgid "The custom encoding of the web view"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2810
+msgid "Icon URI"
+msgstr ""
+
+#: WebKit/gtk/webkit/webkitwebview.cpp:2811
+msgid "The URI for the favicon for the #WebKitWebView."
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:55
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:60
+msgid "Submit"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:65
+msgid "Reset"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:70
+msgid "This is a searchable index. Enter search keywords: "
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:75
+msgid "Choose File"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:80
+msgid "(None)"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:85
+msgid "Open Link in New _Window"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:90
+msgid "_Download Linked File"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:95
+msgid "Copy Link Loc_ation"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:100
+msgid "Open _Image in New Window"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:105
+msgid "Sa_ve Image As"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:110
+msgid "Cop_y Image"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:115
+msgid "Open _Frame in New Window"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:166
+msgid "_Reload"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:183
+msgid "No Guesses Found"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:188
+msgid "_Ignore Spelling"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:193
+msgid "_Learn Spelling"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:198
+msgid "_Search the Web"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:203
+msgid "_Look Up in Dictionary"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:208
+msgid "_Open Link"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:213
+msgid "Ignore _Grammar"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:218
+msgid "Spelling and _Grammar"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:223
+msgid "_Show Spelling and Grammar"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:223
+msgid "_Hide Spelling and Grammar"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:228
+msgid "_Check Document Now"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:233
+msgid "Check Spelling While _Typing"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:238
+msgid "Check _Grammar With Spelling"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:243
+msgid "_Font"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:266
+msgid "_Outline"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:271
+msgid "Inspect _Element"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:276
+msgid "No recent searches"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:281
+msgid "Recent searches"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:286
+msgid "_Clear recent searches"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:291
+msgid "term"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:296
+msgid "definition"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:301
+msgid "press"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:306
+msgid "select"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:311
+msgid "activate"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:316
+msgid "uncheck"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:321
+msgid "check"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:326
+msgid "jump"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:341
+msgid "Missing Plug-in"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:347
+msgid "Plug-in Failure"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:353
+msgid " files"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:358
+msgid "Unknown"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:375
+msgid "Loading..."
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:380
+msgid "Live Broadcast"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:386
+msgid "audio element controller"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:388
+msgid "video element controller"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:390
+msgid "mute"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:392
+msgid "unmute"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:394
+msgid "play"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:396
+msgid "pause"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:398
+msgid "movie time"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:400
+msgid "timeline slider thumb"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:402
+msgid "back 30 seconds"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:404
+msgid "return to realtime"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:406
+msgid "elapsed time"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:408
+msgid "remaining time"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:410
+msgid "status"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:412
+msgid "fullscreen"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:414
+msgid "fast forward"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:416
+msgid "fast reverse"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:418
+msgid "show closed captions"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:420
+msgid "hide closed captions"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:429
+msgid "audio element playback controls and status display"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:431
+msgid "video element playback controls and status display"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:433
+msgid "mute audio tracks"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:435
+msgid "unmute audio tracks"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:437
+msgid "begin playback"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:439
+msgid "pause playback"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:441
+msgid "movie time scrubber"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:443
+msgid "movie time scrubber thumb"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:445
+msgid "seek movie back 30 seconds"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:447
+msgid "return streaming movie to real time"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:449
+msgid "current movie time in seconds"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:451
+msgid "number of seconds of movie remaining"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:453
+msgid "current movie status"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:455
+msgid "seek quickly back"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:457
+msgid "seek quickly forward"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:459
+msgid "Play movie in fullscreen mode"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:461
+msgid "start displaying closed captions"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:463
+msgid "stop displaying closed captions"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:472
+msgid "indefinite time"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:502
+msgid "value missing"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:508
+msgid "type mismatch"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:513
+msgid "pattern mismatch"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:518
+msgid "too long"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:523
+msgid "range underflow"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:528
+msgid "range overflow"
+msgstr ""
+
+#: WebCore/platform/gtk/LocalizedStringsGtk.cpp:533
+msgid "step mismatch"
+msgstr ""
--- WebKit/gtk/tests/testwebbackforwardlist.c
+++ WebKit/gtk/tests/testwebbackforwardlist.c
@@ -266,6 +266,54 @@
g_object_unref(webView);
}
+static void test_webkit_web_back_forward_list_clear(void)
+{
+ WebKitWebView* webView;
+ WebKitWebBackForwardList* webBackForwardList;
+ WebKitWebHistoryItem* addItem;
+ g_test_bug("36173");
+
+ webView = WEBKIT_WEB_VIEW(webkit_web_view_new());
+ g_object_ref_sink(webView);
+
+ webBackForwardList = webkit_web_view_get_back_forward_list(webView);
+ g_assert(webBackForwardList);
+
+ // Check that there is no item.
+ g_assert_cmpint(webkit_web_back_forward_list_get_forward_length(webBackForwardList), ==, 0);
+ g_assert_cmpint(webkit_web_back_forward_list_get_back_length(webBackForwardList), ==, 0);
+ g_assert(!webkit_web_back_forward_list_get_current_item(webBackForwardList));
+ g_assert(!webkit_web_view_can_go_forward(webView));
+ g_assert(!webkit_web_view_can_go_back(webView));
+
+ // Check that clearing the empty list does not modify counters
+ webkit_web_back_forward_list_clear(webBackForwardList);
+ g_assert_cmpint(webkit_web_back_forward_list_get_forward_length(webBackForwardList), ==, 0);
+ g_assert_cmpint(webkit_web_back_forward_list_get_back_length(webBackForwardList), ==, 0);
+ g_assert(!webkit_web_back_forward_list_get_current_item(webBackForwardList));
+ g_assert(!webkit_web_view_can_go_forward(webView));
+ g_assert(!webkit_web_view_can_go_back(webView));
+
+ // Add a new item
+ addItem = webkit_web_history_item_new_with_data("http://example.com/", "Added site");
+ webkit_web_back_forward_list_add_item(webBackForwardList, addItem);
+ g_object_unref(addItem);
+ g_assert(webkit_web_back_forward_list_contains_item(webBackForwardList, addItem));
+
+ // Check that after clearing the list the added item is no longer in the list
+ webkit_web_back_forward_list_clear(webBackForwardList);
+ g_assert(!webkit_web_back_forward_list_contains_item(webBackForwardList, addItem));
+
+ // Check that after clearing it, the list is empty
+ g_assert_cmpint(webkit_web_back_forward_list_get_forward_length(webBackForwardList), ==, 0);
+ g_assert_cmpint(webkit_web_back_forward_list_get_back_length(webBackForwardList), ==, 0);
+ g_assert(!webkit_web_back_forward_list_get_current_item(webBackForwardList));
+ g_assert(!webkit_web_view_can_go_forward(webView));
+ g_assert(!webkit_web_view_can_go_back(webView));
+
+ g_object_unref(webView);
+}
+
int main(int argc, char** argv)
{
g_thread_init(NULL);
@@ -275,6 +323,7 @@
g_test_add_func("/webkit/webbackforwardlist/add_item", test_webkit_web_back_forward_list_add_item);
g_test_add_func("/webkit/webbackforwardlist/list_order", test_webkit_web_back_forward_list_order);
g_test_add_func("/webkit/webhistoryitem/lifetime", test_webkit_web_history_item_lifetime);
+ g_test_add_func("/webkit/webbackforwardlist/clear", test_webkit_web_back_forward_list_clear);
return g_test_run ();
}
--- WebKit/gtk/webkit/webkitprivate.h
+++ WebKit/gtk/webkit/webkitprivate.h
@@ -2,6 +2,7 @@
* Copyright (C) 2007, 2008, 2009 Holger Hans Peter Freyther
* Copyright (C) 2008 Jan Michael C. Alonzo
* Copyright (C) 2008 Collabora Ltd.
+ * Copyright (C) 2010 Igalia S.L.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -47,6 +48,7 @@
#include "ArchiveResource.h"
#include "BackForwardList.h"
#include "CString.h"
+#include "DataObjectGtk.h"
#include <enchant.h>
#include "GOwnPtr.h"
#include "Geolocation.h"
@@ -149,6 +151,8 @@
char* mainResourceIdentifier;
GHashTable* subResources;
char* tooltipText;
+
+ HashMap<GdkDragContext*, RefPtr<WebCore::DataObjectGtk> > draggingDataObjects;
};
#define WEBKIT_WEB_FRAME_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_FRAME, WebKitWebFramePrivate))
--- WebKit/gtk/webkit/webkitversion.h
+++ WebKit/gtk/webkit/webkitversion.h
@@ -27,7 +27,7 @@
#define WEBKIT_MAJOR_VERSION (1)
#define WEBKIT_MINOR_VERSION (2)
-#define WEBKIT_MICRO_VERSION (1)
+#define WEBKIT_MICRO_VERSION (3)
#define WEBKIT_USER_AGENT_MAJOR_VERSION (531)
#define WEBKIT_USER_AGENT_MINOR_VERSION (2)
--- WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
+++ WebKit/gtk/webkit/webkitwebbackforwardlist.cpp
@@ -438,6 +438,29 @@
backForwardList->addItem(historyItem);
}
+/**
+ * webkit_web_back_forward_list_clear:
+ * @webBackForwardList: a #WebKitWebBackForwardList
+ *
+ * Clears the @webBackForwardList by removing all its elements. Note that not even
+ * the current page is kept in list when cleared so you would have to add it later.
+ *
+ * Since: 1.1.30
+ **/
+void webkit_web_back_forward_list_clear(WebKitWebBackForwardList* webBackForwardList)
+{
+ g_return_if_fail(WEBKIT_IS_WEB_BACK_FORWARD_LIST(webBackForwardList));
+
+ WebCore::BackForwardList* backForwardList = core(webBackForwardList);
+ if (!backForwardList || !backForwardList->enabled() || !backForwardList->entries().size())
+ return;
+
+ // Clear the current list by setting capacity to 0
+ int capacity = backForwardList->capacity();
+ backForwardList->setCapacity(0);
+ backForwardList->setCapacity(capacity);
+}
+
WebCore::BackForwardList* WebKit::core(WebKitWebBackForwardList* webBackForwardList)
{
g_return_val_if_fail(WEBKIT_IS_WEB_BACK_FORWARD_LIST(webBackForwardList), NULL);
--- WebKit/gtk/webkit/webkitwebbackforwardlist.h
+++ WebKit/gtk/webkit/webkitwebbackforwardlist.h
@@ -110,6 +110,8 @@
WEBKIT_API void
webkit_web_back_forward_list_add_item (WebKitWebBackForwardList *web_back_forward_list,
WebKitWebHistoryItem *history_item);
+WEBKIT_API void
+webkit_web_back_forward_list_clear (WebKitWebBackForwardList *web_back_forward_list);
G_END_DECLS
--- WebKit/gtk/webkit/webkitwebsettings.cpp
+++ WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -96,6 +96,7 @@
gboolean enable_spatial_navigation;
gchar* user_agent;
gboolean javascript_can_open_windows_automatically;
+ gboolean javascript_can_access_clipboard;
gboolean enable_offline_web_application_cache;
WebKitEditingBehavior editing_behavior;
gboolean enable_universal_access_from_file_uris;
@@ -145,6 +146,7 @@
PROP_ENABLE_SPATIAL_NAVIGATION,
PROP_USER_AGENT,
PROP_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY,
+ PROP_JAVASCRIPT_CAN_ACCESS_CLIPBOARD,
PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE,
PROP_EDITING_BEHAVIOR,
PROP_ENABLE_UNIVERSAL_ACCESS_FROM_FILE_URIS,
@@ -623,6 +625,22 @@
_("Whether JavaScript can open windows automatically"),
FALSE,
flags));
+
+ /**
+ * WebKitWebSettings:javascript-can-access-clipboard
+ *
+ * Whether JavaScript can access Clipboard.
+ *
+ * Since: 1.3.0
+ */
+ g_object_class_install_property(gobject_class,
+ PROP_JAVASCRIPT_CAN_ACCESS_CLIPBOARD,
+ g_param_spec_boolean("javascript-can-access-clipboard",
+ _("JavaScript can access Clipboard"),
+ _("Whether JavaScript can access Clipboard"),
+ FALSE,
+ flags));
+
/**
* WebKitWebSettings:enable-offline-web-application-cache
*
@@ -1023,6 +1041,9 @@
case PROP_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY:
priv->javascript_can_open_windows_automatically = g_value_get_boolean(value);
break;
+ case PROP_JAVASCRIPT_CAN_ACCESS_CLIPBOARD:
+ priv->javascript_can_access_clipboard = g_value_get_boolean(value);
+ break;
case PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE:
priv->enable_offline_web_application_cache = g_value_get_boolean(value);
break;
@@ -1161,6 +1182,9 @@
case PROP_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY:
g_value_set_boolean(value, priv->javascript_can_open_windows_automatically);
break;
+ case PROP_JAVASCRIPT_CAN_ACCESS_CLIPBOARD:
+ g_value_set_boolean(value, priv->javascript_can_access_clipboard);
+ break;
case PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE:
g_value_set_boolean(value, priv->enable_offline_web_application_cache);
break;
@@ -1255,6 +1279,7 @@
"enable-spatial-navigation", priv->enable_spatial_navigation,
"user-agent", webkit_web_settings_get_user_agent(web_settings),
"javascript-can-open-windows-automatically", priv->javascript_can_open_windows_automatically,
+ "javascript-can-access-clipboard", priv->javascript_can_access_clipboard,
"enable-offline-web-application-cache", priv->enable_offline_web_application_cache,
"editing-behavior", priv->editing_behavior,
"enable-universal-access-from-file-uris", priv->enable_universal_access_from_file_uris,
--- WebKit/gtk/webkit/webkitwebview.cpp
+++ WebKit/gtk/webkit/webkitwebview.cpp
@@ -44,6 +44,7 @@
#include "BackForwardList.h"
#include "Cache.h"
#include "ChromeClientGtk.h"
+#include "ClipboardUtilitiesGtk.h"
#include "ContextMenuClientGtk.h"
#include "ContextMenuController.h"
#include "ContextMenu.h"
@@ -63,6 +64,7 @@
#include "FrameView.h"
#include <glib/gi18n-lib.h>
#include <GOwnPtr.h>
+#include <GOwnPtrGtk.h>
#include "GraphicsContext.h"
#include "GtkVersioning.h"
#include "HitTestRequest.h"
@@ -585,11 +587,52 @@
static gboolean webkit_web_view_button_press_event(GtkWidget* widget, GdkEventButton* event)
{
+ // Eventually it may make sense for these to be per-view and per-device,
+ // but at this time the implementation matches the Windows port.
+ static int currentClickCount = 1;
+ static IntPoint previousPoint;
+ static guint previousButton;
+ static guint32 previousTime;
+
WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
// FIXME: need to keep track of subframe focus for key events
gtk_widget_grab_focus(widget);
+ // For double and triple clicks GDK sends both a normal button press event
+ // and a specific type (like GDK_2BUTTON_PRESS). If we detect a special press
+ // coming up, ignore this event as it certainly generated the double or triple
+ // click. The consequence of not eating this event is two DOM button press events
+ // are generated.
+ GOwnPtr<GdkEvent> nextEvent(gdk_event_peek());
+ if (nextEvent && (nextEvent->any.type == GDK_2BUTTON_PRESS || nextEvent->any.type == GDK_3BUTTON_PRESS))
+ return TRUE;
+
+ gint doubleClickDistance = 250;
+ gint doubleClickTime = 5;
+ GtkSettings* settings = gtk_settings_get_for_screen(gdk_drawable_get_screen(widget->window));
+ g_object_get(settings,
+ "gtk-double-click-distance", &doubleClickDistance,
+ "gtk-double-click-time", &doubleClickTime, NULL);
+
+ // GTK+ only counts up to triple clicks, but WebCore wants to know about
+ // quadruple clicks, quintuple clicks, ad infinitum. Here, we replicate the
+ // GDK logic for counting clicks.
+ if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
+ || ((abs(event->x - previousPoint.x()) < doubleClickDistance)
+ && (abs(event->y - previousPoint.y()) < doubleClickDistance)
+ && (event->time - previousTime < static_cast<guint>(doubleClickTime))
+ && (event->button == previousButton)))
+ currentClickCount++;
+ else
+ currentClickCount = 1;
+
+ PlatformMouseEvent platformEvent(event);
+ platformEvent.setClickCount(currentClickCount);
+ previousPoint = platformEvent.pos();
+ previousButton = event->button;
+ previousTime = event->time;
+
if (event->button == 3)
return webkit_web_view_forward_context_menu_event(webView, PlatformMouseEvent(event));
@@ -597,7 +640,8 @@
if (!frame->view())
return FALSE;
- gboolean result = frame->eventHandler()->handleMousePressEvent(PlatformMouseEvent(event));
+
+ gboolean result = frame->eventHandler()->handleMousePressEvent(platformEvent);
#if PLATFORM(X11)
/* Copy selection to the X11 selection clipboard */
@@ -1122,6 +1166,8 @@
priv->subResources = NULL;
}
+ priv->draggingDataObjects.clear();
+
G_OBJECT_CLASS(webkit_web_view_parent_class)->dispose(object);
}
@@ -1232,126 +1278,49 @@
static void webkit_web_view_drag_end(GtkWidget* widget, GdkDragContext* context)
{
- g_object_unref(context);
-}
-
-struct DNDContentsRequest
-{
- gint info;
- GtkSelectionData* dnd_selection_data;
+ WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+ WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(webView);
- gboolean is_url_label_request;
- gchar* url;
-};
+ // This might happen if a drag is still in progress after a WebKitWebView
+ // is disposed and before it is finalized.
+ if (!priv->draggingDataObjects.contains(context))
+ return;
-void clipboard_contents_received(GtkClipboard* clipboard, GtkSelectionData* selection_data, gpointer data)
-{
- DNDContentsRequest* contents_request = reinterpret_cast<DNDContentsRequest*>(data);
+ priv->draggingDataObjects.remove(context);
- if (contents_request->is_url_label_request) {
- // We have received contents of the label clipboard. Use them to form
- // required structures. When formed, enhance the dnd's selection data
- // with them and return.
-
- // If the label is empty, use the url itself.
- gchar* url_label = reinterpret_cast<gchar*>(gtk_selection_data_get_text(selection_data));
- if (!url_label)
- url_label = g_strdup(contents_request->url);
-
- gchar* data = 0;
- switch (contents_request->info) {
- case WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST:
- data = g_strdup_printf("%s\r\n%s\r\n", contents_request->url, url_label);
- break;
- case WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL:
- data = g_strdup_printf("%s\n%s", contents_request->url, url_label);
- break;
- }
+ Frame* frame = core(webView)->focusController()->focusedOrMainFrame();
+ if (!frame)
+ return;
- if (data) {
- gtk_selection_data_set(contents_request->dnd_selection_data,
- contents_request->dnd_selection_data->target, 8,
- reinterpret_cast<const guchar*>(data), strlen(data));
- g_free(data);
- }
+ GdkEvent* event = gdk_event_new(GDK_BUTTON_RELEASE);
+ int x, y, xRoot, yRoot;
+ GdkModifierType modifiers;
+ GdkDisplay* display = gdk_display_get_default();
+ gdk_display_get_pointer(display, 0, &xRoot, &yRoot, &modifiers);
- g_free(url_label);
- g_free(contents_request->url);
- g_free(contents_request);
+ event->button.window = static_cast<GdkWindow*>(g_object_ref(gdk_display_get_window_at_pointer(display, &x, &y)));
+ event->button.x = x;
+ event->button.y = y;
+ event->button.x_root = xRoot;
+ event->button.y_root = yRoot;
+ event->button.state = modifiers;
- return;
- }
+ PlatformMouseEvent platformEvent(&event->button);
+ frame->eventHandler()->dragSourceEndedAt(platformEvent, gdkDragActionToDragOperation(context->action));
- switch (contents_request->info) {
- case WEBKIT_WEB_VIEW_TARGET_INFO_HTML:
- case WEBKIT_WEB_VIEW_TARGET_INFO_TEXT:
- {
- gchar* data = reinterpret_cast<gchar*>(gtk_selection_data_get_text(selection_data));
- if (data) {
- gtk_selection_data_set(contents_request->dnd_selection_data,
- contents_request->dnd_selection_data->target, 8,
- reinterpret_cast<const guchar*>(data),
- strlen(data));
- g_free(data);
- }
- break;
- }
- case WEBKIT_WEB_VIEW_TARGET_INFO_IMAGE:
- {
- GdkPixbuf* pixbuf = gtk_selection_data_get_pixbuf(selection_data);
- if (pixbuf) {
- gtk_selection_data_set_pixbuf(contents_request->dnd_selection_data, pixbuf);
- g_object_unref(pixbuf);
- }
- break;
- }
- case WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST:
- case WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL:
- // URL's label is stored in another clipboard, so we store URL into
- // contents request, mark the latter as an url label request
- // and request for contents of the label clipboard.
- contents_request->is_url_label_request = TRUE;
- contents_request->url = reinterpret_cast<gchar*>(gtk_selection_data_get_text(selection_data));
-
- gtk_clipboard_request_contents(gtk_clipboard_get(gdk_atom_intern_static_string("WebKitClipboardUrlLabel")),
- selection_data->target, clipboard_contents_received, contents_request);
- break;
- }
+ gdk_event_free(event);
}
-static void webkit_web_view_drag_data_get(GtkWidget* widget, GdkDragContext* context, GtkSelectionData* selection_data, guint info, guint time_)
-{
- GdkAtom selection_atom = GDK_NONE;
- GdkAtom target_atom = selection_data->target;
-
- switch (info) {
- case WEBKIT_WEB_VIEW_TARGET_INFO_HTML:
- selection_atom = gdk_atom_intern_static_string("WebKitClipboardHtml");
- // HTML markup data is set as text, therefor, we need a text-like target atom
- target_atom = gdk_atom_intern_static_string("UTF8_STRING");
- break;
- case WEBKIT_WEB_VIEW_TARGET_INFO_TEXT:
- selection_atom = gdk_atom_intern_static_string("WebKitClipboardText");
- break;
- case WEBKIT_WEB_VIEW_TARGET_INFO_IMAGE:
- selection_atom = gdk_atom_intern_static_string("WebKitClipboardImage");
- break;
- case WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST:
- case WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL:
- selection_atom = gdk_atom_intern_static_string("WebKitClipboardUrl");
- // We require URL and label, which are both stored in text format
- // and are needed to be retrieved as such.
- target_atom = gdk_atom_intern_static_string("UTF8_STRING");
- break;
- }
-
- DNDContentsRequest* contents_request = g_new(DNDContentsRequest, 1);
- contents_request->info = info;
- contents_request->is_url_label_request = FALSE;
- contents_request->dnd_selection_data = selection_data;
+static void webkit_web_view_drag_data_get(GtkWidget* widget, GdkDragContext* context, GtkSelectionData* selectionData, guint info, guint)
+{
+ WebKitWebViewPrivate* priv = WEBKIT_WEB_VIEW_GET_PRIVATE(WEBKIT_WEB_VIEW(widget));
+
+ // This might happen if a drag is still in progress after a WebKitWebView
+ // is diposed and before it is finalized.
+ if (!priv->draggingDataObjects.contains(context))
+ return;
- gtk_clipboard_request_contents(gtk_clipboard_get(selection_atom), target_atom,
- clipboard_contents_received, contents_request);
+ pasteboardHelperInstance()->fillSelectionData(selectionData, info, priv->draggingDataObjects.get(context).get());
}
#if GTK_CHECK_VERSION(2, 12, 0)
@@ -2677,7 +2646,8 @@
gboolean autoLoadImages, autoShrinkImages, printBackgrounds,
enableScripts, enablePlugins, enableDeveloperExtras, resizableTextAreas,
enablePrivateBrowsing, enableCaretBrowsing, enableHTML5Database, enableHTML5LocalStorage,
- enableXSSAuditor, enableSpatialNavigation, javascriptCanOpenWindows, enableOfflineWebAppCache,
+ enableXSSAuditor, enableSpatialNavigation, javascriptCanOpenWindows,
+ javaScriptCanAccessClipboard, enableOfflineWebAppCache,
enableUniversalAccessFromFileURI, enableFileAccessFromFileURI,
enableDOMPaste, tabKeyCyclesThroughElements,
enableSiteSpecificQuirks, usePageCache, enableJavaApplet;
@@ -2707,6 +2677,7 @@
"enable-xss-auditor", &enableXSSAuditor,
"enable-spatial-navigation", &enableSpatialNavigation,
"javascript-can-open-windows-automatically", &javascriptCanOpenWindows,
+ "javascript-can-access-clipboard", &javaScriptCanAccessClipboard,
"enable-offline-web-application-cache", &enableOfflineWebAppCache,
"editing-behavior", &editingBehavior,
"enable-universal-access-from-file-uris", &enableUniversalAccessFromFileURI,
@@ -2742,6 +2713,7 @@
settings->setXSSAuditorEnabled(enableXSSAuditor);
settings->setSpatialNavigationEnabled(enableSpatialNavigation);
settings->setJavaScriptCanOpenWindowsAutomatically(javascriptCanOpenWindows);
+ settings->setJavaScriptCanAccessClipboard(javaScriptCanAccessClipboard);
settings->setOfflineWebApplicationCacheEnabled(enableOfflineWebAppCache);
settings->setEditingBehavior(core(editingBehavior));
settings->setAllowUniversalAccessFromFileURLs(enableUniversalAccessFromFileURI);
@@ -2839,6 +2811,8 @@
settings->setSpatialNavigationEnabled(g_value_get_boolean(&value));
else if (name == g_intern_string("javascript-can-open-windows-automatically"))
settings->setJavaScriptCanOpenWindowsAutomatically(g_value_get_boolean(&value));
+ else if (name == g_intern_string("javascript-can-access-clipboard"))
+ settings->setJavaScriptCanAccessClipboard(g_value_get_boolean(&value));
else if (name == g_intern_string("enable-offline-web-application-cache"))
settings->setOfflineWebApplicationCacheEnabled(g_value_get_boolean(&value));
else if (name == g_intern_string("editing-behavior"))
--- WebKitTools/DumpRenderTree/LayoutTestController.h
+++ WebKitTools/DumpRenderTree/LayoutTestController.h
@@ -79,6 +79,7 @@
void setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme);
void setIconDatabaseEnabled(bool iconDatabaseEnabled);
void setJavaScriptProfilingEnabled(bool profilingEnabled);
+ void setJavaScriptCanAccessClipboard(bool flag);
void setMainFrameIsFirstResponder(bool flag);
void setMockGeolocationError(int code, JSStringRef message);
void setMockGeolocationPosition(double latitude, double longitude, double accuracy);
--- WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
+++ WebKitTools/DumpRenderTree/gtk/AccessibilityUIElementGtk.cpp
@@ -128,10 +128,22 @@
return 0;
}
+gchar* attributeSetToString(AtkAttributeSet* attributeSet)
+{
+ GString* str = g_string_new(0);
+ for (GSList* attributes = attributeSet; attributes; attributes = attributes->next) {
+ AtkAttribute* attribute = static_cast<AtkAttribute*>(attributes->data);
+ g_string_append(str, g_strconcat(attribute->name, ":", attribute->value, NULL));
+ if (attributes->next)
+ g_string_append(str, ", ");
+ }
+
+ return g_string_free(str, FALSE);
+}
+
JSStringRef AccessibilityUIElement::allAttributes()
{
- // FIXME: implement
- return JSStringCreateWithCharacters(0, 0);
+ return JSStringCreateWithUTF8CString(attributeSetToString(atk_object_get_attributes(ATK_OBJECT(m_element))));
}
JSStringRef AccessibilityUIElement::attributesOfLinkedUIElements()
--- WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -320,6 +320,7 @@
"enable-html5-local-storage", TRUE,
"enable-xss-auditor", FALSE,
"enable-spatial-navigation", FALSE,
+ "javascript-can-access-clipboard", TRUE,
"javascript-can-open-windows-automatically", TRUE,
"enable-offline-web-application-cache", TRUE,
"enable-universal-access-from-file-uris", TRUE,
@@ -626,7 +627,7 @@
ASSERT(!exception);
JSStringRef eventSenderStr = JSStringCreateWithUTF8CString("eventSender");
- JSValueRef eventSender = makeEventSender(context);
+ JSValueRef eventSender = makeEventSender(context, !webkit_web_frame_get_parent(frame));
JSObjectSetProperty(context, windowObject, eventSenderStr, eventSender, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, 0);
JSStringRelease(eventSenderStr);
}
--- WebKitTools/DumpRenderTree/gtk/EventSender.cpp
+++ WebKitTools/DumpRenderTree/gtk/EventSender.cpp
@@ -45,28 +45,27 @@
#include <gdk/gdkkeysyms.h>
#include <string.h>
-// TODO: Currently drag and drop related code is left out and
-// should be merged once we have drag and drop support in WebCore.
+// FIXME: Implement support for synthesizing drop events.
extern "C" {
extern void webkit_web_frame_layout(WebKitWebFrame* frame);
}
-static bool down = false;
-static bool currentEventButton = 1;
-static bool dragMode = true;
-static bool replayingSavedEvents = false;
+static bool dragMode;
+static int timeOffset = 0;
+
static int lastMousePositionX;
static int lastMousePositionY;
-
static int lastClickPositionX;
static int lastClickPositionY;
-static int clickCount = 0;
+static int lastClickTimeOffset;
+static int lastClickButton;
+static int buttonCurrentlyDown;
+static int clickCount;
struct DelayedMessage {
GdkEvent event;
gulong delay;
- gboolean isDragEvent;
};
static DelayedMessage msgQueue[1024];
@@ -84,6 +83,10 @@
DOM_KEY_LOCATION_NUMPAD = 0x03
};
+static void sendOrQueueEvent(GdkEvent event);
+static void dispatchEvent(GdkEvent event);
+static guint getStateFlags();
+
static JSValueRef getDragModeCallback(JSContextRef context, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
{
return JSValueMakeBoolean(context, dragMode);
@@ -97,41 +100,67 @@
static JSValueRef leapForwardCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
- // FIXME: Add proper support for forward leaps
+ if (argumentCount > 0) {
+ msgQueue[endOfQueue].delay = JSValueToNumber(context, arguments[0], exception);
+ timeOffset += msgQueue[endOfQueue].delay;
+ ASSERT(!exception || !*exception);
+ }
+
return JSValueMakeUndefined(context);
}
-static JSValueRef contextClickCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+bool prepareMouseButtonEvent(GdkEvent* event, int button)
{
- webkit_web_frame_layout(mainFrame);
-
WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
if (!view)
- return JSValueMakeUndefined(context);
+ return false;
+
+ memset(event, 0, sizeof(event));
+ event->button.button = button;
+ event->button.x = lastMousePositionX;
+ event->button.y = lastMousePositionY;
+ event->button.window = GTK_WIDGET(view)->window;
+ event->button.device = gdk_device_get_core_pointer();
+ event->button.state = getStateFlags();
+
+ // Mouse up & down events dispatched via g_signal_emit_by_name must offset
+ // their time value, so that WebKit can detect where sequences of mouse
+ // clicks begin and end. This should not interfere with GDK or GTK+ event
+ // processing, because the event is only seen by the widget.
+ event->button.time = GDK_CURRENT_TIME + timeOffset;
+
+ int xRoot, yRoot;
+#if GTK_CHECK_VERSION(2, 17, 3)
+ gdk_window_get_root_coords(GTK_WIDGET(view)->window, lastMousePositionX, lastMousePositionY, &xRoot, &yRoot);
+#else
+ getRootCoords(GTK_WIDGET(view), &xRoot, &yRoot);
+#endif
+ event->button.x_root = xRoot;
+ event->button.y_root = yRoot;
+ return true;
+}
+
+static JSValueRef contextClickCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
GdkEvent event;
- memset(&event, 0, sizeof(event));
- event.button.button = 3;
- event.button.x = lastMousePositionX;
- event.button.y = lastMousePositionY;
- event.button.window = GTK_WIDGET(view)->window;
+ if (!prepareMouseButtonEvent(&event, 3))
+ return JSValueMakeUndefined(context);
- gboolean return_val;
- down = true;
event.type = GDK_BUTTON_PRESS;
- g_signal_emit_by_name(view, "button_press_event", &event, &return_val);
-
- down = false;
+ sendOrQueueEvent(event);
event.type = GDK_BUTTON_RELEASE;
- g_signal_emit_by_name(view, "button_release_event", &event, &return_val);
+ sendOrQueueEvent(event);
return JSValueMakeUndefined(context);
}
static void updateClickCount(int button)
{
- // FIXME: take the last clicked button number and the time of last click into account.
- if (lastClickPositionX != lastMousePositionX || lastClickPositionY != lastMousePositionY || currentEventButton != button)
+ if (lastClickPositionX != lastMousePositionX
+ || lastClickPositionY != lastMousePositionY
+ || lastClickButton != button
+ || timeOffset - lastClickTimeOffset >= 1)
clickCount = 1;
else
clickCount++;
@@ -154,129 +183,69 @@
static JSValueRef mouseDownCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
- WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
- if (!view)
- return JSValueMakeUndefined(context);
-
- down = true;
-
- GdkEvent event;
- memset(&event, 0, sizeof(event));
- event.type = GDK_BUTTON_PRESS;
- event.button.button = 1;
-
+ int button = 1;
if (argumentCount == 1) {
- event.button.button = (int)JSValueToNumber(context, arguments[0], exception) + 1;
+ button = static_cast<int>(JSValueToNumber(context, arguments[0], exception)) + 1;
g_return_val_if_fail((!exception || !*exception), JSValueMakeUndefined(context));
}
- currentEventButton = event.button.button;
-
- event.button.x = lastMousePositionX;
- event.button.y = lastMousePositionY;
- event.button.window = GTK_WIDGET(view)->window;
- event.button.time = GDK_CURRENT_TIME;
- event.button.device = gdk_device_get_core_pointer();
-
- int x_root, y_root;
-#if GTK_CHECK_VERSION(2,17,3)
- gdk_window_get_root_coords(GTK_WIDGET(view)->window, lastMousePositionX, lastMousePositionY, &x_root, &y_root);
-#else
- getRootCoords(GTK_WIDGET(view), &x_root, &y_root);
-#endif
+ GdkEvent event;
+ if (!prepareMouseButtonEvent(&event, button))
+ return JSValueMakeUndefined(context);
- event.button.x_root = x_root;
- event.button.y_root = y_root;
+ buttonCurrentlyDown = event.button.button;
+ // Normally GDK will send both GDK_BUTTON_PRESS and GDK_2BUTTON_PRESS for
+ // the second button press during double-clicks. WebKit GTK+ selectively
+ // ignores the first GDK_BUTTON_PRESS of that pair using gdk_event_peek.
+ // Since our events aren't ever going onto the GDK event queue, WebKit won't
+ // be able to filter out the first GDK_BUTTON_PRESS, so we just don't send
+ // it here. Eventually this code should probably figure out a way to get all
+ // appropriate events onto the event queue and this work-around should be
+ // removed.
updateClickCount(event.button.button);
+ if (clickCount == 2)
+ event.type = GDK_2BUTTON_PRESS;
+ else if (clickCount == 3)
+ event.type = GDK_3BUTTON_PRESS;
+ else
+ event.type = GDK_BUTTON_PRESS;
- if (!msgQueue[endOfQueue].delay) {
- webkit_web_frame_layout(mainFrame);
-
- gboolean return_val;
- g_signal_emit_by_name(view, "button_press_event", &event, &return_val);
- if (clickCount == 2) {
- event.type = GDK_2BUTTON_PRESS;
- g_signal_emit_by_name(view, "button_press_event", &event, &return_val);
- }
- } else {
- // replaySavedEvents should have the required logic to make leapForward delays work
- msgQueue[endOfQueue++].event = event;
- replaySavedEvents();
- }
-
+ sendOrQueueEvent(event);
return JSValueMakeUndefined(context);
}
static guint getStateFlags()
{
- guint state = 0;
-
- if (down) {
- if (currentEventButton == 1)
- state = GDK_BUTTON1_MASK;
- else if (currentEventButton == 2)
- state = GDK_BUTTON2_MASK;
- else if (currentEventButton == 3)
- state = GDK_BUTTON3_MASK;
- } else
- state = 0;
-
- return state;
+ if (buttonCurrentlyDown == 1)
+ return GDK_BUTTON1_MASK;
+ if (buttonCurrentlyDown == 2)
+ return GDK_BUTTON2_MASK;
+ if (buttonCurrentlyDown == 3)
+ return GDK_BUTTON3_MASK;
+ return 0;
}
static JSValueRef mouseUpCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
{
-
- WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
- if (!view)
- return JSValueMakeUndefined(context);
-
- GdkEvent event;
- memset(&event, 0, sizeof(event));
- event.type = GDK_BUTTON_RELEASE;
- event.button.button = 1;
-
+ int button = 1;
if (argumentCount == 1) {
- event.button.button = (int)JSValueToNumber(context, arguments[0], exception) + 1;
+ button = static_cast<int>(JSValueToNumber(context, arguments[0], exception)) + 1;
g_return_val_if_fail((!exception || !*exception), JSValueMakeUndefined(context));
}
- currentEventButton = event.button.button;
-
- event.button.x = lastMousePositionX;
- event.button.y = lastMousePositionY;
- event.button.window = GTK_WIDGET(view)->window;
- event.button.time = GDK_CURRENT_TIME;
- event.button.device = gdk_device_get_core_pointer();
- event.button.state = getStateFlags();
-
- down = false;
-
- int x_root, y_root;
-#if GTK_CHECK_VERSION(2,17,3)
- gdk_window_get_root_coords(GTK_WIDGET(view)->window, lastMousePositionX, lastMousePositionY, &x_root, &y_root);
-#else
- getRootCoords(GTK_WIDGET(view), &x_root, &y_root);
-#endif
-
- event.button.x_root = x_root;
- event.button.y_root = y_root;
-
- if ((dragMode && !replayingSavedEvents) || msgQueue[endOfQueue].delay) {
- msgQueue[endOfQueue].event = event;
- msgQueue[endOfQueue++].isDragEvent = true;
- replaySavedEvents();
- } else {
- webkit_web_frame_layout(mainFrame);
-
- gboolean return_val;
- g_signal_emit_by_name(view, "button_release_event", &event, &return_val);
- }
+ GdkEvent event;
+ if (!prepareMouseButtonEvent(&event, button))
+ return JSValueMakeUndefined(context);
lastClickPositionX = lastMousePositionX;
lastClickPositionY = lastMousePositionY;
+ lastClickButton = buttonCurrentlyDown;
+ lastClickTimeOffset = timeOffset;
+ buttonCurrentlyDown = 0;
+ event.type = GDK_BUTTON_RELEASE;
+ sendOrQueueEvent(event);
return JSValueMakeUndefined(context);
}
@@ -299,32 +268,22 @@
event.type = GDK_MOTION_NOTIFY;
event.motion.x = lastMousePositionX;
event.motion.y = lastMousePositionY;
+
event.motion.time = GDK_CURRENT_TIME;
event.motion.window = GTK_WIDGET(view)->window;
event.motion.device = gdk_device_get_core_pointer();
+ event.motion.state = getStateFlags();
- int x_root, y_root;
+ int xRoot, yRoot;
#if GTK_CHECK_VERSION(2,17,3)
- gdk_window_get_root_coords(GTK_WIDGET(view)->window, lastMousePositionX, lastMousePositionY, &x_root, &y_root);
+ gdk_window_get_root_coords(GTK_WIDGET(view)->window, lastMousePositionX, lastMousePositionY, &xRoot, &yRoot);
#else
- getRootCoords(GTK_WIDGET(view), &x_root, &y_root);
+ getRootCoords(GTK_WIDGET(view), &xRoot, &yRoot);
#endif
+ event.motion.x_root = xRoot;
+ event.motion.y_root = yRoot;
- event.motion.x_root = x_root;
- event.motion.y_root = y_root;
-
- event.motion.state = getStateFlags();
-
- if (dragMode && down && !replayingSavedEvents) {
- msgQueue[endOfQueue].event = event;
- msgQueue[endOfQueue++].isDragEvent = true;
- } else {
- webkit_web_frame_layout(mainFrame);
-
- gboolean return_val;
- g_signal_emit_by_name(view, "motion_notify_event", &event, &return_val);
- }
-
+ sendOrQueueEvent(event);
return JSValueMakeUndefined(context);
}
@@ -363,14 +322,7 @@
else
g_assert_not_reached();
- if (dragMode && down && !replayingSavedEvents) {
- msgQueue[endOfQueue].event = event;
- msgQueue[endOfQueue++].isDragEvent = true;
- } else {
- webkit_web_frame_layout(mainFrame);
- gtk_main_do_event(&event);
- }
-
+ sendOrQueueEvent(event);
return JSValueMakeUndefined(context);
}
@@ -383,49 +335,54 @@
return JSValueMakeUndefined(context);
}
-void replaySavedEvents()
+static void sendOrQueueEvent(GdkEvent event)
{
- // FIXME: This doesn't deal with forward leaps, but it should.
+ // Mouse move events are queued if the previous event was queued or if a
+ // delay was set up by leapForward().
+ if (endOfQueue != startOfQueue || msgQueue[endOfQueue].delay) {
+ msgQueue[endOfQueue++].event = event;
+ replaySavedEvents();
+ return;
+ }
+
+ dispatchEvent(event);
+}
+static void dispatchEvent(GdkEvent event)
+{
+ webkit_web_frame_layout(mainFrame);
WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
if (!view)
return;
- replayingSavedEvents = true;
+ gboolean returnValue;
+ if (event.type == GDK_BUTTON_PRESS || event.type == GDK_2BUTTON_PRESS || event.type == GDK_3BUTTON_PRESS)
+ g_signal_emit_by_name(view, "button_press_event", &event, &returnValue);
+ else if (event.type == GDK_BUTTON_RELEASE)
+ g_signal_emit_by_name(view, "button_release_event", &event, &returnValue);
+ else if (event.type == GDK_MOTION_NOTIFY)
+ g_signal_emit_by_name(view, "motion_notify_event", &event, &returnValue);
+ else if (event.type == GDK_SCROLL)
+ gtk_main_do_event(&event);
+}
- for (unsigned queuePos = 0; queuePos < endOfQueue; queuePos++) {
- GdkEvent event = msgQueue[queuePos].event;
- gboolean return_val;
-
- switch (event.type) {
- case GDK_BUTTON_RELEASE:
- g_signal_emit_by_name(view, "button_release_event", &event, &return_val);
- break;
- case GDK_BUTTON_PRESS:
- g_signal_emit_by_name(view, "button_press_event", &event, &return_val);
- break;
- case GDK_MOTION_NOTIFY:
- g_signal_emit_by_name(view, "motion_notify_event", &event, &return_val);
- break;
- default:
- continue;
+void replaySavedEvents()
+{
+ // FIXME: Eventually we may need to have more sophisticated logic to
+ // track drag-and-drop operations.
+
+ // First send all the events that are ready to be sent
+ while (startOfQueue < endOfQueue) {
+ if (msgQueue[startOfQueue].delay) {
+ g_usleep(msgQueue[startOfQueue].delay * 1000);
+ msgQueue[startOfQueue].delay = 0;
}
- startOfQueue++;
- }
-
- int numQueuedMessages = endOfQueue - startOfQueue;
- if (!numQueuedMessages) {
- startOfQueue = 0;
- endOfQueue = 0;
- replayingSavedEvents = false;
- return;
+ dispatchEvent(msgQueue[startOfQueue++].event);
}
startOfQueue = 0;
endOfQueue = 0;
-
- replayingSavedEvents = false;
}
static JSValueRef keyDownCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
@@ -659,17 +616,24 @@
return eventSenderClass;
}
-JSObjectRef makeEventSender(JSContextRef context)
+JSObjectRef makeEventSender(JSContextRef context, bool isTopFrame)
{
- down = false;
- dragMode = true;
- lastMousePositionX = lastMousePositionY = 0;
- lastClickPositionX = lastClickPositionY = 0;
-
- if (!replayingSavedEvents) {
- // This function can be called in the middle of a test, even
- // while replaying saved events. Resetting these while doing that
- // can break things.
+ if (isTopFrame) {
+ dragMode = true;
+
+ // Fly forward in time one second when the main frame loads. This will
+ // ensure that when a test begins clicking in the same location as
+ // a previous test, those clicks won't be interpreted as continuations
+ // of the previous test's click sequences.
+ timeOffset += 1000;
+
+ lastMousePositionX = lastMousePositionY = 0;
+ lastClickPositionX = lastClickPositionY = 0;
+ lastClickTimeOffset = 0;
+ lastClickButton = 0;
+ buttonCurrentlyDown = 0;
+ clickCount = 0;
+
endOfQueue = 0;
startOfQueue = 0;
}
--- WebKitTools/DumpRenderTree/gtk/EventSender.h
+++ WebKitTools/DumpRenderTree/gtk/EventSender.h
@@ -33,7 +33,7 @@
typedef const struct OpaqueJSContext* JSContextRef;
typedef struct OpaqueJSValue* JSObjectRef;
-JSObjectRef makeEventSender(JSContextRef context);
+JSObjectRef makeEventSender(JSContextRef context, bool isTopFrame);
void replaySavedEvents();
#endif
--- WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
+++ WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
@@ -337,6 +337,15 @@
g_object_set(G_OBJECT(settings), "enable-private-browsing", flag, NULL);
}
+void LayoutTestController::setJavaScriptCanAccessClipboard(bool flag)
+{
+ WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
+ ASSERT(view);
+
+ WebKitWebSettings* settings = webkit_web_view_get_settings(view);
+ g_object_set(G_OBJECT(settings), "javascript-can-access-clipboard", flag, NULL);
+}
+
void LayoutTestController::setXSSAuditorEnabled(bool flag)
{
WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
--- aclocal.m4
+++ aclocal.m4
@@ -20,6 +20,7 @@
To do so, use the procedure documented by the package, typically `autoreconf'.])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
#
# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
#
@@ -47,7 +48,10 @@
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
@@ -60,7 +64,6 @@
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
-
fi[]dnl
])# PKG_PROG_PKG_CONFIG
@@ -69,34 +72,31 @@
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_ifval([$2], [$2], [:])
+ m4_default([$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
-
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -138,16 +138,17 @@
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- ifelse([$4], , [AC_MSG_ERROR(dnl
+ m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
@@ -155,25 +156,24 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT
-])],
- [AC_MSG_RESULT([no])
- $4])
+_PKG_TEXT])dnl
+ ])
elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
- [$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+ ])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
- ifelse([$3], , :, [$3])
+ $3
fi[]dnl
])# PKG_CHECK_MODULES
--- configure
+++ configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for WebKit 1.2.1.
+# Generated by GNU Autoconf 2.65 for WebKit 1.2.3.
#
# Report bugs to <http://bugs.webkit.org/>.
#
@@ -701,8 +701,8 @@
# Identity of this package.
PACKAGE_NAME='WebKit'
PACKAGE_TARNAME='webkit'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='WebKit 1.2.1'
+PACKAGE_VERSION='1.2.3'
+PACKAGE_STRING='WebKit 1.2.3'
PACKAGE_BUGREPORT='http://bugs.webkit.org/'
PACKAGE_URL=''
@@ -881,8 +881,6 @@
LIBSOUP_2_29_90_CFLAGS
LIBSOUP_LIBS
LIBSOUP_CFLAGS
-GIRTYPELIBDIR
-GIRDIR
G_IR_GENERATE
G_IR_COMPILER
G_IR_SCANNER
@@ -913,6 +911,8 @@
HILDON_CPPFLAGS
HILDON_LIBS
HILDON_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
PNG_LIBS
JPEG_LIBS
GPERF
@@ -1120,6 +1120,8 @@
CPP
CXXCPP
PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
HILDON_CFLAGS
HILDON_LIBS
GLIB_CFLAGS
@@ -1697,7 +1699,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures WebKit 1.2.1 to adapt to many kinds of systems.
+\`configure' configures WebKit 1.2.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1767,7 +1769,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of WebKit 1.2.1:";;
+ short | recursive ) echo "Configuration of WebKit 1.2.3:";;
esac
cat <<\_ACEOF
@@ -1873,6 +1875,10 @@
CPP C preprocessor
CXXCPP C++ preprocessor
PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
HILDON_CFLAGS
C compiler flags for HILDON, overriding pkg-config
HILDON_LIBS linker flags for HILDON, overriding pkg-config
@@ -2000,7 +2006,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-WebKit configure 1.2.1
+WebKit configure 1.2.3
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2546,7 +2552,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by WebKit $as_me 1.2.1, which was
+It was created by WebKit $as_me 1.2.3, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2997,7 +3003,7 @@
WEBKIT_MAJOR_VERSION=1
WEBKIT_MINOR_VERSION=2
-WEBKIT_MICRO_VERSION=1
+WEBKIT_MICRO_VERSION=3
WEBKIT_USER_AGENT_MAJOR_VERSION=531
WEBKIT_USER_AGENT_MINOR_VERSION=2
@@ -3008,7 +3014,7 @@
-LIBWEBKITGTK_VERSION=19:3:17
+LIBWEBKITGTK_VERSION=19:5:17
am__api_version='1.11'
@@ -3449,7 +3455,7 @@
# Define the identity of the package.
PACKAGE='webkit'
- VERSION='1.2.1'
+ VERSION='1.2.3'
cat >>confdefs.h <<_ACEOF
@@ -7716,13 +7722,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:7719: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:7725: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:7722: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:7728: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:7725: output\"" >&5)
+ (eval echo "\"\$as_me:7731: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -8924,7 +8930,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8927 "configure"' > conftest.$ac_ext
+ echo '#line 8933 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10680,11 +10686,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10683: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10689: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10687: \$? = $ac_status" >&5
+ echo "$as_me:10693: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11019,11 +11025,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11022: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11028: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11026: \$? = $ac_status" >&5
+ echo "$as_me:11032: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11124,11 +11130,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11127: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11133: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11131: \$? = $ac_status" >&5
+ echo "$as_me:11137: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11179,11 +11185,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11182: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11188: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11186: \$? = $ac_status" >&5
+ echo "$as_me:11192: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13563,7 +13569,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13566 "configure"
+#line 13572 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13659,7 +13665,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13662 "configure"
+#line 13668 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -15615,11 +15621,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15618: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15624: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15622: \$? = $ac_status" >&5
+ echo "$as_me:15628: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15714,11 +15720,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15717: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15723: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15721: \$? = $ac_status" >&5
+ echo "$as_me:15727: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15766,11 +15772,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15769: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15775: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15773: \$? = $ac_status" >&5
+ echo "$as_me:15779: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17331,6 +17337,10 @@
HILDON_CPPFLAGS="-DMAEMO_CHANGES"
+
+
+
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -17443,18 +17453,16 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-
fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HILDON" >&5
$as_echo_n "checking for HILDON... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$HILDON_CFLAGS"; then
- pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$HILDON_CFLAGS"; then
+ pkg_cv_HILDON_CFLAGS="$HILDON_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-1\""; } >&5
($PKG_CONFIG --exists --print-errors "hildon-1") 2>&5
ac_status=$?
@@ -17464,15 +17472,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$HILDON_LIBS"; then
- pkg_cv_HILDON_LIBS="$HILDON_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$HILDON_LIBS"; then
+ pkg_cv_HILDON_LIBS="$HILDON_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hildon-1\""; } >&5
($PKG_CONFIG --exists --print-errors "hildon-1") 2>&5
ac_status=$?
@@ -17482,14 +17488,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -17497,9 +17504,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1"`
+ HILDON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hildon-1" 2>&1`
else
- HILDON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1"`
+ HILDON_PKG_ERRORS=`$PKG_CONFIG --print-errors "hildon-1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$HILDON_PKG_ERRORS" >&5
@@ -17513,9 +17520,10 @@
Alternatively, you may set the environment variables HILDON_CFLAGS
and HILDON_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -17533,7 +17541,7 @@
HILDON_LIBS=$pkg_cv_HILDON_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -17575,11 +17583,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
$as_echo_n "checking for GLIB... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GLIB_CFLAGS"; then
- pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GLIB_CFLAGS"; then
+ pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
gobject-2.0 >= \$GOBJECT_REQUIRED_VERSION
gthread-2.0 >= \$GTHREAD_REQUIRED_VERSION\""; } >&5
@@ -17595,15 +17602,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GLIB_LIBS"; then
- pkg_cv_GLIB_LIBS="$GLIB_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GLIB_LIBS"; then
+ pkg_cv_GLIB_LIBS="$GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED_VERSION
gobject-2.0 >= \$GOBJECT_REQUIRED_VERSION
gthread-2.0 >= \$GTHREAD_REQUIRED_VERSION\""; } >&5
@@ -17619,14 +17624,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -17634,13 +17640,13 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
- gthread-2.0 >= $GTHREAD_REQUIRED_VERSION"`
+ gthread-2.0 >= $GTHREAD_REQUIRED_VERSION" 2>&1`
else
- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQUIRED_VERSION
gobject-2.0 >= $GOBJECT_REQUIRED_VERSION
- gthread-2.0 >= $GTHREAD_REQUIRED_VERSION"`
+ gthread-2.0 >= $GTHREAD_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GLIB_PKG_ERRORS" >&5
@@ -17656,9 +17662,10 @@
Alternatively, you may set the environment variables GLIB_CFLAGS
and GLIB_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -17676,7 +17683,7 @@
GLIB_LIBS=$pkg_cv_GLIB_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -17857,11 +17864,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNICODE" >&5
$as_echo_n "checking for UNICODE... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$UNICODE_CFLAGS"; then
- pkg_cv_UNICODE_CFLAGS="$UNICODE_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$UNICODE_CFLAGS"; then
+ pkg_cv_UNICODE_CFLAGS="$UNICODE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 pango >= 1.21.0\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 pango >= 1.21.0") 2>&5
ac_status=$?
@@ -17871,15 +17877,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$UNICODE_LIBS"; then
- pkg_cv_UNICODE_LIBS="$UNICODE_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$UNICODE_LIBS"; then
+ pkg_cv_UNICODE_LIBS="$UNICODE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 pango >= 1.21.0\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 pango >= 1.21.0") 2>&5
ac_status=$?
@@ -17889,14 +17893,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -17904,9 +17909,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- UNICODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 pango >= 1.21.0"`
+ UNICODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 pango >= 1.21.0" 2>&1`
else
- UNICODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 pango >= 1.21.0"`
+ UNICODE_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 pango >= 1.21.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$UNICODE_PKG_ERRORS" >&5
@@ -17920,9 +17925,10 @@
Alternatively, you may set the environment variables UNICODE_CFLAGS
and UNICODE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -17940,7 +17946,7 @@
UNICODE_LIBS=$pkg_cv_UNICODE_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
fi
@@ -17971,11 +17977,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML" >&5
$as_echo_n "checking for LIBXML... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBXML_CFLAGS"; then
- pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBXML_CFLAGS"; then
+ pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -17985,15 +17990,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBXML_LIBS"; then
- pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBXML_LIBS"; then
+ pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= \$LIBXML_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= $LIBXML_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18003,14 +18006,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -18018,9 +18022,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML_REQUIRED_VERSION"`
+ LIBXML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= $LIBXML_REQUIRED_VERSION" 2>&1`
else
- LIBXML_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 >= $LIBXML_REQUIRED_VERSION"`
+ LIBXML_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= $LIBXML_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBXML_PKG_ERRORS" >&5
@@ -18034,9 +18038,10 @@
Alternatively, you may set the environment variables LIBXML_CFLAGS
and LIBXML_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -18054,7 +18059,7 @@
LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -18064,11 +18069,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
$as_echo_n "checking for PANGO... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$PANGO_CFLAGS"; then
- pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$PANGO_CFLAGS"; then
+ pkg_cv_PANGO_CFLAGS="$PANGO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED_VERSION
pangoft2\""; } >&5
($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED_VERSION
@@ -18081,15 +18085,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$PANGO_LIBS"; then
- pkg_cv_PANGO_LIBS="$PANGO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$PANGO_LIBS"; then
+ pkg_cv_PANGO_LIBS="$PANGO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED_VERSION
pangoft2\""; } >&5
($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED_VERSION
@@ -18102,14 +18104,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -18117,11 +18120,11 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED_VERSION
- pangoft2"`
+ PANGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED_VERSION
+ pangoft2" 2>&1`
else
- PANGO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pango >= $PANGO_REQUIRED_VERSION
- pangoft2"`
+ PANGO_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED_VERSION
+ pangoft2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$PANGO_PKG_ERRORS" >&5
@@ -18136,9 +18139,10 @@
Alternatively, you may set the environment variables PANGO_CFLAGS
and PANGO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -18156,7 +18160,7 @@
PANGO_LIBS=$pkg_cv_PANGO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -18166,11 +18170,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENCHANT" >&5
$as_echo_n "checking for ENCHANT... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$ENCHANT_CFLAGS"; then
- pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$ENCHANT_CFLAGS"; then
+ pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18180,15 +18183,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$ENCHANT_LIBS"; then
- pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$ENCHANT_LIBS"; then
+ pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= \$ENCHANT_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "enchant >= $ENCHANT_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18198,14 +18199,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -18213,9 +18215,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "enchant >= $ENCHANT_REQUIRED_VERSION"`
+ ENCHANT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "enchant >= $ENCHANT_REQUIRED_VERSION" 2>&1`
else
- ENCHANT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "enchant >= $ENCHANT_REQUIRED_VERSION"`
+ ENCHANT_PKG_ERRORS=`$PKG_CONFIG --print-errors "enchant >= $ENCHANT_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$ENCHANT_PKG_ERRORS" >&5
@@ -18229,9 +18231,10 @@
Alternatively, you may set the environment variables ENCHANT_CFLAGS
and ENCHANT_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -18249,7 +18252,7 @@
ENCHANT_LIBS=$pkg_cv_ENCHANT_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -18259,11 +18262,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GAIL" >&5
$as_echo_n "checking for GAIL... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GAIL_CFLAGS"; then
- pkg_cv_GAIL_CFLAGS="$GAIL_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GAIL_CFLAGS"; then
+ pkg_cv_GAIL_CFLAGS="$GAIL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gail >= \$GAIL_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "gail >= $GAIL_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18273,15 +18275,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GAIL_LIBS"; then
- pkg_cv_GAIL_LIBS="$GAIL_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GAIL_LIBS"; then
+ pkg_cv_GAIL_LIBS="$GAIL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gail >= \$GAIL_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "gail >= $GAIL_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18291,14 +18291,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -18306,9 +18307,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GAIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gail >= $GAIL_REQUIRED_VERSION"`
+ GAIL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gail >= $GAIL_REQUIRED_VERSION" 2>&1`
else
- GAIL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gail >= $GAIL_REQUIRED_VERSION"`
+ GAIL_PKG_ERRORS=`$PKG_CONFIG --print-errors "gail >= $GAIL_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GAIL_PKG_ERRORS" >&5
@@ -18322,9 +18323,10 @@
Alternatively, you may set the environment variables GAIL_CFLAGS
and GAIL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -18342,7 +18344,7 @@
GAIL_LIBS=$pkg_cv_GAIL_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -18354,11 +18356,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
$as_echo_n "checking for CAIRO... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$CAIRO_CFLAGS"; then
- pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$CAIRO_CFLAGS"; then
+ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-directfb >= \$CAIRO_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "cairo-directfb >= $CAIRO_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18368,15 +18369,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$CAIRO_LIBS"; then
- pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$CAIRO_LIBS"; then
+ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-directfb >= \$CAIRO_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "cairo-directfb >= $CAIRO_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18386,14 +18385,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -18401,9 +18401,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo-directfb >= $CAIRO_REQUIRED_VERSION"`
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-directfb >= $CAIRO_REQUIRED_VERSION" 2>&1`
else
- CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-directfb >= $CAIRO_REQUIRED_VERSION"`
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo-directfb >= $CAIRO_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_PKG_ERRORS" >&5
@@ -18417,9 +18417,10 @@
Alternatively, you may set the environment variables CAIRO_CFLAGS
and CAIRO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -18437,18 +18438,17 @@
CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
$as_echo_n "checking for GTK... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTK_CFLAGS"; then
- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GTK_CFLAGS"; then
+ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-directfb-2.0 >= \$GTK_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18458,15 +18458,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTK_LIBS"; then
- pkg_cv_GTK_LIBS="$GTK_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GTK_LIBS"; then
+ pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-directfb-2.0 >= \$GTK_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18476,14 +18474,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -18491,9 +18490,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION"`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION" 2>&1`
else
- GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION"`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@ -18507,9 +18506,10 @@
Alternatively, you may set the environment variables GTK_CFLAGS
and GTK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -18527,7 +18527,7 @@
GTK_LIBS=$pkg_cv_GTK_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
$as_echo "#define WTF_PLATFORM_DIRECTFB 1" >>confdefs.h
@@ -18538,11 +18538,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
$as_echo_n "checking for CAIRO... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$CAIRO_CFLAGS"; then
- pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$CAIRO_CFLAGS"; then
+ pkg_cv_CAIRO_CFLAGS="$CAIRO_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18552,15 +18551,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$CAIRO_LIBS"; then
- pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$CAIRO_LIBS"; then
+ pkg_cv_CAIRO_LIBS="$CAIRO_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= \$CAIRO_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "cairo >= $CAIRO_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18570,14 +18567,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -18585,9 +18583,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo >= $CAIRO_REQUIRED_VERSION"`
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo >= $CAIRO_REQUIRED_VERSION" 2>&1`
else
- CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= $CAIRO_REQUIRED_VERSION"`
+ CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo >= $CAIRO_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_PKG_ERRORS" >&5
@@ -18601,9 +18599,10 @@
Alternatively, you may set the environment variables CAIRO_CFLAGS
and CAIRO_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -18621,18 +18620,17 @@
CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
$as_echo_n "checking for GTK... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTK_CFLAGS"; then
- pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GTK_CFLAGS"; then
+ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18642,15 +18640,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTK_LIBS"; then
- pkg_cv_GTK_LIBS="$GTK_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GTK_LIBS"; then
+ pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -18660,14 +18656,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -18675,9 +18672,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION"`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>&1`
else
- GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION"`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@ -18691,9 +18688,10 @@
Alternatively, you may set the environment variables GTK_CFLAGS
and GTK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -18711,7 +18709,7 @@
GTK_LIBS=$pkg_cv_GTK_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
if test "$with_target" = "x11" && test "$os_win32" = "no"; then
@@ -18721,11 +18719,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XT" >&5
$as_echo_n "checking for XT... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$XT_CFLAGS"; then
- pkg_cv_XT_CFLAGS="$XT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$XT_CFLAGS"; then
+ pkg_cv_XT_CFLAGS="$XT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
($PKG_CONFIG --exists --print-errors "xt") 2>&5
ac_status=$?
@@ -18735,15 +18732,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$XT_LIBS"; then
- pkg_cv_XT_LIBS="$XT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$XT_LIBS"; then
+ pkg_cv_XT_LIBS="$XT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xt\""; } >&5
($PKG_CONFIG --exists --print-errors "xt") 2>&5
ac_status=$?
@@ -18753,14 +18748,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -18768,17 +18764,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xt"`
+ XT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xt" 2>&1`
else
- XT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xt"`
+ XT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xt" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$XT_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- xt_has_pkg_config=no
+ xt_has_pkg_config=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
xt_has_pkg_config=no
else
XT_CFLAGS=$pkg_cv_XT_CFLAGS
@@ -19406,11 +19402,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INTROSPECTION" >&5
$as_echo_n "checking for INTROSPECTION... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$INTROSPECTION_CFLAGS"; then
- pkg_cv_INTROSPECTION_CFLAGS="$INTROSPECTION_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$INTROSPECTION_CFLAGS"; then
+ pkg_cv_INTROSPECTION_CFLAGS="$INTROSPECTION_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
ac_status=$?
@@ -19420,15 +19415,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$INTROSPECTION_LIBS"; then
- pkg_cv_INTROSPECTION_LIBS="$INTROSPECTION_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$INTROSPECTION_LIBS"; then
+ pkg_cv_INTROSPECTION_LIBS="$INTROSPECTION_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
ac_status=$?
@@ -19438,14 +19431,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19453,9 +19447,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED"`
+ INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1`
else
- INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED"`
+ INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$INTROSPECTION_PKG_ERRORS" >&5
@@ -19469,9 +19463,10 @@
Alternatively, you may set the environment variables INTROSPECTION_CFLAGS
and INTROSPECTION_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -19489,15 +19484,12 @@
INTROSPECTION_LIBS=$pkg_cv_INTROSPECTION_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)"
G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)"
G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)"
- GIRDIR="$($PKG_CONFIG --define-variable=prefix=$prefix --variable=girdir gobject-introspection-1.0)"
- GIRTYPELIBDIR="$($PKG_CONFIG --define-variable=prefix=$prefix --variable=typelibdir gobject-introspection-1.0)"
-
$as_echo "#define ENABLE_INTROSPECTION 1" >>confdefs.h
@@ -19507,8 +19499,6 @@
-
-
# determine the font backend
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the font backend to use" >&5
$as_echo_n "checking the font backend to use... " >&6; }
@@ -19552,11 +19542,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSOUP" >&5
$as_echo_n "checking for LIBSOUP... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSOUP_CFLAGS"; then
- pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBSOUP_CFLAGS"; then
+ pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= \$LIBSOUP_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -19566,15 +19555,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSOUP_LIBS"; then
- pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBSOUP_LIBS"; then
+ pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= \$LIBSOUP_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -19584,14 +19571,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19599,9 +19587,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION"`
+ LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION" 2>&1`
else
- LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION"`
+ LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBSOUP_PKG_ERRORS" >&5
@@ -19615,9 +19603,10 @@
Alternatively, you may set the environment variables LIBSOUP_CFLAGS
and LIBSOUP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -19635,7 +19624,7 @@
LIBSOUP_LIBS=$pkg_cv_LIBSOUP_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -19646,11 +19635,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSOUP_2_29_90" >&5
$as_echo_n "checking for LIBSOUP_2_29_90... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSOUP_2_29_90_CFLAGS"; then
- pkg_cv_LIBSOUP_2_29_90_CFLAGS="$LIBSOUP_2_29_90_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBSOUP_2_29_90_CFLAGS"; then
+ pkg_cv_LIBSOUP_2_29_90_CFLAGS="$LIBSOUP_2_29_90_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.29.90\""; } >&5
($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.29.90") 2>&5
ac_status=$?
@@ -19660,15 +19648,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSOUP_2_29_90_LIBS"; then
- pkg_cv_LIBSOUP_2_29_90_LIBS="$LIBSOUP_2_29_90_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBSOUP_2_29_90_LIBS"; then
+ pkg_cv_LIBSOUP_2_29_90_LIBS="$LIBSOUP_2_29_90_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.29.90\""; } >&5
($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.29.90") 2>&5
ac_status=$?
@@ -19678,14 +19664,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19693,17 +19680,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSOUP_2_29_90_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4 >= 2.29.90"`
+ LIBSOUP_2_29_90_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.4 >= 2.29.90" 2>&1`
else
- LIBSOUP_2_29_90_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4 >= 2.29.90"`
+ LIBSOUP_2_29_90_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.4 >= 2.29.90" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBSOUP_2_29_90_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- have_libsoup_2_29_90=no
+ have_libsoup_2_29_90=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
have_libsoup_2_29_90=no
else
LIBSOUP_2_29_90_CFLAGS=$pkg_cv_LIBSOUP_2_29_90_CFLAGS
@@ -19726,11 +19713,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
$as_echo_n "checking for FREETYPE... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$FREETYPE_CFLAGS"; then
- pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$FREETYPE_CFLAGS"; then
+ pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
freetype2 >= \$FREETYPE2_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
@@ -19743,15 +19729,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$FREETYPE_LIBS"; then
- pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$FREETYPE_LIBS"; then
+ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
freetype2 >= \$FREETYPE2_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
@@ -19764,14 +19748,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19779,11 +19764,11 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
- freetype2 >= $FREETYPE2_REQUIRED_VERSION"`
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
+ freetype2 >= $FREETYPE2_REQUIRED_VERSION" 2>&1`
else
- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
- freetype2 >= $FREETYPE2_REQUIRED_VERSION"`
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontconfig >= $FONTCONFIG_REQUIRED_VERSION
+ freetype2 >= $FREETYPE2_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$FREETYPE_PKG_ERRORS" >&5
@@ -19798,9 +19783,10 @@
Alternatively, you may set the environment variables FREETYPE_CFLAGS
and FREETYPE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -19818,7 +19804,7 @@
FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
else
@@ -19826,11 +19812,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FREETYPE" >&5
$as_echo_n "checking for FREETYPE... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$FREETYPE_CFLAGS"; then
- pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$FREETYPE_CFLAGS"; then
+ pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-ft
fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
freetype2 >= \$FREETYPE2_REQUIRED_VERSION\""; } >&5
@@ -19846,15 +19831,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$FREETYPE_LIBS"; then
- pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$FREETYPE_LIBS"; then
+ pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-ft
fontconfig >= \$FONTCONFIG_REQUIRED_VERSION
freetype2 >= \$FREETYPE2_REQUIRED_VERSION\""; } >&5
@@ -19870,14 +19853,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19885,13 +19869,13 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo-ft
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-ft
fontconfig >= $FONTCONFIG_REQUIRED_VERSION
- freetype2 >= $FREETYPE2_REQUIRED_VERSION"`
+ freetype2 >= $FREETYPE2_REQUIRED_VERSION" 2>&1`
else
- FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo-ft
+ FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo-ft
fontconfig >= $FONTCONFIG_REQUIRED_VERSION
- freetype2 >= $FREETYPE2_REQUIRED_VERSION"`
+ freetype2 >= $FREETYPE2_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$FREETYPE_PKG_ERRORS" >&5
@@ -19907,9 +19891,10 @@
Alternatively, you may set the environment variables FREETYPE_CFLAGS
and FREETYPE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -19927,7 +19912,7 @@
FREETYPE_LIBS=$pkg_cv_FREETYPE_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
fi
@@ -19944,11 +19929,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SQLITE3" >&5
$as_echo_n "checking for SQLITE3... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$SQLITE3_CFLAGS"; then
- pkg_cv_SQLITE3_CFLAGS="$SQLITE3_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$SQLITE3_CFLAGS"; then
+ pkg_cv_SQLITE3_CFLAGS="$SQLITE3_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= \$SQLITE_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "sqlite3 >= $SQLITE_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -19958,15 +19942,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$SQLITE3_LIBS"; then
- pkg_cv_SQLITE3_LIBS="$SQLITE3_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$SQLITE3_LIBS"; then
+ pkg_cv_SQLITE3_LIBS="$SQLITE3_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= \$SQLITE_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "sqlite3 >= $SQLITE_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -19976,14 +19958,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19991,17 +19974,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "sqlite3 >= $SQLITE_REQUIRED_VERSION"`
+ SQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sqlite3 >= $SQLITE_REQUIRED_VERSION" 2>&1`
else
- SQLITE3_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= $SQLITE_REQUIRED_VERSION"`
+ SQLITE3_PKG_ERRORS=`$PKG_CONFIG --print-errors "sqlite3 >= $SQLITE_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$SQLITE3_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- sqlite3_has_pkg_config=no
+ sqlite3_has_pkg_config=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
sqlite3_has_pkg_config=no
else
SQLITE3_CFLAGS=$pkg_cv_SQLITE3_CFLAGS
@@ -20081,11 +20064,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXSLT" >&5
$as_echo_n "checking for LIBXSLT... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBXSLT_CFLAGS"; then
- pkg_cv_LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBXSLT_CFLAGS"; then
+ pkg_cv_LIBXSLT_CFLAGS="$LIBXSLT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= \$LIBXSLT_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "libxslt >= $LIBXSLT_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -20095,15 +20077,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBXSLT_LIBS"; then
- pkg_cv_LIBXSLT_LIBS="$LIBXSLT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBXSLT_LIBS"; then
+ pkg_cv_LIBXSLT_LIBS="$LIBXSLT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= \$LIBXSLT_REQUIRED_VERSION\""; } >&5
($PKG_CONFIG --exists --print-errors "libxslt >= $LIBXSLT_REQUIRED_VERSION") 2>&5
ac_status=$?
@@ -20113,14 +20093,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20128,9 +20109,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxslt >= $LIBXSLT_REQUIRED_VERSION"`
+ LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxslt >= $LIBXSLT_REQUIRED_VERSION" 2>&1`
else
- LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxslt >= $LIBXSLT_REQUIRED_VERSION"`
+ LIBXSLT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxslt >= $LIBXSLT_REQUIRED_VERSION" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBXSLT_PKG_ERRORS" >&5
@@ -20144,9 +20125,10 @@
Alternatively, you may set the environment variables LIBXSLT_CFLAGS
and LIBXSLT_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -20164,7 +20146,7 @@
LIBXSLT_LIBS=$pkg_cv_LIBXSLT_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -20177,11 +20159,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEOCLUE" >&5
$as_echo_n "checking for GEOCLUE... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GEOCLUE_CFLAGS"; then
- pkg_cv_GEOCLUE_CFLAGS="$GEOCLUE_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GEOCLUE_CFLAGS"; then
+ pkg_cv_GEOCLUE_CFLAGS="$GEOCLUE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"geoclue\""; } >&5
($PKG_CONFIG --exists --print-errors "geoclue") 2>&5
ac_status=$?
@@ -20191,15 +20172,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GEOCLUE_LIBS"; then
- pkg_cv_GEOCLUE_LIBS="$GEOCLUE_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GEOCLUE_LIBS"; then
+ pkg_cv_GEOCLUE_LIBS="$GEOCLUE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"geoclue\""; } >&5
($PKG_CONFIG --exists --print-errors "geoclue") 2>&5
ac_status=$?
@@ -20209,14 +20188,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20224,9 +20204,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "geoclue"`
+ GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "geoclue" 2>&1`
else
- GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "geoclue"`
+ GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --print-errors "geoclue" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GEOCLUE_PKG_ERRORS" >&5
@@ -20240,9 +20220,10 @@
Alternatively, you may set the environment variables GEOCLUE_CFLAGS
and GEOCLUE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -20260,7 +20241,7 @@
GEOCLUE_LIBS=$pkg_cv_GEOCLUE_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -20273,11 +20254,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
$as_echo_n "checking for GSTREAMER... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GSTREAMER_CFLAGS"; then
- pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GSTREAMER_CFLAGS"; then
+ pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED_VERSION
gstreamer-app-0.10
gstreamer-base-0.10
@@ -20302,15 +20282,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GSTREAMER_LIBS"; then
- pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GSTREAMER_LIBS"; then
+ pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= \$GSTREAMER_REQUIRED_VERSION
gstreamer-app-0.10
gstreamer-base-0.10
@@ -20335,14 +20313,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20350,19 +20329,19 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
gstreamer-app-0.10
gstreamer-base-0.10
gstreamer-pbutils-0.10
gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
- gstreamer-video-0.10"`
+ gstreamer-video-0.10" 2>&1`
else
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
gstreamer-app-0.10
gstreamer-base-0.10
gstreamer-pbutils-0.10
gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION
- gstreamer-video-0.10"`
+ gstreamer-video-0.10" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GSTREAMER_PKG_ERRORS" >&5
@@ -20381,9 +20360,10 @@
Alternatively, you may set the environment variables GSTREAMER_CFLAGS
and GSTREAMER_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -20401,7 +20381,7 @@
GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -21841,7 +21821,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by WebKit $as_me 1.2.1, which was
+This file was extended by WebKit $as_me 1.2.3, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21907,7 +21887,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-WebKit config.status 1.2.1
+WebKit config.status 1.2.3
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
--- configure.ac
+++ configure.ac
@@ -2,7 +2,7 @@
m4_define([webkit_major_version], [1])
m4_define([webkit_minor_version], [2])
-m4_define([webkit_micro_version], [1])
+m4_define([webkit_micro_version], [3])
# This is the version we'll be using as part of our User-Agent string
# e.g., AppleWebKit/$(webkit_user_agent_version) ...
@@ -35,7 +35,7 @@
dnl # Libtool library version, not to confuse with API version
dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
-LIBWEBKITGTK_VERSION=19:3:17
+LIBWEBKITGTK_VERSION=19:5:17
AC_SUBST([LIBWEBKITGTK_VERSION])
AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
@@ -636,17 +636,12 @@
G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)"
G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)"
G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)"
- GIRDIR="$($PKG_CONFIG --define-variable=prefix=$prefix --variable=girdir gobject-introspection-1.0)"
- GIRTYPELIBDIR="$($PKG_CONFIG --define-variable=prefix=$prefix --variable=typelibdir gobject-introspection-1.0)"
-
AC_DEFINE([ENABLE_INTROSPECTION],[1],[Define to enable GObject introspection support])
fi
AC_SUBST([G_IR_SCANNER])
AC_SUBST([G_IR_COMPILER])
AC_SUBST([G_IR_GENERATE])
-AC_SUBST([GIRDIR])
-AC_SUBST([GIRTYPELIBDIR])
# determine the font backend
AC_MSG_CHECKING([the font backend to use])
--- gtk-doc.make
+++ gtk-doc.make
@@ -75,8 +75,11 @@
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
@echo 'gtk-doc: Scanning header files'
@-chmod -R u+w $(srcdir)
- @cd $(srcdir) && \
- gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+ @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+ _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ done ; \
+ cd $(srcdir) && \
+ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
@if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
@@ -109,8 +112,11 @@
sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
@echo 'gtk-doc: Building XML'
@-chmod -R u+w $(srcdir)
- @cd $(srcdir) && \
- gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+ @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
+ _source_dir="$${_source_dir} --source-dir=$$i" ; \
+ done ; \
+ cd $(srcdir) && \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
@touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
More information about the MeeGo-commits
mailing list