diff options
Diffstat (limited to 'WebKit/gtk')
25 files changed, 973 insertions, 565 deletions
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog index c602ac1..cde04c9 100644 --- a/WebKit/gtk/ChangeLog +++ b/WebKit/gtk/ChangeLog @@ -1,3 +1,303 @@ +2010-10-20 Philippe Normand <pnormand@igalia.com> + + Reviewed by Xan Lopez. + + [GTK] use gtk_widget_hide instead of gtk_widget_hide_all in the fullscreen video conroller + https://bugs.webkit.org/show_bug.cgi?id=47972 + + * WebCoreSupport/FullscreenVideoController.cpp: + (FullscreenVideoController::hideHud): + (FullscreenVideoController::exitFullscreen): + +2010-10-19 Joone Hur <joone@kldp.org> + + Reviewed by Martin Robinson. + + [GTK] Needs fixing mistyped comments in the API documentation + https://bugs.webkit.org/show_bug.cgi?id=47656 + + Fixed mistyped comments in the API documenentation. + + * webkit/webkitwebsettings.cpp: Fixed a mistyped comment in the the section block. + * webkit/webkitwebwindowfeatures.cpp: Fixed a mistyped comment in the section block. + +2010-10-18 Xan Lopez <xlopez@igalia.com> + + Reviewed by Martin Robinson. + + * NEWS: update for 1.3.5 release. + * docs/webkitgtk-sections.txt: add new APIs. + +2010-10-18 Pavel Feldman <pfeldman@chromium.org> + + Reviewed by Simon Fraser. + + Web Inspector: [crash] when Inspector Open in CSSStyleSelector::loadPendingImages(). + https://bugs.webkit.org/show_bug.cgi?id=46224 + + * WebCoreSupport/InspectorClientGtk.cpp: + (WebKit::InspectorClient::sendMessageToFrontend): + +2010-10-14 Antonio Gomes <agomes@rim.com> + + Reviewed by Martin Robinson and Xan Lopez. + + [Gtk]: DRT does not support frame flattening testing + https://bugs.webkit.org/show_bug.cgi?id=38650 + + Implement enable-frame-flattening API for Gtk+. + + * 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-10-15 Nikolas Zimmermann <nzimmermann@rim.com> + + Reviewed by Dirk Schulze. + + Replace some String::format() usages by StringConcatenate in WebKit + https://bugs.webkit.org/show_bug.cgi?id=47714 + + * WebCoreSupport/FrameLoaderClientGtk.cpp: + (WebKit::FrameLoaderClient::dispatchDidFailLoad): + * webkit/webkitwebsettings.cpp: + (webkitOSVersion): + (webkitUserAgent): + +2010-10-14 Joone Hur <joone@kldp.org> + + Reviewed by Andreas Kling. + + [GTK] google.co.kr was missed when checking Google domains + https://bugs.webkit.org/show_bug.cgi?id=47652 + + WebKitGtk+ maintains a list of Google domains for working well with Google sites. + Add google.co.kr also to the list to be checked with other Google domains. + + * WebCoreSupport/FrameLoaderClientGtk.cpp: + (WebKit::initializeDomainsList): Added google.co.kr. + +2010-10-13 Sergio Villar Senin <svillar@igalia.com> + + Reviewed by Martin Robinson. + + WebKitGtk+ to use the new API from the imported SoupURILoader code + + [GTK] Add HTTP caching support + https://bugs.webkit.org/show_bug.cgi?id=44261 + + ResourceHandleInternal m_msg is now called m_soupMessage. + + * webkit/webkitdownload.cpp: + (webkit_download_new_with_handle): + (webkit_download_start): + +2010-10-13 Xan Lopez <xlopez@igalia.com> + + Reviewed by Gustavo Noronha. + + [GTK] Remove more warnings from the g-i scanner run + https://bugs.webkit.org/show_bug.cgi?id=47255 + + Fixes almost all warnings coming from the g-i scanner. + + * webkit/webkitsecurityorigin.cpp: Rename parameter names in + gtk-doc blurb to the actual name of the parameter. + * webkit/webkitsoupauthdialog.c: ditto. + (webkit_soup_auth_dialog_class_init): Write missing doc for the + 'current-toplevel' signal. + * webkit/webkitsoupauthdialog.h: Rename signal parameter to its + actual name. + * webkit/webkitwebdatabase.cpp: Rename parameter names in + gtk-doc blurb to the actual name of the parameter. + * webkit/webkitwebinspector.cpp: ditto. + (webkit_web_inspector_class_init): ditto. + * webkit/webkitwebview.cpp: ditto. + (webkit_web_view_class_init): ditto. + * webkit/webkitwebview.h: Rename the parameter names to be in sync + with the ones we use in the function definition. + +2010-10-12 Sheriff Bot <webkit.review.bot@gmail.com> + + Unreviewed, rolling out r69589. + http://trac.webkit.org/changeset/69589 + https://bugs.webkit.org/show_bug.cgi?id=47547 + + Wrong patch landed from a bug with two patches (Requested by + mrobinson on #webkit). + + * webkit/webkitdownload.cpp: + (webkit_download_new_with_handle): + (webkit_download_start): + +2010-10-12 Sergio Villar Senin <svillar@igalia.com> + + Reviewed by Martin Robinson. + + [GTK] Add HTTP caching support + https://bugs.webkit.org/show_bug.cgi?id=44261 + + ResourceHandle's m_msg renamed to m_soupMsg and it's also now a PlatformRefPtr + + * webkit/webkitdownload.cpp: + (webkit_download_new_with_handle): + (webkit_download_start): + +2010-10-09 Carlos Garcia Campos <cgarcia@igalia.com> + + Reviewed by Xan Lopez. + + [GTK] Removed unused callback in webkitwebview + https://bugs.webkit.org/show_bug.cgi?id=47092 + + In webkit_web_view_forward_context_menu_event() a callback is + connected for the destroy signal of the popup menu, however we + reuse the same menu always, holding a ref to it, so it's not + destroyed when withdrawn by the user. + + * webkit/webkitwebview.cpp: + (webkit_web_view_forward_context_menu_event): + +2010-10-08 Martin Robinson <mrobinson@igalia.com> + + Reviewed by Xan Lopez. + + [GTK] Remove duplicate code in WebKit/gtk/WebCoreSupport/DragClientGtk.cpp + https://bugs.webkit.org/show_bug.cgi?id=47367 + + Remove as much duplicate code as possible from DragClientGtk. Most of this code + is GTK2/GTK3 independent, so only the bits that aren't should be protected by + #ifdefs. + + * WebCoreSupport/DragClientGtk.cpp: + (WebKit::dragIconWindowDrawEventCallback): Modified the name of this callback + so that it is shared between build types. + (WebKit::DragClient::DragClient): Updated the signal connectors to reflect the change above. + (WebKit::DragClient::~DragClient): The build types share the callback name, so remove + the #ifdef here. + (WebKit::DragClient::drawDragIconWindow): Changed the name of this method and make it + independent of the build type. + * WebCoreSupport/DragClientGtk.h: Update method declaration and remove #ifdefs. + +2010-10-07 Carlos Garcia Campos <cgarcia@igalia.com> + + Reviewed by Xan Lopez. + + [GTK] Use draw instead of expose_event in WebView when building with gtk3 + https://bugs.webkit.org/show_bug.cgi?id=47338 + + * webkit/webkitwebview.cpp: + (webkit_web_view_expose_event): + (webkit_web_view_draw): + (webkit_web_view_class_init): + +2010-10-07 Carlos Garcia Campos <cgarcia@igalia.com> + + Reviewed by Xan Lopez. + + [GTK] Don't use GtkObject + https://bugs.webkit.org/show_bug.cgi?id=47090 + + GtkObject has been removed in gtk3. + + * WebCoreSupport/EditorClientGtk.cpp: + (WebKit::EditorClient::generateEditorCommands): + * WebCoreSupport/FullscreenVideoController.cpp: + (FullscreenVideoController::createHud): + +2010-10-07 Carlos Garcia Campos <cgarcia@igalia.com> + + Reviewed by Xan Lopez. + + [GTK] Fix the build for GTK+ 3 + https://bugs.webkit.org/show_bug.cgi?id=47249 + + Use GdkVisual instead of GdkColormap. GdkColormap has been removed + in gtk3 + + * webkit/webkitwebview.cpp: + (webkit_web_view_realize): + +2010-10-07 Carlos Garcia Campos <cgarcia@igalia.com> + + Reviewed by Xan Lopez. + + [GTK] Fix the build for GTK+ 3 + https://bugs.webkit.org/show_bug.cgi?id=47249 + + Do not use GdkDrawable deprecated API. Some methods of GdkDrawable + are deprecated in gtk2 and have been removed in gtk3. Equivalent + API has been added to GdkWindow. + + * tests/testcopyandpaste.c: + (runPasteTestCallback): + * webkit/webkitwebview.cpp: + (webkit_web_view_button_press_event): + +2010-10-07 Carlos Garcia Campos <cgarcia@igalia.com> + + Reviewed by Xan Lopez. + + [GTK] Use draw signal instead of expose_event in DragClientGtk when building with gtk3 + https://bugs.webkit.org/show_bug.cgi?id=47326 + + * WebCoreSupport/DragClientGtk.cpp: + (WebKit::dragIconWindowDrawCallback): + (WebKit::DragClient::DragClient): + (WebKit::DragClient::~DragClient): + (WebKit::DragClient::startDrag): + (WebKit::DragClient::dragIconWindowDraw): + * WebCoreSupport/DragClientGtk.h: + +2010-10-07 Carlos Garcia Campos <cgarcia@igalia.com> + + Reviewed by Xan Lopez. + + [GTK] Fix the build for GTK+ 3 + https://bugs.webkit.org/show_bug.cgi?id=47249 + + Don't use gtk_size_request_get_size(). It has been removed, + gtk_widget_get_preferred_size() should be used instead + + * webkit/webkitwebview.cpp: + (PopupMenuPositionFunc): + +2010-10-06 Sheriff Bot <webkit.review.bot@gmail.com> + + Unreviewed, rolling out r69201. + http://trac.webkit.org/changeset/69201 + https://bugs.webkit.org/show_bug.cgi?id=47279 + + This change broke the WebKitGTK+ build for GTK+ 2.0. + (Requested by mrobinson on #webkit). + + * tests/testcopyandpaste.c: + (runPasteTestCallback): + * webkit/webkitwebview.cpp: + (webkit_web_view_button_press_event): + +2010-10-06 Carlos Garcia Campos <cgarcia@igalia.com> + + Reviewed by Xan Lopez. + + Port to gtk+3 (2.91.0) + https://bugs.webkit.org/show_bug.cgi?id=47249 + + Do not use GdkDrawable deprecated API + + Some methods of GdkDrawable are deprecated in gtk2 and have been + remmoved in gtk3. Equivalent API has been added to GdkWindow. + + * tests/testcopyandpaste.c: + (runPasteTestCallback): + * webkit/webkitwebview.cpp: + (webkit_web_view_button_press_event): + 2010-09-28 Jenn Braithwaite <jennb@chromium.org> Reviewed by Dmitry Titov. diff --git a/WebKit/gtk/NEWS b/WebKit/gtk/NEWS index ebeb699..ed4cd81 100644 --- a/WebKit/gtk/NEWS +++ b/WebKit/gtk/NEWS @@ -1,4 +1,18 @@ ================ +WebKitGTK+ 1.3.5 +================ + +What's new in WebKitGTK+ 1.3.5? + + - Add a HTTP cache implementation. This will be eventually + integrated in libsoup itself, but for now it can be accessed from + WebKit through the WebKitSoupCache APIs. + - Updated to work with GTK+ 3.x 2.91.1. + - Add frame-flattening support, used by some mobile browser sto + merge all frames in a page into a continuous view. + - Many other bugfixes. + +================ WebKitGTK+ 1.3.4 ================ diff --git a/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp b/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp index cc75d36..b850cec 100644 --- a/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp +++ b/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) Igalia S.L. + * Copyright (C) 2009, 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 @@ -41,23 +41,38 @@ using namespace WebCore; namespace WebKit { -static gboolean dragIconWindowExposeEventCallback(GtkWidget* widget, GdkEventExpose* event, DragClient* client) +#ifdef GTK_API_VERSION_2 +static gboolean dragIconWindowDrawEventCallback(GtkWidget* widget, GdkEventExpose* event, DragClient* client) { - client->dragIconWindowExposeEvent(widget, event); + PlatformRefPtr<cairo_t> context = adoptPlatformRef(gdk_cairo_create(event->window)); + client->drawDragIconWindow(widget, context.get()); return TRUE; } +#else +static gboolean dragIconWindowDrawEventCallback(GtkWidget* widget, cairo_t* context, DragClient* client) +{ + if (!gdk_cairo_get_clip_rectangle(context, 0)) + return FALSE; + client->drawDragIconWindow(widget, context); + return TRUE; +} +#endif // GTK_API_VERSION_2 DragClient::DragClient(WebKitWebView* webView) : m_webView(webView) , m_startPos(0, 0) , m_dragIconWindow(gtk_window_new(GTK_WINDOW_POPUP)) { - g_signal_connect(m_dragIconWindow.get(), "expose-event", G_CALLBACK(dragIconWindowExposeEventCallback), this); +#ifdef GTK_API_VERSION_2 + g_signal_connect(m_dragIconWindow.get(), "expose-event", G_CALLBACK(dragIconWindowDrawEventCallback), this); +#else + g_signal_connect(m_dragIconWindow.get(), "draw", G_CALLBACK(dragIconWindowDrawEventCallback), this); +#endif } DragClient::~DragClient() { - g_signal_handlers_disconnect_by_func(m_dragIconWindow.get(), (gpointer) dragIconWindowExposeEventCallback, this); + g_signal_handlers_disconnect_by_func(m_dragIconWindow.get(), (gpointer) dragIconWindowDrawEventCallback, this); } void DragClient::willPerformDragDestinationAction(DragDestinationAction, DragData*) @@ -106,9 +121,16 @@ void DragClient::startDrag(DragImageRef image, const IntPoint& dragImageOrigin, if (!gtk_widget_get_realized(m_dragIconWindow.get())) { GdkScreen* screen = gtk_widget_get_screen(m_dragIconWindow.get()); +#ifdef GTK_API_VERSION_2 GdkColormap* rgba = gdk_screen_get_rgba_colormap(screen); if (rgba) gtk_widget_set_colormap(m_dragIconWindow.get(), rgba); +#else + GdkVisual* visual = gdk_screen_get_rgba_visual(screen); + if (!visual) + visual = gdk_screen_get_system_visual(screen); + gtk_widget_set_visual(m_dragIconWindow.get(), visual); +#endif // GTK_API_VERSION_2 } IntSize origin = eventPos - dragImageOrigin; @@ -118,15 +140,14 @@ void DragClient::startDrag(DragImageRef image, const IntPoint& dragImageOrigin, gtk_drag_set_icon_default(context); } -void DragClient::dragIconWindowExposeEvent(GtkWidget* widget, GdkEventExpose* event) +void DragClient::drawDragIconWindow(GtkWidget* widget, cairo_t* context) { - PlatformRefPtr<cairo_t> context = adoptPlatformRef(gdk_cairo_create(event->window)); - cairo_rectangle(context.get(), 0, 0, + cairo_rectangle(context, 0, 0, cairo_image_surface_get_width(m_dragImage.get()), cairo_image_surface_get_height(m_dragImage.get())); - cairo_set_operator(context.get(), CAIRO_OPERATOR_SOURCE); - cairo_set_source_surface(context.get(), m_dragImage.get(), 0, 0); - cairo_fill(context.get()); + cairo_set_operator(context, CAIRO_OPERATOR_SOURCE); + cairo_set_source_surface(context, m_dragImage.get(), 0, 0); + cairo_fill(context); } DragImageRef DragClient::createDragImageForLink(KURL&, const String&, Frame*) diff --git a/WebKit/gtk/WebCoreSupport/DragClientGtk.h b/WebKit/gtk/WebCoreSupport/DragClientGtk.h index 2ab7e2d..0d07c88 100644 --- a/WebKit/gtk/WebCoreSupport/DragClientGtk.h +++ b/WebKit/gtk/WebCoreSupport/DragClientGtk.h @@ -54,7 +54,7 @@ namespace WebKit { virtual void dragControllerDestroyed(); - void dragIconWindowExposeEvent(GtkWidget*, GdkEventExpose*); + void drawDragIconWindow(GtkWidget*, cairo_t*); private: WebKitWebView* m_webView; diff --git a/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp index d4e70b6..749efe9 100644 --- a/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp +++ b/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp @@ -557,7 +557,11 @@ void EditorClient::generateEditorCommands(const KeyboardEvent* event) m_pendingEditorCommands.clear(); // First try to interpret the command as a native GTK+ key binding. +#ifdef GTK_API_VERSION_2 gtk_bindings_activate_event(GTK_OBJECT(m_nativeWidget.get()), event->keyEvent()->gdkEventKey()); +#else + gtk_bindings_activate_event(G_OBJECT(m_nativeWidget.get()), event->keyEvent()->gdkEventKey()); +#endif if (m_pendingEditorCommands.size() > 0) return; diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp index 13401f5..fa17632 100644 --- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp +++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp @@ -50,7 +50,6 @@ #include "MouseEvent.h" #include "NotImplemented.h" #include "Page.h" -#include "PlatformString.h" #include "PluginDatabase.h" #include "RenderPart.h" #include "ResourceHandle.h" @@ -67,6 +66,7 @@ #include "webkitwebpolicydecision.h" #include "webkitwebview.h" #include <wtf/text/CString.h> +#include <wtf/text/StringConcatenate.h> #include <JavaScriptCore/APICast.h> #include <gio/gio.h> @@ -116,6 +116,7 @@ static void initializeDomainsList(HashSet<String>& googleDomains) googleDomains.add("cl"); googleDomains.add("com.br"); googleDomains.add("co.uk"); + googleDomains.add("co.kr"); googleDomains.add("co.jp"); googleDomains.add("de"); googleDomains.add("dj"); @@ -1119,13 +1120,13 @@ void FrameLoaderClient::dispatchDidFailLoad(const ResourceError& error) g_free(errorURI); if (!errorFile) - content = String::format("<html><body>%s</body></html>", webError->message); + content = makeString("<html><body>", webError->message, "</body></html>"); else { gboolean loaded = g_file_load_contents(errorFile, 0, &fileContent, 0, 0, 0); if (!loaded) - content = String::format("<html><body>%s</body></html>", webError->message); + content = makeString("<html><body>", webError->message, "</body></html>"); else - content = String::format(fileContent, error.failingURL().utf8().data(), webError->message); + content = makeString(fileContent, error.failingURL(), webError->message); } webkit_web_frame_load_alternate_string(m_frame, content.utf8().data(), 0, error.failingURL().utf8().data()); diff --git a/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp b/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp index 01bc03a..158a3b8 100644 --- a/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp +++ b/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp @@ -213,7 +213,7 @@ void FullscreenVideoController::hideHud() GdkCursor* cursor = blankCursor(); gdk_window_set_cursor(window, cursor); - gtk_widget_hide_all(m_hudWindow); + gtk_widget_hide(m_hudWindow); if (m_progressBarUpdateId) { g_source_remove(m_progressBarUpdateId); @@ -350,7 +350,7 @@ void FullscreenVideoController::exitFullscreen() if (m_mediaElement->platformMedia().type == WebCore::PlatformMedia::GStreamerGWorldType) m_mediaElement->platformMedia().media.gstreamerGWorld->exitFullscreen(); - gtk_widget_hide_all(m_window); + gtk_widget_hide(m_window); gtk_widget_destroy(m_hudWindow); m_hudWindow = 0; @@ -541,8 +541,8 @@ void FullscreenVideoController::createHud() GtkWidget* label = gtk_label_new(_("Time:")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, TRUE, 0); - GtkObject* adjustment = gtk_adjustment_new(0.0, 0.0, 100.0, 0.1, 1.0, 1.0); - m_timeHScale = gtk_hscale_new(GTK_ADJUSTMENT(adjustment)); + GtkAdjustment* adjustment = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 100.0, 0.1, 1.0, 1.0)); + m_timeHScale = gtk_hscale_new(adjustment); gtk_scale_set_draw_value(GTK_SCALE(m_timeHScale), FALSE); gtk_range_set_show_fill_level(GTK_RANGE(m_timeHScale), TRUE); gtk_range_set_update_policy(GTK_RANGE(m_timeHScale), GTK_UPDATE_CONTINUOUS); diff --git a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp index c8b42d7..2c1ffab 100644 --- a/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp +++ b/WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp @@ -222,22 +222,7 @@ void InspectorClient::storeSetting(const String&, const String&) bool InspectorClient::sendMessageToFrontend(const String& message) { - if (!m_frontendPage) - return false; - - Frame* frame = m_frontendPage->mainFrame(); - if (!frame) - return false; - - ScriptController* scriptController = frame->script(); - if (!scriptController) - return false; - - String dispatchToFrontend("WebInspector.dispatchMessageFromBackend("); - dispatchToFrontend += message; - dispatchToFrontend += ");"; - scriptController->executeScript(dispatchToFrontend); - return true; + return doDispatchMessageOnFrontendPage(m_frontendPage, message); } const char* InspectorClient::inspectorFilesPath() diff --git a/WebKit/gtk/docs/webkitgtk-sections.txt b/WebKit/gtk/docs/webkitgtk-sections.txt index 35f9b40..0b185a0 100644 --- a/WebKit/gtk/docs/webkitgtk-sections.txt +++ b/WebKit/gtk/docs/webkitgtk-sections.txt @@ -573,6 +573,30 @@ WebKitWebResourceClass </SECTION> <SECTION> +<FILE>soup-cache</FILE> +<TITLE>WebKitSoupCache</TITLE> +webkit_soup_cache_new +webkit_soup_cache_flush +webkit_soup_cache_clear +webkit_soup_cache_dump +webkit_soup_cache_load +webkit_soup_cache_set_max_size +webkit_soup_cache_get_max_size +<SUBSECTION Standard> +WEBKIT_IS_SOUP_CACHE +WEBKIT_IS_SOUP_CACHE_CLASS +WEBKIT_TYPE_SOUP_CACHE +WEBKIT_SOUP_CACHE +WEBKIT_SOUP_CACHE_CLASS +WEBKIT_SOUP_CACHE_GET_CLASS +<SUBSECTION Private> +webkit_soup_cache_get_type +WebKitSoupCachePrivate +WebKitSoupCache +WebKitSoupCacheClass +</SECTION> + +<SECTION> <FILE>webkitprivate</FILE> getViewFromFrame kit diff --git a/WebKit/gtk/po/ChangeLog b/WebKit/gtk/po/ChangeLog index 19e86ae..29bef79 100644 --- a/WebKit/gtk/po/ChangeLog +++ b/WebKit/gtk/po/ChangeLog @@ -1,3 +1,22 @@ +2010-09-29 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk> + + Reviewed by Martin Robinson. + + Avoid touching the po files automatically during the build + process. The maintainers still have the option of forcing an + update with make update-po. + + * GNUmakefile.am: + +2010-09-29 Miloš Popović <gpopac@gmail.com> + + Reviewed by Gustavo Noronha Silva. + + Serbian translations update. + + * sr.po: + * sr@latin.po: + 2010-09-29 Reinout van Schouwen <reinouts@gnome.org> Reviewed by Gustavo Noronha. diff --git a/WebKit/gtk/po/GNUmakefile.am b/WebKit/gtk/po/GNUmakefile.am index 2c5ff94..4314573 100644 --- a/WebKit/gtk/po/GNUmakefile.am +++ b/WebKit/gtk/po/GNUmakefile.am @@ -95,19 +95,22 @@ $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot: # This target rebuilds a PO file if $(DOMAIN).pot has changed. # Note that a PO file is not touched if it doesn't need to be changed. -$(POFILES): $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot - @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ - if test -f "$(srcdir)/WebKit/gtk/po/$${lang}.po"; then \ - test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir)/WebKit/gtk/po && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir)/WebKit/gtk/po && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ - else \ - $(MAKE) $${lang}.po-create; \ - fi +update-po-files: $(srcdir)/WebKit/gtk/po/$(DOMAIN).pot + @for pofile in $(POFILES); do \ + lang=`echo $$pofile | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ + if test -f "$(srcdir)/WebKit/gtk/po/$${lang}.po"; then \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir)/WebKit/gtk/po && "; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ + pushd $(srcdir)/WebKit/gtk/po && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + popd; \ + else \ + $(MAKE) $${lang}.po-create; \ + fi; \ + done update-po: GNUmakefile $(MAKE) $(DOMAIN).pot-update - $(MAKE) $(POFILES) + $(MAKE) update-po-files $(MAKE) $(MOFILES) .nop.po-create: diff --git a/WebKit/gtk/po/sr.po b/WebKit/gtk/po/sr.po index b4d3d55..b132c8d 100644 --- a/WebKit/gtk/po/sr.po +++ b/WebKit/gtk/po/sr.po @@ -3,21 +3,22 @@ #
# This file is distributed under the same license as the webkit package.
#
-# Милош Поповић <gpopac@gmail.com> # Review by Бранко Кокановић <branko.kokanovic@gmail.com> (27.6.2009.) +# Милош Поповић <gpopac@gmail.com>, 2010. +# msgid "" 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-06-19 02:35+100\n" +"PO-Revision-Date: 2010-08-31 04:14+0200\n" "Last-Translator: Милош Поповић <gpopac@gmail.com>\n" "Language-Team: Serbian <gnom@prevod.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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:535 msgid "Upload File" @@ -54,9 +55,8 @@ msgstr "П_репис с десна на лево" # Ух, ух, ух... ~Милош :( #: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:84 -#, fuzzy msgid "PDF _Pop directional formatting" -msgstr "Искачуће _дирекционо форматирање" +msgstr "Искачуће ПДФ _дирекционо форматирање" #: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:85 msgid "ZWS _Zero width space" @@ -84,14 +84,12 @@ msgid "The network request for the URI that should be downloaded" msgstr "Захтевана адресе датотеке коју желите да преузмете" #: WebKit/gtk/webkit/webkitdownload.cpp:281 -#, fuzzy msgid "Network Response" -msgstr "Захтев на мрежи" +msgstr "Мрежни одговор" #: WebKit/gtk/webkit/webkitdownload.cpp:282 -#, fuzzy msgid "The network response for the URI that should be downloaded" -msgstr "Захтевана адресе датотеке коју желите да преузмете" +msgstr "Одговор на захтевану адресу датотеке коју желите да преузмете" #: WebKit/gtk/webkit/webkitdownload.cpp:296 msgid "Destination URI" @@ -152,7 +150,7 @@ msgstr "Страница %s захтева корисничко име и лоз #: WebKit/gtk/webkit/webkitsoupauthdialog.c:278 msgid "Server message:" -msgstr "" +msgstr "Порука са сервера:" #: WebKit/gtk/webkit/webkitsoupauthdialog.c:291 msgid "Username:" @@ -163,9 +161,8 @@ msgid "Password:" msgstr "Лозинка:" #: WebKit/gtk/webkit/webkitsoupauthdialog.c:302 -#, fuzzy msgid "_Remember password" -msgstr "Упамти лозинку" +msgstr "_Упамти лозинку" #: WebKit/gtk/webkit/webkitwebframe.cpp:298 msgid "Name" @@ -197,34 +194,30 @@ msgstr "Адреса садржаја који је приказан унута #: WebKit/gtk/webkit/webkitwebframe.cpp:344 msgid "Horizontal Scrollbar Policy" -msgstr "" +msgstr "Хоризонтални клизач" #: WebKit/gtk/webkit/webkitwebframe.cpp:345 -#, fuzzy msgid "" "Determines the current policy for the horizontal scrollbar of the frame." -msgstr "Показује тренутни напредак преузимања" +msgstr "Одређује смер хоризонталног клизача унутар оквира." #: WebKit/gtk/webkit/webkitwebframe.cpp:362 msgid "Vertical Scrollbar Policy" -msgstr "" +msgstr "Вертикални клизач" #: WebKit/gtk/webkit/webkitwebframe.cpp:363 -#, fuzzy msgid "Determines the current policy for the vertical scrollbar of the frame." -msgstr "Показује тренутни напредак преузимања" +msgstr "Одређује смер вертикалног клизача унутар оквира." #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:147 msgid "The title of the history item" msgstr "Наслов за ставке у историјату" #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:162 -#, fuzzy msgid "Alternate Title" msgstr "Променљив наслов" #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:163 -#, fuzzy msgid "The alternate title of the history item" msgstr "Променљив наслов ставке у историјату" @@ -258,12 +251,10 @@ msgid "The Web View that renders the Web Inspector itself" msgstr "Веб приказ кога исцртава „Веб инспектор“" #: WebKit/gtk/webkit/webkitwebinspector.cpp:282 -#, fuzzy msgid "Inspected URI" msgstr "Инспекција адресе" #: WebKit/gtk/webkit/webkitwebinspector.cpp:283 -#, fuzzy msgid "The URI that is currently being inspected" msgstr "Адреса коју тренутно обрађује инспектор" @@ -276,13 +267,12 @@ msgid "Profile the executed JavaScript." msgstr "Прави профил покренуте Јава скрипте." #: WebKit/gtk/webkit/webkitwebinspector.cpp:315 -#, fuzzy msgid "Enable Timeline profiling" -msgstr "Омогући учење Јава скрипте" +msgstr "Омогући временски профил" #: WebKit/gtk/webkit/webkitwebinspector.cpp:316 msgid "Profile the WebCore instrumentation." -msgstr "" +msgstr "Прави профил WebCore алаки." #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:158 msgid "Reason" @@ -313,14 +303,12 @@ msgid "A bitmask representing the state of the modifier keys" msgstr "Ознака која одређује да ли је укључен тастер за измену функције" #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:220 -#, fuzzy msgid "Target frame" -msgstr "Име оквира" +msgstr "Циљни оквир" #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:221 -#, fuzzy msgid "The target frame for the navigation" -msgstr "Циљна адреса коју захтева навигација" +msgstr "Циљни оквир за навигацију" #: WebKit/gtk/webkit/webkitwebsettings.cpp:237 msgid "Default Encoding" @@ -501,155 +489,149 @@ msgstr "Укључује режим разгледања уз чување ва #: WebKit/gtk/webkit/webkitwebsettings.cpp:481 msgid "Enable Spell Checking" -msgstr "" +msgstr "Омогући проверу писања" #: WebKit/gtk/webkit/webkitwebsettings.cpp:482 -#, fuzzy msgid "Enables spell checking while typing" -msgstr "Провери писање _док куцам" +msgstr "Укључује проверу писања док куцате" #: WebKit/gtk/webkit/webkitwebsettings.cpp:505 msgid "Languages to use for spell checking" -msgstr "" +msgstr "Језик за проверу писања" #: WebKit/gtk/webkit/webkitwebsettings.cpp:506 msgid "Comma separated list of languages to use for spell checking" -msgstr "" +msgstr "Списак језика раздвојених тачком који се користе за проверу писања" #: WebKit/gtk/webkit/webkitwebsettings.cpp:520 -#, fuzzy msgid "Enable Caret Browsing" -msgstr "Приватни режим" +msgstr "Преглед са показивачем" #: WebKit/gtk/webkit/webkitwebsettings.cpp:521 msgid "Whether to enable accesibility enhanced keyboard navigation" -msgstr "" +msgstr "Одређује да ли да се користи приступачнија тастатура за навигацију" #: WebKit/gtk/webkit/webkitwebsettings.cpp:536 msgid "Enable HTML5 Database" -msgstr "" +msgstr "Укључи ХТМЛ5 базу података" #: WebKit/gtk/webkit/webkitwebsettings.cpp:537 msgid "Whether to enable HTML5 database support" -msgstr "" +msgstr "Одређује да ли је подржана ХТМЛ5 база података" #: WebKit/gtk/webkit/webkitwebsettings.cpp:552 msgid "Enable HTML5 Local Storage" -msgstr "" +msgstr "Укључи ХТМЛ5 складиште" #: WebKit/gtk/webkit/webkitwebsettings.cpp:553 msgid "Whether to enable HTML5 Local Storage support" -msgstr "" +msgstr "Одређује да ли је подржано локално ХТМЛ5 складиште" #: WebKit/gtk/webkit/webkitwebsettings.cpp:567 -#, fuzzy msgid "Enable XSS Auditor" -msgstr "Омогући скрипте" +msgstr "Омогући ИксСС ревизију" #: WebKit/gtk/webkit/webkitwebsettings.cpp:568 msgid "Whether to enable teh XSS auditor" -msgstr "" +msgstr "Одређује да ли је укључена ИксСС ревизија" #: WebKit/gtk/webkit/webkitwebsettings.cpp:586 msgid "User Agent" -msgstr "" +msgstr "Представљање прегледника" #: WebKit/gtk/webkit/webkitwebsettings.cpp:587 msgid "The User-Agent string used by WebKitGtk" -msgstr "" +msgstr "Ниска за представљање WebKitGtk прегледника (кориснички агент)" #: WebKit/gtk/webkit/webkitwebsettings.cpp:602 msgid "JavaScript can open windows automatically" -msgstr "" +msgstr "Дозволи Јава скриптама да отворе прозор" #: WebKit/gtk/webkit/webkitwebsettings.cpp:603 msgid "Whether JavaScript can open windows automatically" -msgstr "" +msgstr "Одређује да ли Јава скрипте могу да отворе нове прозоре" #: WebKit/gtk/webkit/webkitwebsettings.cpp:618 msgid "Enable offline web application cache" -msgstr "" +msgstr "Омогући оставу за рад ван мређе" #: WebKit/gtk/webkit/webkitwebsettings.cpp:619 msgid "Whether to enable offline web application cache" -msgstr "" +msgstr "Одређује да ли се користи остава за рад програма ван мреже" #: WebKit/gtk/webkit/webkitwebsettings.cpp:646 msgid "Editing behavior" -msgstr "" +msgstr "Понашање уређивача" #: WebKit/gtk/webkit/webkitwebsettings.cpp:647 msgid "The behavior mode to use in editing mode" -msgstr "" +msgstr "Понашање када се користи режим за уређивање" #: WebKit/gtk/webkit/webkitwebsettings.cpp:663 msgid "Enable universal access from file URIs" -msgstr "" +msgstr "Универзални приступ из адреса датотеке" #: WebKit/gtk/webkit/webkitwebsettings.cpp:664 msgid "Whether to allow universal access from file URIs" -msgstr "" +msgstr "Одређује да ли је укључен универзални приступ из адреса датотеке" #: WebKit/gtk/webkit/webkitwebsettings.cpp:679 -#, fuzzy msgid "Enable DOM paste" -msgstr "Омогући скрипте" +msgstr "Укључи ДОМ убацивање" #: WebKit/gtk/webkit/webkitwebsettings.cpp:680 msgid "Whether to enable DOM paste" -msgstr "" +msgstr "Одређује да ли је омогућено ДОМ убацивање" #: WebKit/gtk/webkit/webkitwebsettings.cpp:698 msgid "Tab key cycles through elements" -msgstr "" +msgstr "Tab тастер листа делове странице" #: WebKit/gtk/webkit/webkitwebsettings.cpp:699 msgid "Whether the tab key cycles through elements on the page." -msgstr "" +msgstr "Одређује да ли да Tab тастер листа елементе странице." #: WebKit/gtk/webkit/webkitwebsettings.cpp:719 msgid "Enable Default Context Menu" -msgstr "" +msgstr "Подразумевани приручни мени" #: WebKit/gtk/webkit/webkitwebsettings.cpp:720 msgid "" "Enables the handling of right-clicks for the creation of the default context " "menu" -msgstr "" +msgstr "Приказује подразумевани приручни мени при клику десног тастера миша" #: WebKit/gtk/webkit/webkitwebsettings.cpp:740 msgid "Enable Site Specific Quirks" -msgstr "" +msgstr "Прихвати распоред са странице" #: WebKit/gtk/webkit/webkitwebsettings.cpp:741 msgid "Enables the site-specific compatibility workarounds" -msgstr "" +msgstr "Омогућава разне досетке сајтова за приказ странице" #: WebKit/gtk/webkit/webkitwebsettings.cpp:763 msgid "Enable page cache" -msgstr "" +msgstr "Укључи оставу за странице" #: WebKit/gtk/webkit/webkitwebsettings.cpp:764 -#, fuzzy msgid "Whether the page cache should be used" -msgstr "Одређује да ли да се приказују позадинске слике." +msgstr "Одређује да ли да се чувају странице у оставу" #: WebKit/gtk/webkit/webkitwebsettings.cpp:784 msgid "Auto Resize Window" -msgstr "" +msgstr "Сам промени величину прозора" #: WebKit/gtk/webkit/webkitwebsettings.cpp:785 msgid "Automatically resize the toplevel window when a page requests it" -msgstr "" +msgstr "Сам повећава величину основног прозора када странице то захтевају" #: WebKit/gtk/webkit/webkitwebsettings.cpp:817 -#, fuzzy msgid "Enable Java Applet" -msgstr "Омогући учење Јава скрипте" +msgstr "Омогући Јава програмчиће" #: WebKit/gtk/webkit/webkitwebsettings.cpp:818 msgid "Whether Java Applet support through <applet> should be enabled" -msgstr "" +msgstr "Да ли да укључим подршку за Јава програмчиће кроз <applet>" #: WebKit/gtk/webkit/webkitwebview.cpp:2319 msgid "Returns the @web_view's document title" @@ -741,11 +723,11 @@ msgstr "Произвољно кодирање веб странице" #: WebKit/gtk/webkit/webkitwebview.cpp:2520 msgid "Icon URI" -msgstr "" +msgstr "Адреса иконице" #: WebKit/gtk/webkit/webkitwebview.cpp:2521 msgid "The URI for the favicon for the #WebKitWebView." -msgstr "" +msgstr "Адреса иконице за #WebKitWebView." #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:55 #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:60 @@ -758,7 +740,7 @@ msgstr "Поништи" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:70 msgid "This is a searchable index. Enter search keywords: " -msgstr "" +msgstr "Можете претражити индекс. Унесите речи за претрагу:" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:75 msgid "Choose File" @@ -861,7 +843,6 @@ msgid "_Outline" msgstr "_Оквир" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:271 -#, fuzzy msgid "Inspect _Element" msgstr "Инспекција _елемента" @@ -919,189 +900,187 @@ msgstr "Непознато" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:364 msgid "Loading..." -msgstr "" +msgstr "Учитавам..." #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:369 msgid "Live Broadcast" -msgstr "" +msgstr "Пренос уживо" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:375 msgid "audio element controller" -msgstr "" +msgstr "контрола звучног елемента" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:377 msgid "video element controller" -msgstr "" +msgstr "контрола видео елемента" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:379 msgid "mute" -msgstr "" +msgstr "утишај" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:381 msgid "unmute" -msgstr "" +msgstr "појачај" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:383 msgid "play" -msgstr "" +msgstr "пусти" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:385 msgid "pause" -msgstr "" +msgstr "паузирај" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:387 msgid "movie time" -msgstr "" +msgstr "трајање филма" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:389 msgid "timeline slider thumb" -msgstr "" +msgstr "линија са временом" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:391 msgid "back 30 seconds" -msgstr "" +msgstr "назад за 30 s" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:393 msgid "return to realtime" -msgstr "" +msgstr "врати у реално време" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:395 msgid "elapsed time" -msgstr "" +msgstr "прегледано" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:397 msgid "remaining time" -msgstr "" +msgstr "преостало" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:399 -#, fuzzy msgid "status" -msgstr "Стање" +msgstr "стање" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:401 msgid "fullscreen" -msgstr "" +msgstr "цео екран" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:403 msgid "fast forward" -msgstr "" +msgstr "премотај унапред" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:405 msgid "fast reverse" -msgstr "" +msgstr "премотај уназад" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:407 msgid "show closed captions" -msgstr "" +msgstr "прикажи затворене наslove" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:409 msgid "hide closed captions" -msgstr "" +msgstr "сакриј затворене наslove" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:418 msgid "audio element playback controls and status display" -msgstr "" +msgstr "стање и контрола пуштања звучних елемената" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:420 msgid "video element playback controls and status display" -msgstr "" +msgstr "стање и контрола пуштања видео елемената" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:422 msgid "mute audio tracks" -msgstr "" +msgstr "утишај звук" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:424 msgid "unmute audio tracks" -msgstr "" +msgstr "појачај звук" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:426 msgid "begin playback" -msgstr "" +msgstr "пусти" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:428 msgid "pause playback" -msgstr "" +msgstr "паузирај" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:430 msgid "movie time scrubber" -msgstr "" +msgstr "исписано време филма" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:432 msgid "movie time scrubber thumb" -msgstr "" +msgstr "клик за исписано време филма" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:434 msgid "seek movie back 30 seconds" -msgstr "" +msgstr "премотај филм уназад за 30 s" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:436 msgid "return streaming movie to real time" -msgstr "" +msgstr "настави приказ филма у реалном времену" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:438 msgid "current movie time in seconds" -msgstr "" +msgstr "протекло трајање филма у секундама" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:440 msgid "number of seconds of movie remaining" -msgstr "" +msgstr "преостало трајање филма у секундама" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:442 msgid "current movie status" -msgstr "" +msgstr "стање филма" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:444 msgid "seek quickly back" -msgstr "" +msgstr "брзо премотај уназад" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:446 msgid "seek quickly forward" -msgstr "" +msgstr "брзо премотај унапред" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:448 msgid "Play movie in fullscreen mode" -msgstr "" +msgstr "Пушта филм преко целог екрана" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:450 msgid "start displaying closed captions" -msgstr "" +msgstr "приказуј затворене опције" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:452 msgid "stop displaying closed captions" -msgstr "" +msgstr "не приказуј затворене опције" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:461 -#, fuzzy msgid "indefinite time" -msgstr "дефиниција" +msgstr "бесконачно трајање" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:491 msgid "value missing" -msgstr "" +msgstr "недостаје вредност" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:497 msgid "type mismatch" -msgstr "" +msgstr "не поклапа се врста" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:502 msgid "pattern mismatch" -msgstr "" +msgstr "не поклапа се шаблон" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:507 msgid "too long" -msgstr "" +msgstr "предугачко" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:512 msgid "range underflow" -msgstr "" +msgstr "опсег подкорачен" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:517 msgid "range overflow" -msgstr "" +msgstr "опсег прекорачен" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:522 msgid "step mismatch" -msgstr "" +msgstr "не поклапа се корак" #~ msgid "_Searchable Index" #~ msgstr "_Претражив индекс" diff --git a/WebKit/gtk/po/sr@latin.po b/WebKit/gtk/po/sr@latin.po index d6a795a..7fb251d 100644 --- a/WebKit/gtk/po/sr@latin.po +++ b/WebKit/gtk/po/sr@latin.po @@ -3,21 +3,22 @@ #
# This file is distributed under the same license as the webkit package.
#
-# Miloš Popović <gpopac@gmail.com> # Review by Branko Kokanović <branko.kokanovic@gmail.com> (27.6.2009.) +# Miloš Popović <gpopac@gmail.com>, 2010. +# msgid "" 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-06-19 02:35+100\n" +"PO-Revision-Date: 2010-08-31 04:14+0200\n" "Last-Translator: Miloš Popović <gpopac@gmail.com>\n" "Language-Team: Serbian <gnom@prevod.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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp:535 msgid "Upload File" @@ -54,9 +55,8 @@ msgstr "P_repis s desna na levo" # Uh, uh, uh... ~Miloš :( #: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:84 -#, fuzzy msgid "PDF _Pop directional formatting" -msgstr "Iskačuće _direkciono formatiranje" +msgstr "Iskačuće PDF _direkciono formatiranje" #: WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp:85 msgid "ZWS _Zero width space" @@ -84,14 +84,12 @@ msgid "The network request for the URI that should be downloaded" msgstr "Zahtevana adrese datoteke koju želite da preuzmete" #: WebKit/gtk/webkit/webkitdownload.cpp:281 -#, fuzzy msgid "Network Response" -msgstr "Zahtev na mreži" +msgstr "Mrežni odgovor" #: WebKit/gtk/webkit/webkitdownload.cpp:282 -#, fuzzy msgid "The network response for the URI that should be downloaded" -msgstr "Zahtevana adrese datoteke koju želite da preuzmete" +msgstr "Odgovor na zahtevanu adresu datoteke koju želite da preuzmete" #: WebKit/gtk/webkit/webkitdownload.cpp:296 msgid "Destination URI" @@ -152,7 +150,7 @@ msgstr "Stranica %s zahteva korisničko ime i lozinku" #: WebKit/gtk/webkit/webkitsoupauthdialog.c:278 msgid "Server message:" -msgstr "" +msgstr "Poruka sa servera:" #: WebKit/gtk/webkit/webkitsoupauthdialog.c:291 msgid "Username:" @@ -163,9 +161,8 @@ msgid "Password:" msgstr "Lozinka:" #: WebKit/gtk/webkit/webkitsoupauthdialog.c:302 -#, fuzzy msgid "_Remember password" -msgstr "Upamti lozinku" +msgstr "_Upamti lozinku" #: WebKit/gtk/webkit/webkitwebframe.cpp:298 msgid "Name" @@ -197,34 +194,30 @@ msgstr "Adresa sadržaja koji je prikazan unutar okvira" #: WebKit/gtk/webkit/webkitwebframe.cpp:344 msgid "Horizontal Scrollbar Policy" -msgstr "" +msgstr "Horizontalni klizač" #: WebKit/gtk/webkit/webkitwebframe.cpp:345 -#, fuzzy msgid "" "Determines the current policy for the horizontal scrollbar of the frame." -msgstr "Pokazuje trenutni napredak preuzimanja" +msgstr "Određuje smer horizontalnog klizača unutar okvira." #: WebKit/gtk/webkit/webkitwebframe.cpp:362 msgid "Vertical Scrollbar Policy" -msgstr "" +msgstr "Vertikalni klizač" #: WebKit/gtk/webkit/webkitwebframe.cpp:363 -#, fuzzy msgid "Determines the current policy for the vertical scrollbar of the frame." -msgstr "Pokazuje trenutni napredak preuzimanja" +msgstr "Određuje smer vertikalnog klizača unutar okvira." #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:147 msgid "The title of the history item" msgstr "Naslov za stavke u istorijatu" #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:162 -#, fuzzy msgid "Alternate Title" msgstr "Promenljiv naslov" #: WebKit/gtk/webkit/webkitwebhistoryitem.cpp:163 -#, fuzzy msgid "The alternate title of the history item" msgstr "Promenljiv naslov stavke u istorijatu" @@ -258,12 +251,10 @@ msgid "The Web View that renders the Web Inspector itself" msgstr "Veb prikaz koga iscrtava „Veb inspektor“" #: WebKit/gtk/webkit/webkitwebinspector.cpp:282 -#, fuzzy msgid "Inspected URI" msgstr "Inspekcija adrese" #: WebKit/gtk/webkit/webkitwebinspector.cpp:283 -#, fuzzy msgid "The URI that is currently being inspected" msgstr "Adresa koju trenutno obrađuje inspektor" @@ -276,13 +267,12 @@ msgid "Profile the executed JavaScript." msgstr "Pravi profil pokrenute Java skripte." #: WebKit/gtk/webkit/webkitwebinspector.cpp:315 -#, fuzzy msgid "Enable Timeline profiling" -msgstr "Omogući učenje Java skripte" +msgstr "Omogući vremenski profil" #: WebKit/gtk/webkit/webkitwebinspector.cpp:316 msgid "Profile the WebCore instrumentation." -msgstr "" +msgstr "Pravi profil WebCore alaki." #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:158 msgid "Reason" @@ -313,14 +303,12 @@ msgid "A bitmask representing the state of the modifier keys" msgstr "Oznaka koja određuje da li je uključen taster za izmenu funkcije" #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:220 -#, fuzzy msgid "Target frame" -msgstr "Ime okvira" +msgstr "Ciljni okvir" #: WebKit/gtk/webkit/webkitwebnavigationaction.cpp:221 -#, fuzzy msgid "The target frame for the navigation" -msgstr "Ciljna adresa koju zahteva navigacija" +msgstr "Ciljni okvir za navigaciju" #: WebKit/gtk/webkit/webkitwebsettings.cpp:237 msgid "Default Encoding" @@ -473,8 +461,7 @@ msgstr "Adresa datoteke sa stilom" #: WebKit/gtk/webkit/webkitwebsettings.cpp:410 msgid "The URI of a stylesheet that is applied to every page." msgstr "" -"Putanja do datoteke sa sopstvenim stilom koji se primenjuje na svaku " -"stranicu." +"Putanja do datoteke sa sopstvenim stilom koji se primenjuje na svaku stranicu." #: WebKit/gtk/webkit/webkitwebsettings.cpp:425 msgid "Zoom Stepping Value" @@ -502,155 +489,149 @@ msgstr "Uključuje režim razgledanja uz čuvanje vaše privatnosti" #: WebKit/gtk/webkit/webkitwebsettings.cpp:481 msgid "Enable Spell Checking" -msgstr "" +msgstr "Omogući proveru pisanja" #: WebKit/gtk/webkit/webkitwebsettings.cpp:482 -#, fuzzy msgid "Enables spell checking while typing" -msgstr "Proveri pisanje _dok kucam" +msgstr "Uključuje proveru pisanja dok kucate" #: WebKit/gtk/webkit/webkitwebsettings.cpp:505 msgid "Languages to use for spell checking" -msgstr "" +msgstr "Jezik za proveru pisanja" #: WebKit/gtk/webkit/webkitwebsettings.cpp:506 msgid "Comma separated list of languages to use for spell checking" -msgstr "" +msgstr "Spisak jezika razdvojenih tačkom koji se koriste za proveru pisanja" #: WebKit/gtk/webkit/webkitwebsettings.cpp:520 -#, fuzzy msgid "Enable Caret Browsing" -msgstr "Privatni režim" +msgstr "Pregled sa pokazivačem" #: WebKit/gtk/webkit/webkitwebsettings.cpp:521 msgid "Whether to enable accesibility enhanced keyboard navigation" -msgstr "" +msgstr "Određuje da li da se koristi pristupačnija tastatura za navigaciju" #: WebKit/gtk/webkit/webkitwebsettings.cpp:536 msgid "Enable HTML5 Database" -msgstr "" +msgstr "Uključi HTML5 bazu podataka" #: WebKit/gtk/webkit/webkitwebsettings.cpp:537 msgid "Whether to enable HTML5 database support" -msgstr "" +msgstr "Određuje da li je podržana HTML5 baza podataka" #: WebKit/gtk/webkit/webkitwebsettings.cpp:552 msgid "Enable HTML5 Local Storage" -msgstr "" +msgstr "Uključi HTML5 skladište" #: WebKit/gtk/webkit/webkitwebsettings.cpp:553 msgid "Whether to enable HTML5 Local Storage support" -msgstr "" +msgstr "Određuje da li je podržano lokalno HTML5 skladište" #: WebKit/gtk/webkit/webkitwebsettings.cpp:567 -#, fuzzy msgid "Enable XSS Auditor" -msgstr "Omogući skripte" +msgstr "Omogući IksSS reviziju" #: WebKit/gtk/webkit/webkitwebsettings.cpp:568 msgid "Whether to enable teh XSS auditor" -msgstr "" +msgstr "Određuje da li je uključena IksSS revizija" #: WebKit/gtk/webkit/webkitwebsettings.cpp:586 msgid "User Agent" -msgstr "" +msgstr "Predstavljanje preglednika" #: WebKit/gtk/webkit/webkitwebsettings.cpp:587 msgid "The User-Agent string used by WebKitGtk" -msgstr "" +msgstr "Niska za predstavljanje WebKitGtk preglednika (korisnički agent)" #: WebKit/gtk/webkit/webkitwebsettings.cpp:602 msgid "JavaScript can open windows automatically" -msgstr "" +msgstr "Dozvoli Java skriptama da otvore prozor" #: WebKit/gtk/webkit/webkitwebsettings.cpp:603 msgid "Whether JavaScript can open windows automatically" -msgstr "" +msgstr "Određuje da li Java skripte mogu da otvore nove prozore" #: WebKit/gtk/webkit/webkitwebsettings.cpp:618 msgid "Enable offline web application cache" -msgstr "" +msgstr "Omogući ostavu za rad van mređe" #: WebKit/gtk/webkit/webkitwebsettings.cpp:619 msgid "Whether to enable offline web application cache" -msgstr "" +msgstr "Određuje da li se koristi ostava za rad programa van mreže" #: WebKit/gtk/webkit/webkitwebsettings.cpp:646 msgid "Editing behavior" -msgstr "" +msgstr "Ponašanje uređivača" #: WebKit/gtk/webkit/webkitwebsettings.cpp:647 msgid "The behavior mode to use in editing mode" -msgstr "" +msgstr "Ponašanje kada se koristi režim za uređivanje" #: WebKit/gtk/webkit/webkitwebsettings.cpp:663 msgid "Enable universal access from file URIs" -msgstr "" +msgstr "Univerzalni pristup iz adresa datoteke" #: WebKit/gtk/webkit/webkitwebsettings.cpp:664 msgid "Whether to allow universal access from file URIs" -msgstr "" +msgstr "Određuje da li je uključen univerzalni pristup iz adresa datoteke" #: WebKit/gtk/webkit/webkitwebsettings.cpp:679 -#, fuzzy msgid "Enable DOM paste" -msgstr "Omogući skripte" +msgstr "Uključi DOM ubacivanje" #: WebKit/gtk/webkit/webkitwebsettings.cpp:680 msgid "Whether to enable DOM paste" -msgstr "" +msgstr "Određuje da li je omogućeno DOM ubacivanje" #: WebKit/gtk/webkit/webkitwebsettings.cpp:698 msgid "Tab key cycles through elements" -msgstr "" +msgstr "Tab taster lista delove stranice" #: WebKit/gtk/webkit/webkitwebsettings.cpp:699 msgid "Whether the tab key cycles through elements on the page." -msgstr "" +msgstr "Određuje da li da Tab taster lista elemente stranice." #: WebKit/gtk/webkit/webkitwebsettings.cpp:719 msgid "Enable Default Context Menu" -msgstr "" +msgstr "Podrazumevani priručni meni" #: WebKit/gtk/webkit/webkitwebsettings.cpp:720 msgid "" "Enables the handling of right-clicks for the creation of the default context " "menu" -msgstr "" +msgstr "Prikazuje podrazumevani priručni meni pri kliku desnog tastera miša" #: WebKit/gtk/webkit/webkitwebsettings.cpp:740 msgid "Enable Site Specific Quirks" -msgstr "" +msgstr "Prihvati raspored sa stranice" #: WebKit/gtk/webkit/webkitwebsettings.cpp:741 msgid "Enables the site-specific compatibility workarounds" -msgstr "" +msgstr "Omogućava razne dosetke sajtova za prikaz stranice" #: WebKit/gtk/webkit/webkitwebsettings.cpp:763 msgid "Enable page cache" -msgstr "" +msgstr "Uključi ostavu za stranice" #: WebKit/gtk/webkit/webkitwebsettings.cpp:764 -#, fuzzy msgid "Whether the page cache should be used" -msgstr "Određuje da li da se prikazuju pozadinske slike." +msgstr "Određuje da li da se čuvaju stranice u ostavu" #: WebKit/gtk/webkit/webkitwebsettings.cpp:784 msgid "Auto Resize Window" -msgstr "" +msgstr "Sam promeni veličinu prozora" #: WebKit/gtk/webkit/webkitwebsettings.cpp:785 msgid "Automatically resize the toplevel window when a page requests it" -msgstr "" +msgstr "Sam povećava veličinu osnovnog prozora kada stranice to zahtevaju" #: WebKit/gtk/webkit/webkitwebsettings.cpp:817 -#, fuzzy msgid "Enable Java Applet" -msgstr "Omogući učenje Java skripte" +msgstr "Omogući Java programčiće" #: WebKit/gtk/webkit/webkitwebsettings.cpp:818 msgid "Whether Java Applet support through <applet> should be enabled" -msgstr "" +msgstr "Da li da uključim podršku za Java programčiće kroz <applet>" #: WebKit/gtk/webkit/webkitwebview.cpp:2319 msgid "Returns the @web_view's document title" @@ -742,11 +723,11 @@ msgstr "Proizvoljno kodiranje veb stranice" #: WebKit/gtk/webkit/webkitwebview.cpp:2520 msgid "Icon URI" -msgstr "" +msgstr "Adresa ikonice" #: WebKit/gtk/webkit/webkitwebview.cpp:2521 msgid "The URI for the favicon for the #WebKitWebView." -msgstr "" +msgstr "Adresa ikonice za #WebKitWebView." #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:55 #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:60 @@ -759,7 +740,7 @@ msgstr "Poništi" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:70 msgid "This is a searchable index. Enter search keywords: " -msgstr "" +msgstr "Možete pretražiti indeks. Unesite reči za pretragu:" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:75 msgid "Choose File" @@ -862,7 +843,6 @@ msgid "_Outline" msgstr "_Okvir" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:271 -#, fuzzy msgid "Inspect _Element" msgstr "Inspekcija _elementa" @@ -920,189 +900,187 @@ msgstr "Nepoznato" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:364 msgid "Loading..." -msgstr "" +msgstr "Učitavam..." #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:369 msgid "Live Broadcast" -msgstr "" +msgstr "Prenos uživo" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:375 msgid "audio element controller" -msgstr "" +msgstr "kontrola zvučnog elementa" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:377 msgid "video element controller" -msgstr "" +msgstr "kontrola video elementa" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:379 msgid "mute" -msgstr "" +msgstr "utišaj" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:381 msgid "unmute" -msgstr "" +msgstr "pojačaj" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:383 msgid "play" -msgstr "" +msgstr "pusti" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:385 msgid "pause" -msgstr "" +msgstr "pauziraj" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:387 msgid "movie time" -msgstr "" +msgstr "trajanje filma" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:389 msgid "timeline slider thumb" -msgstr "" +msgstr "linija sa vremenom" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:391 msgid "back 30 seconds" -msgstr "" +msgstr "nazad za 30 s" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:393 msgid "return to realtime" -msgstr "" +msgstr "vrati u realno vreme" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:395 msgid "elapsed time" -msgstr "" +msgstr "pregledano" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:397 msgid "remaining time" -msgstr "" +msgstr "preostalo" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:399 -#, fuzzy msgid "status" -msgstr "Stanje" +msgstr "stanje" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:401 msgid "fullscreen" -msgstr "" +msgstr "ceo ekran" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:403 msgid "fast forward" -msgstr "" +msgstr "premotaj unapred" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:405 msgid "fast reverse" -msgstr "" +msgstr "premotaj unazad" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:407 msgid "show closed captions" -msgstr "" +msgstr "prikaži zatvorene naslove" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:409 msgid "hide closed captions" -msgstr "" +msgstr "sakrij zatvorene naslove" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:418 msgid "audio element playback controls and status display" -msgstr "" +msgstr "stanje i kontrola puštanja zvučnih elemenata" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:420 msgid "video element playback controls and status display" -msgstr "" +msgstr "stanje i kontrola puštanja video elemenata" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:422 msgid "mute audio tracks" -msgstr "" +msgstr "utišaj zvuk" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:424 msgid "unmute audio tracks" -msgstr "" +msgstr "pojačaj zvuk" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:426 msgid "begin playback" -msgstr "" +msgstr "pusti" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:428 msgid "pause playback" -msgstr "" +msgstr "pauziraj" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:430 msgid "movie time scrubber" -msgstr "" +msgstr "ispisano vreme filma" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:432 msgid "movie time scrubber thumb" -msgstr "" +msgstr "klik za ispisano vreme filma" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:434 msgid "seek movie back 30 seconds" -msgstr "" +msgstr "premotaj film unazad za 30 s" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:436 msgid "return streaming movie to real time" -msgstr "" +msgstr "nastavi prikaz filma u realnom vremenu" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:438 msgid "current movie time in seconds" -msgstr "" +msgstr "proteklo trajanje filma u sekundama" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:440 msgid "number of seconds of movie remaining" -msgstr "" +msgstr "preostalo trajanje filma u sekundama" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:442 msgid "current movie status" -msgstr "" +msgstr "stanje filma" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:444 msgid "seek quickly back" -msgstr "" +msgstr "brzo premotaj unazad" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:446 msgid "seek quickly forward" -msgstr "" +msgstr "brzo premotaj unapred" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:448 msgid "Play movie in fullscreen mode" -msgstr "" +msgstr "Pušta film preko celog ekrana" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:450 msgid "start displaying closed captions" -msgstr "" +msgstr "prikazuj zatvorene opcije" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:452 msgid "stop displaying closed captions" -msgstr "" +msgstr "ne prikazuj zatvorene opcije" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:461 -#, fuzzy msgid "indefinite time" -msgstr "definicija" +msgstr "beskonačno trajanje" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:491 msgid "value missing" -msgstr "" +msgstr "nedostaje vrednost" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:497 msgid "type mismatch" -msgstr "" +msgstr "ne poklapa se vrsta" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:502 msgid "pattern mismatch" -msgstr "" +msgstr "ne poklapa se šablon" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:507 msgid "too long" -msgstr "" +msgstr "predugačko" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:512 msgid "range underflow" -msgstr "" +msgstr "opseg podkoračen" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:517 msgid "range overflow" -msgstr "" +msgstr "opseg prekoračen" #: WebCore/platform/gtk/LocalizedStringsGtk.cpp:522 msgid "step mismatch" -msgstr "" +msgstr "ne poklapa se korak" #~ msgid "_Searchable Index" #~ msgstr "_Pretraživ indeks" diff --git a/WebKit/gtk/tests/testcopyandpaste.c b/WebKit/gtk/tests/testcopyandpaste.c index 5e3f5e7..f7889bd 100644 --- a/WebKit/gtk/tests/testcopyandpaste.c +++ b/WebKit/gtk/tests/testcopyandpaste.c @@ -133,7 +133,7 @@ static JSValueRef runPasteTestCallback(JSContextRef context, JSObjectRef functio event->key.window = gtk_widget_get_window(GTK_WIDGET(currentFixture->webView)); g_object_ref(event->key.window); #ifndef GTK_API_VERSION_2 - GdkDeviceManager* manager = gdk_display_get_device_manager(gdk_drawable_get_display(event->key.window)); + GdkDeviceManager* manager = gdk_display_get_device_manager(gdk_window_get_display(event->key.window)); gdk_event_set_device(event, gdk_device_manager_get_client_pointer(manager)); #endif diff --git a/WebKit/gtk/webkit/webkitdownload.cpp b/WebKit/gtk/webkit/webkitdownload.cpp index 1472cb5..18b64ab 100644 --- a/WebKit/gtk/webkit/webkitdownload.cpp +++ b/WebKit/gtk/webkit/webkitdownload.cpp @@ -419,8 +419,8 @@ WebKitDownload* webkit_download_new_with_handle(WebKitNetworkRequest* request, W g_return_val_if_fail(request, NULL); ResourceHandleInternal* d = handle->getInternal(); - if (d->m_msg) - soup_session_pause_message(webkit_get_default_session(), d->m_msg); + if (d->m_soupMessage) + soup_session_pause_message(webkit_get_default_session(), d->m_soupMessage.get()); WebKitDownload* download = WEBKIT_DOWNLOAD(g_object_new(WEBKIT_TYPE_DOWNLOAD, "network-request", request, NULL)); WebKitDownloadPrivate* priv = download->priv; @@ -492,8 +492,8 @@ void webkit_download_start(WebKitDownload* download) priv->resourceHandle->setClient(priv->downloadClient); ResourceHandleInternal* d = priv->resourceHandle->getInternal(); - if (d->m_msg) - soup_session_unpause_message(webkit_get_default_session(), d->m_msg); + if (d->m_soupMessage) + soup_session_unpause_message(webkit_get_default_session(), d->m_soupMessage.get()); } priv->timer = g_timer_new(); diff --git a/WebKit/gtk/webkit/webkitsecurityorigin.cpp b/WebKit/gtk/webkit/webkitsecurityorigin.cpp index 67ad0cf..92d19e7 100644 --- a/WebKit/gtk/webkit/webkitsecurityorigin.cpp +++ b/WebKit/gtk/webkit/webkitsecurityorigin.cpp @@ -220,7 +220,7 @@ static void webkit_security_origin_init(WebKitSecurityOrigin* securityOrigin) /** * webkit_security_origin_get_protocol: - * @security_origin: a #WebKitSecurityOrigin + * @securityOrigin: a #WebKitSecurityOrigin * * Returns the protocol for the security origin. * @@ -243,7 +243,7 @@ G_CONST_RETURN gchar* webkit_security_origin_get_protocol(WebKitSecurityOrigin* /** * webkit_security_origin_get_host: - * @security_origin: a #WebKitSecurityOrigin + * @securityOrigin: a #WebKitSecurityOrigin * * Returns the hostname for the security origin. * @@ -266,7 +266,7 @@ G_CONST_RETURN gchar* webkit_security_origin_get_host(WebKitSecurityOrigin* secu /** * webkit_security_origin_get_port: - * @security_origin: a #WebKitSecurityOrigin + * @securityOrigin: a #WebKitSecurityOrigin * * Returns the port for the security origin. * @@ -284,7 +284,7 @@ guint webkit_security_origin_get_port(WebKitSecurityOrigin* securityOrigin) /** * webkit_security_origin_get_web_database_usage: - * @security_origin: a #WebKitSecurityOrigin + * @securityOrigin: a #WebKitSecurityOrigin * * Returns the cumulative size of all Web Database database's in the origin * in bytes. @@ -307,7 +307,7 @@ guint64 webkit_security_origin_get_web_database_usage(WebKitSecurityOrigin* secu /** * webkit_security_origin_get_web_database_quota: - * @security_origin: a #WebKitSecurityOrigin + * @securityOrigin: a #WebKitSecurityOrigin * * Returns the quota for Web Database storage of the security origin * in bytes. @@ -330,7 +330,7 @@ guint64 webkit_security_origin_get_web_database_quota(WebKitSecurityOrigin* secu /** * webkit_security_origin_set_web_database_quota: - * @security_origin: a #WebKitSecurityOrigin + * @securityOrigin: a #WebKitSecurityOrigin * @quota: a new Web Database quota in bytes * * Adjust the quota for Web Database storage of the security origin @@ -349,7 +349,7 @@ void webkit_security_origin_set_web_database_quota(WebKitSecurityOrigin* securit /** * webkit_security_origin_get_all_web_databases: - * @security_origin: a #WebKitSecurityOrigin + * @securityOrigin: a #WebKitSecurityOrigin * * Returns a list of all Web Databases in the security origin. * diff --git a/WebKit/gtk/webkit/webkitsoupauthdialog.c b/WebKit/gtk/webkit/webkitsoupauthdialog.c index 0cf1c23..2eefcc5 100644 --- a/WebKit/gtk/webkit/webkitsoupauthdialog.c +++ b/WebKit/gtk/webkit/webkitsoupauthdialog.c @@ -59,6 +59,19 @@ static void webkit_soup_auth_dialog_class_init(WebKitSoupAuthDialogClass* klass) { GObjectClass* object_class = G_OBJECT_CLASS(klass); + /** + * WebKitSoupAuthDialog::current-toplevel: + * @authDialog: the object on which the signal is emitted + * @message: the #SoupMessage being used in the authentication process + * + * This signal is emitted by the @authDialog when it needs to know + * the current toplevel widget in order to correctly set the + * transiency for the authentication dialog. + * + * Return value: (transfer none): the current toplevel #GtkWidget or %NULL if there's none + * + * Since: 1.1.1 + */ signals[CURRENT_TOPLEVEL] = g_signal_new("current-toplevel", G_OBJECT_CLASS_TYPE(object_class), diff --git a/WebKit/gtk/webkit/webkitsoupauthdialog.h b/WebKit/gtk/webkit/webkitsoupauthdialog.h index 01ccfc8..db0ccb8 100644 --- a/WebKit/gtk/webkit/webkitsoupauthdialog.h +++ b/WebKit/gtk/webkit/webkitsoupauthdialog.h @@ -41,7 +41,7 @@ typedef struct { typedef struct { GObjectClass parent_class; - GtkWidget* (*current_toplevel) (WebKitSoupAuthDialog* feature, SoupMessage* message); + GtkWidget* (*current_toplevel) (WebKitSoupAuthDialog* authDialog, SoupMessage* message); } WebKitSoupAuthDialogClass; WEBKIT_API GType diff --git a/WebKit/gtk/webkit/webkitwebdatabase.cpp b/WebKit/gtk/webkit/webkitwebdatabase.cpp index cd85e73..680d9c9 100644 --- a/WebKit/gtk/webkit/webkitwebdatabase.cpp +++ b/WebKit/gtk/webkit/webkitwebdatabase.cpp @@ -280,7 +280,7 @@ static void webkit_web_database_set_name(WebKitWebDatabase* webDatabase, const g /** * webkit_web_database_get_security_origin: - * @web_database: a #WebKitWebDatabase + * @webDatabase: a #WebKitWebDatabase * * Returns the security origin of the #WebKitWebDatabase. * @@ -298,7 +298,7 @@ WebKitSecurityOrigin* webkit_web_database_get_security_origin(WebKitWebDatabase* /** * webkit_web_database_get_name: - * @web_database: a #WebKitWebDatabase + * @webDatabase: a #WebKitWebDatabase * * Returns the canonical name of the #WebKitWebDatabase. * @@ -316,7 +316,7 @@ G_CONST_RETURN gchar* webkit_web_database_get_name(WebKitWebDatabase* webDatabas /** * webkit_web_database_get_display_name: - * @web_database: a #WebKitWebDatabase + * @webDatabase: a #WebKitWebDatabase * * Returns the name of the #WebKitWebDatabase as seen by the user. * @@ -346,7 +346,7 @@ G_CONST_RETURN gchar* webkit_web_database_get_display_name(WebKitWebDatabase* we /** * webkit_web_database_get_expected_size: - * @web_database: a #WebKitWebDatabase + * @webDatabase: a #WebKitWebDatabase * * Returns the expected size of the #WebKitWebDatabase in bytes as defined by the * web author. The Web Database standard allows web authors to specify an expected @@ -371,7 +371,7 @@ guint64 webkit_web_database_get_expected_size(WebKitWebDatabase* webDatabase) /** * webkit_web_database_get_size: - * @web_database: a #WebKitWebDatabase + * @webDatabase: a #WebKitWebDatabase * * Returns the actual size of the #WebKitWebDatabase space on disk in bytes. * @@ -394,7 +394,7 @@ guint64 webkit_web_database_get_size(WebKitWebDatabase* webDatabase) /** * webkit_web_database_get_filename: - * @web_database: a #WebKitWebDatabase + * @webDatabase: a #WebKitWebDatabase * * Returns the absolute filename to the #WebKitWebDatabase file on disk. * @@ -425,7 +425,7 @@ G_CONST_RETURN gchar* webkit_web_database_get_filename(WebKitWebDatabase* webDat /** * webkit_web_database_remove: - * @web_database: a #WebKitWebDatabase + * @webDatabase: a #WebKitWebDatabase * * Removes the #WebKitWebDatabase from its security origin and destroys all data * stored in the database. @@ -520,7 +520,7 @@ guint64 webkit_get_default_web_database_quota() /** * webkit_set_default_web_database_quota: - * @default_quota: the new default database quota + * @defaultQuota: the new default database quota * * Sets the current path to the directory WebKit will write Web * Database databases. diff --git a/WebKit/gtk/webkit/webkitwebinspector.cpp b/WebKit/gtk/webkit/webkitwebinspector.cpp index ee3c8cd..f207906 100644 --- a/WebKit/gtk/webkit/webkitwebinspector.cpp +++ b/WebKit/gtk/webkit/webkitwebinspector.cpp @@ -127,7 +127,6 @@ static void webkit_web_inspector_class_init(WebKitWebInspectorClass* klass) * WebKitWebInspector::inspect-web-view: * @web_inspector: the object on which the signal is emitted * @web_view: the #WebKitWebView which will be inspected - * @return: a newly allocated #WebKitWebView or %NULL * * Emitted when the user activates the 'inspect' context menu item * to inspect a web view. The application which is interested in @@ -138,6 +137,8 @@ static void webkit_web_inspector_class_init(WebKitWebInspectorClass* klass) * #WebKitWebView instance you create; the widget to which you add * it will do that. * + * Return value: (transfer none): a newly allocated #WebKitWebView or %NULL + * * Since: 1.0.3 */ webkit_web_inspector_signals[INSPECT_WEB_VIEW] = g_signal_new("inspect-web-view", @@ -476,7 +477,7 @@ webkit_web_inspector_set_inspector_client(WebKitWebInspector* web_inspector, Web /** * webkit_web_inspector_show: - * @web_inspector: the #WebKitWebInspector that will be shown + * @webInspector: the #WebKitWebInspector that will be shown * * Causes the Web Inspector to be shown. * @@ -537,7 +538,7 @@ void webkit_web_inspector_inspect_coordinates(WebKitWebInspector* webInspector, /** * webkit_web_inspector_close: - * @web_inspector: the #WebKitWebInspector that will be closed + * @webInspector: the #WebKitWebInspector that will be closed * * Causes the Web Inspector to be closed. * diff --git a/WebKit/gtk/webkit/webkitwebnavigationaction.cpp b/WebKit/gtk/webkit/webkitwebnavigationaction.cpp index f421f40..ce5dd92 100644 --- a/WebKit/gtk/webkit/webkitwebnavigationaction.cpp +++ b/WebKit/gtk/webkit/webkitwebnavigationaction.cpp @@ -177,8 +177,8 @@ static void webkit_web_navigation_action_class_init(WebKitWebNavigationActionCla /** * WebKitWebNavigationAction:button: * - * The DOM identifier for the mouse button used to click. DOM button values - * are 0, 1 and 2 for left, middle and right buttons. If the action was not + * The GTK+ identifier for the mouse button used to click. Notice that GTK+ button values + * are 1, 2 and 3 for left, middle and right buttons, so they are DOM button values +1. If the action was not * initiated by a mouse click the value will be -1. * * Since: 1.0.3 @@ -310,9 +310,9 @@ void webkit_web_navigation_action_set_original_uri(WebKitWebNavigationAction* na * webkit_web_navigation_action_get_button: * @navigationAction: a #WebKitWebNavigationAction * - * Returns the DOM identifier for the mouse button used to click. - * DOM button values are 0, 1 and 2 for left, middle and right buttons. - * If the action was not initiated by a mouse click, returns -1. + * The GTK+ identifier for the mouse button used to click. Notice that GTK+ button values + * are 1, 2 and 3 for left, middle and right buttons, so they are DOM button values +1. If the action was not + * initiated by a mouse click the value will be -1. * * Return value: the mouse button used to click * diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp index 8a207d9..cd59bdb 100644 --- a/WebKit/gtk/webkit/webkitwebsettings.cpp +++ b/WebKit/gtk/webkit/webkitwebsettings.cpp @@ -33,8 +33,8 @@ #include "FileSystem.h" #include "PluginDatabase.h" #include "Language.h" -#include "PlatformString.h" #include <wtf/text/CString.h> +#include <wtf/text/StringConcatenate.h> #include <glib/gi18n-lib.h> #if OS(UNIX) @@ -45,9 +45,9 @@ * SECTION:webkitwebsettings * @short_description: Control the behaviour of a #WebKitWebView * - * #WebKitWebSettings can be applied to a #WebKitWebView to control - * the to be used text encoding, color, font sizes, printing mode, - * script support, loading of images and various other things. + * #WebKitWebSettings can be applied to a #WebKitWebView to control text encoding, + * color, font sizes, printing mode, script support, loading of images and various other things. + * After creation, a #WebKitWebSettings object contains default settings. * * <informalexample><programlisting> * /<!-- -->* Create a new websettings and disable java script *<!-- -->/ @@ -94,6 +94,7 @@ struct _WebKitWebSettingsPrivate { gboolean enable_html5_local_storage; gboolean enable_xss_auditor; gboolean enable_spatial_navigation; + gboolean enable_frame_flattening; gchar* user_agent; gboolean javascript_can_open_windows_automatically; gboolean javascript_can_access_clipboard; @@ -145,6 +146,7 @@ enum { PROP_ENABLE_HTML5_LOCAL_STORAGE, PROP_ENABLE_XSS_AUDITOR, PROP_ENABLE_SPATIAL_NAVIGATION, + PROP_ENABLE_FRAME_FLATTENING, PROP_USER_AGENT, PROP_JAVASCRIPT_CAN_OPEN_WINDOWS_AUTOMATICALLY, PROP_JAVASCRIPT_CAN_ACCESS_CLIPBOARD, @@ -201,7 +203,7 @@ static String webkitOSVersion() struct utsname name; if (uname(&name) != -1) - uaOSVersion = String::format("%s %s", name.sysname, name.machine); + uaOSVersion = makeString(name.sysname, ' ', name.machine); else uaOSVersion = String("Unknown"); #elif OS(WINDOWS) @@ -218,9 +220,9 @@ String webkitUserAgent() // We mention Safari since many broken sites check for it (OmniWeb does this too) // We re-use the WebKit version, though it doesn't seem to matter much in practice - DEFINE_STATIC_LOCAL(const String, uaVersion, (String::format("%d.%d+", WEBKIT_USER_AGENT_MAJOR_VERSION, WEBKIT_USER_AGENT_MINOR_VERSION))); - DEFINE_STATIC_LOCAL(const String, staticUA, (String::format("Mozilla/5.0 (%s; U; %s; %s) AppleWebKit/%s (KHTML, like Gecko) Version/5.0 Safari/%s", - webkitPlatform().utf8().data(), webkitOSVersion().utf8().data(), defaultLanguage().utf8().data(), uaVersion.utf8().data(), uaVersion.utf8().data()))); + DEFINE_STATIC_LOCAL(const String, uaVersion, (makeString(String::number(WEBKIT_USER_AGENT_MAJOR_VERSION), '.', String::number(WEBKIT_USER_AGENT_MINOR_VERSION), '+'))); + DEFINE_STATIC_LOCAL(const String, staticUA, (makeString("Mozilla/5.0 (", webkitPlatform(), "; U; ", webkitOSVersion(), "; ", defaultLanguage(), ") AppleWebKit/", uaVersion) + + makeString(" (KHTML, like Gecko) Version/5.0 Safari/", uaVersion))); return staticUA; } @@ -600,6 +602,25 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass) FALSE, flags)); /** + * WebKitWebSettings:enable-frame-flattening + * + * Whether to enable the Frame Flattening. With this setting each subframe is expanded + * to its contents, which will flatten all the frames to become one scrollable page. + * On touch devices, it is desired to not have any scrollable sub parts of the page as + * it results in a confusing user experience, with scrolling sometimes scrolling sub parts + * and at other times scrolling the page itself. For this reason iframes and framesets are + * barely usable on touch devices. + * + * Since: 1.3.5 + */ + g_object_class_install_property(gobject_class, + PROP_ENABLE_FRAME_FLATTENING, + g_param_spec_boolean("enable-frame-flattening", + _("Enable Frame Flattening"), + _("Whether to enable Frame Flattening"), + FALSE, + flags)); + /** * WebKitWebSettings:user-agent: * * The User-Agent string used by WebKitGtk. @@ -1054,6 +1075,9 @@ static void webkit_web_settings_set_property(GObject* object, guint prop_id, con case PROP_ENABLE_SPATIAL_NAVIGATION: priv->enable_spatial_navigation = g_value_get_boolean(value); break; + case PROP_ENABLE_FRAME_FLATTENING: + priv->enable_frame_flattening = g_value_get_boolean(value); + break; case PROP_USER_AGENT: g_free(priv->user_agent); if (!g_value_get_string(value) || !strlen(g_value_get_string(value))) @@ -1202,6 +1226,9 @@ static void webkit_web_settings_get_property(GObject* object, guint prop_id, GVa case PROP_ENABLE_SPATIAL_NAVIGATION: g_value_set_boolean(value, priv->enable_spatial_navigation); break; + case PROP_ENABLE_FRAME_FLATTENING: + g_value_set_boolean(value, priv->enable_frame_flattening); + break; case PROP_USER_AGENT: g_value_set_string(value, priv->user_agent); break; @@ -1306,6 +1333,7 @@ WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* web_settings) "enable-html5-local-storage", priv->enable_html5_local_storage, "enable-xss-auditor", priv->enable_xss_auditor, "enable-spatial-navigation", priv->enable_spatial_navigation, + "enable-frame-flattening", priv->enable_frame_flattening, "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, diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp index 762888a..f5d0ef6 100644 --- a/WebKit/gtk/webkit/webkitwebview.cpp +++ b/WebKit/gtk/webkit/webkitwebview.cpp @@ -208,11 +208,6 @@ static void webkit_web_view_set_window_features(WebKitWebView* webView, WebKitWe static GtkIMContext* webkit_web_view_get_im_context(WebKitWebView*); -static void destroy_menu_cb(GtkObject* object, gpointer data) -{ - WEBKIT_WEB_VIEW(data)->priv->currentMenu = 0; -} - static void PopupMenuPositionFunc(GtkMenu* menu, gint *x, gint *y, gboolean *pushIn, gpointer userData) { WebKitWebView* view = WEBKIT_WEB_VIEW(userData); @@ -223,7 +218,7 @@ static void PopupMenuPositionFunc(GtkMenu* menu, gint *x, gint *y, gboolean *pus #ifdef GTK_API_VERSION_2 gtk_widget_size_request(GTK_WIDGET(menu), &menuSize); #else - gtk_size_request_get_size(GTK_SIZE_REQUEST(menu), &menuSize, NULL); + gtk_widget_get_preferred_size(GTK_WIDGET(menu), &menuSize, NULL); #endif *x = priv->lastPopupXPosition; @@ -308,10 +303,6 @@ static gboolean webkit_web_view_forward_context_menu_event(WebKitWebView* webVie priv->lastPopupXPosition = event.globalX(); priv->lastPopupYPosition = event.globalY(); - g_signal_connect(menu, "destroy", - G_CALLBACK(destroy_menu_cb), - NULL); - gtk_menu_popup(menu, NULL, NULL, &PopupMenuPositionFunc, webView, event.button() + 1, gtk_get_current_event_time()); @@ -492,26 +483,56 @@ static void webkit_web_view_set_property(GObject* object, guint prop_id, const G } } -static bool shouldCoalesce(GdkRectangle rect, GdkRectangle* rects, int count) +static bool shouldCoalesce(const IntRect& rect, const Vector<IntRect>& rects) { - const int cRectThreshold = 10; + const unsigned int cRectThreshold = 10; const float cWastedSpaceThreshold = 0.75f; - bool useUnionedRect = (count <= 1) || (count > cRectThreshold); - if (!useUnionedRect) { - // Attempt to guess whether or not we should use the unioned rect or the individual rects. - // We do this by computing the percentage of "wasted space" in the union. If that wasted space - // is too large, then we will do individual rect painting instead. - float unionPixels = (rect.width * rect.height); - float singlePixels = 0; - for (int i = 0; i < count; ++i) - singlePixels += rects[i].width * rects[i].height; - float wastedSpace = 1 - (singlePixels / unionPixels); - if (wastedSpace <= cWastedSpaceThreshold) - useUnionedRect = true; - } + bool useUnionedRect = (rects.size() <= 1) || (rects.size() > cRectThreshold); + if (useUnionedRect) + return true; + // Attempt to guess whether or not we should use the unioned rect or the individual rects. + // We do this by computing the percentage of "wasted space" in the union. If that wasted space + // is too large, then we will do individual rect painting instead. + float unionPixels = (rect.width() * rect.height()); + float singlePixels = 0; + for (size_t i = 0; i < rects.size(); ++i) + singlePixels += rects[i].width() * rects[i].height(); + float wastedSpace = 1 - (singlePixels / unionPixels); + if (wastedSpace <= cWastedSpaceThreshold) + useUnionedRect = true; return useUnionedRect; } +static void paintWebView(Frame* frame, gboolean transparent, GraphicsContext& context, const IntRect& clipRect, const Vector<IntRect>& rects) +{ + bool coalesce = true; + + if (rects.size() > 0) + coalesce = shouldCoalesce(clipRect, rects); + + if (coalesce) { + context.clip(clipRect); + if (transparent) + context.clearRect(clipRect); + frame->view()->paint(&context, clipRect); + } else { + for (size_t i = 0; i < rects.size(); i++) { + IntRect rect = rects[i]; + context.save(); + context.clip(rect); + if (transparent) + context.clearRect(rect); + frame->view()->paint(&context, rect); + context.restore(); + } + } + + context.save(); + context.clip(clipRect); + frame->page()->inspectorController()->drawNodeHighlight(context); + context.restore(); +} +#ifdef GTK_API_VERSION_2 static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose* event) { WebKitWebView* webView = WEBKIT_WEB_VIEW(widget); @@ -527,44 +548,48 @@ static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose* ctx.setGdkExposeEvent(event); int rectCount; -#ifdef GTK_API_VERSION_2 GOwnPtr<GdkRectangle> rects; gdk_region_get_rectangles(event->region, &rects.outPtr(), &rectCount); -#else - rectCount = cairo_region_num_rectangles(event->region); - GOwnPtr<GdkRectangle> rects(g_new(GdkRectangle, rectCount)); + Vector<IntRect> paintRects; for (int i = 0; i < rectCount; i++) - cairo_region_get_rectangle(event->region, i, rects.get()+i); -#endif - // Avoid recursing into the render tree excessively - bool coalesce = shouldCoalesce(event->area, rects.get(), rectCount); - - if (coalesce) { - IntRect rect = event->area; - ctx.clip(rect); - if (priv->transparent) - ctx.clearRect(rect); - frame->view()->paint(&ctx, rect); - } else { - for (int i = 0; i < rectCount; i++) { - IntRect rect = rects.get()[i]; - ctx.save(); - ctx.clip(rect); - if (priv->transparent) - ctx.clearRect(rect); - frame->view()->paint(&ctx, rect); - ctx.restore(); - } + paintRects.append(IntRect(rects.get()[i])); + + paintWebView(frame, priv->transparent, ctx, static_cast<IntRect>(event->area), paintRects); + } + + return FALSE; +} +#else +static gboolean webkit_web_view_draw(GtkWidget* widget, cairo_t* cr) +{ + WebKitWebView* webView = WEBKIT_WEB_VIEW(widget); + WebKitWebViewPrivate* priv = webView->priv; + GdkRectangle clipRect; + + if (!gdk_cairo_get_clip_rectangle(cr, &clipRect)) + return FALSE; + + Frame* frame = core(webView)->mainFrame(); + if (frame->contentRenderer() && frame->view()) { + GraphicsContext ctx(cr); + IntRect rect = clipRect; + cairo_rectangle_list_t* rectList = cairo_copy_clip_rectangle_list(cr); + + frame->view()->updateLayoutAndStyleIfNeededRecursive(); + + Vector<IntRect> rects; + if (!rectList->status && rectList->num_rectangles > 0) { + for (int i = 0; i < rectList->num_rectangles; i++) + rects.append(enclosingIntRect(FloatRect(rectList->rectangles[i]))); } + paintWebView(frame, priv->transparent, ctx, rect, rects); - ctx.save(); - ctx.clip(static_cast<IntRect>(event->area)); - frame->page()->inspectorController()->drawNodeHighlight(ctx); - ctx.restore(); + cairo_rectangle_list_destroy(rectList); } return FALSE; } +#endif // GTK_API_VERSION_2 static gboolean webkit_web_view_key_press_event(GtkWidget* widget, GdkEventKey* event) { @@ -641,7 +666,7 @@ static gboolean webkit_web_view_button_press_event(GtkWidget* widget, GdkEventBu gint doubleClickDistance = 250; gint doubleClickTime = 5; - GtkSettings* settings = gtk_settings_get_for_screen(gdk_drawable_get_screen(gtk_widget_get_window(widget))); + GtkSettings* settings = gtk_settings_get_for_screen(gtk_widget_get_screen(widget)); g_object_get(settings, "gtk-double-click-distance", &doubleClickDistance, "gtk-double-click-time", &doubleClickTime, NULL); @@ -848,7 +873,9 @@ static void webkit_web_view_realize(GtkWidget* widget) attributes.height = allocation.height; attributes.wclass = GDK_INPUT_OUTPUT; attributes.visual = gtk_widget_get_visual(widget); +#ifdef GTK_API_VERSION_2 attributes.colormap = gtk_widget_get_colormap(widget); +#endif attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK @@ -861,7 +888,10 @@ static void webkit_web_view_realize(GtkWidget* widget) | GDK_BUTTON2_MOTION_MASK | GDK_BUTTON3_MOTION_MASK; - gint attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP; + gint attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; +#ifdef GTK_API_VERSION_2 + attributes_mask |= GDK_WA_COLORMAP; +#endif GdkWindow* window = gdk_window_new(gtk_widget_get_parent_window(widget), &attributes, attributes_mask); gtk_widget_set_window(widget, window); gdk_window_set_user_data(window, widget); @@ -1489,7 +1519,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::create-web-view: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the #WebKitWebFrame * * Emitted when the creation of a new window is requested. @@ -1519,7 +1549,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::web-view-ready: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * * Emitted after #WebKitWebView::create-web-view when the new #WebKitWebView * should be displayed to the user. When this signal is emitted @@ -1548,7 +1578,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::close-web-view: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * * Emitted when closing a #WebKitWebView is requested. This occurs when a * call is made from JavaScript's window.close function. The default @@ -1571,7 +1601,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::navigation-requested: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the #WebKitWebFrame that required the navigation * @request: a #WebKitNetworkRequest * @@ -1595,7 +1625,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::new-window-policy-decision-requested: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the #WebKitWebFrame that required the navigation * @request: a #WebKitNetworkRequest * @navigation_action: a #WebKitWebNavigationAction @@ -1642,7 +1672,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::navigation-policy-decision-requested: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the #WebKitWebFrame that required the navigation * @request: a #WebKitNetworkRequest * @navigation_action: a #WebKitWebNavigationAction @@ -1679,7 +1709,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::mime-type-policy-decision-requested: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the #WebKitWebFrame that required the policy decision * @request: a WebKitNetworkRequest * @mimetype: the MIME type attempted to load @@ -1721,7 +1751,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::window-object-cleared: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the #WebKitWebFrame to which @window_object belongs * @context: the #JSGlobalContextRef holding the global object and other * execution state; equivalent to the return value of @@ -1747,7 +1777,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::download-requested: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @download: a #WebKitDownload object that lets you control the * download process * @@ -1789,7 +1819,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::load-started: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the frame going to do the load * * When a #WebKitWebFrame begins to load this signal is emitted. @@ -1808,7 +1838,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::load-committed: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the main frame that received the first data * * When a #WebKitWebFrame loaded the first data this signal is emitted. @@ -1828,7 +1858,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::load-progress-changed: - * @web_view: the #WebKitWebView + * @webView: the #WebKitWebView * @progress: the global progress * * Deprecated: Use the "progress" property instead. @@ -1845,7 +1875,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::load-error - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @web_frame: the #WebKitWebFrame * @uri: the URI that triggered the error * @web_error: the #GError that was triggered @@ -1873,7 +1903,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::load-finished: - * @web_view: the #WebKitWebView + * @webView: the #WebKitWebView * @frame: the #WebKitWebFrame * * Deprecated: Use the "load-status" property instead. @@ -1890,7 +1920,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::onload-event: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the frame * * When a #WebKitWebFrame receives an onload event this signal is emitted. @@ -1907,7 +1937,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::title-changed: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the main frame * @title: the new title * @@ -1928,7 +1958,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::hovering-over-link: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @title: the link's title * @uri: the URI the link points to * @@ -1947,7 +1977,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::populate-popup: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @menu: the context menu * * When a context menu is about to be displayed this signal is emitted. @@ -1966,7 +1996,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::print-requested - * @web_view: the object in which the signal is emitted + * @webView: the object in which the signal is emitted * @web_frame: the frame that is requesting to be printed * * Emitted when printing is requested by the frame, usually @@ -2006,7 +2036,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::icon-loaded: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @icon_uri: the URI for the icon * * This signal is emitted when the main frame has got a favicon. @@ -2034,7 +2064,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::console-message: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @message: the message text * @line: the line where the error occured * @source_id: the source id @@ -2056,7 +2086,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::script-alert: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the relevant frame * @message: the message text * @@ -2077,7 +2107,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::script-confirm: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the relevant frame * @message: the message text * @confirmed: whether the dialog has been confirmed @@ -2099,7 +2129,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::script-prompt: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the relevant frame * @message: the message text * @default: the default value @@ -2122,7 +2152,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::select-all: - * @web_view: the object which received the signal + * @webView: the object which received the signal * * The #WebKitWebView::select-all signal is a keybinding signal which gets emitted to * select the complete contents of the text view. @@ -2139,7 +2169,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::cut-clipboard: - * @web_view: the object which received the signal + * @webView: the object which received the signal * * The #WebKitWebView::cut-clipboard signal is a keybinding signal which gets emitted to * cut the selection to the clipboard. @@ -2156,7 +2186,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::copy-clipboard: - * @web_view: the object which received the signal + * @webView: the object which received the signal * * The #WebKitWebView::copy-clipboard signal is a keybinding signal which gets emitted to * copy the selection to the clipboard. @@ -2173,7 +2203,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::paste-clipboard: - * @web_view: the object which received the signal + * @webView: the object which received the signal * * The #WebKitWebView::paste-clipboard signal is a keybinding signal which gets emitted to * paste the contents of the clipboard into the Web view. @@ -2190,7 +2220,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::undo - * @web_view: the object which received the signal + * @webView: the object which received the signal * * The #WebKitWebView::undo signal is a keybinding signal which gets emitted to * undo the last editing command. @@ -2209,7 +2239,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::redo - * @web_view: the object which received the signal + * @webView: the object which received the signal * * The #WebKitWebView::redo signal is a keybinding signal which gets emitted to * redo the last editing command. @@ -2228,7 +2258,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::move-cursor: - * @web_view: the object which received the signal + * @webView: the object which received the signal * @step: the type of movement, one of #GtkMovementStep * @count: an integer indicating the subtype of movement. Currently * the permitted values are '1' = forward, '-1' = backwards. @@ -2252,7 +2282,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::create-plugin-widget: - * @web_view: the object which received the signal + * @webView: the object which received the signal * @mime_type: the mimetype of the requested object * @uri: the URI to load * @param: a #GHashTable with additional attributes (strings) @@ -2280,7 +2310,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::database-quota-exceeded - * @web_view: the object which received the signal + * @webView: the object which received the signal * @frame: the relevant frame * @database: the #WebKitWebDatabase which exceeded the quota of its #WebKitSecurityOrigin * @@ -2302,7 +2332,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::resource-request-starting: - * @web_view: the object which received the signal + * @webView: the object which received the signal * @web_frame: the #WebKitWebFrame whose load dispatched this request * @web_resource: an empty #WebKitWebResource object * @request: the #WebKitNetworkRequest that will be dispatched @@ -2343,7 +2373,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::geolocation-policy-decision-requested: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the frame that requests permission * @policy_decision: a WebKitGeolocationPolicyDecision * @@ -2368,7 +2398,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /** * WebKitWebView::geolocation-policy-decision-cancelled: - * @web_view: the object on which the signal is emitted + * @webView: the object on which the signal is emitted * @frame: the frame that cancels geolocation request. * * When a @frame wants to cancel geolocation permission it had requested @@ -2393,7 +2423,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /* * WebKitWebView::document-load-finished - * @web_view: the object which received the signal + * @webView: the object which received the signal * @web_frame: the #WebKitWebFrame whose load dispatched this request * * Emitted when the DOM document object load is finished for the @@ -2410,7 +2440,7 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) /* * WebKitWebView::frame-created - * @web_view: the object which received the signal + * @webView: the object which received the signal * @web_frame: the #WebKitWebFrame which was just created. * * Emitted when a WebKitWebView has created a new frame. This signal will @@ -2458,7 +2488,11 @@ static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass) GtkWidgetClass* widgetClass = GTK_WIDGET_CLASS(webViewClass); widgetClass->realize = webkit_web_view_realize; +#ifdef GTK_API_VERSION_2 widgetClass->expose_event = webkit_web_view_expose_event; +#else + widgetClass->draw = webkit_web_view_draw; +#endif widgetClass->key_press_event = webkit_web_view_key_press_event; widgetClass->key_release_event = webkit_web_view_key_release_event; widgetClass->button_press_event = webkit_web_view_button_press_event; @@ -2849,7 +2883,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView) gboolean autoLoadImages, autoShrinkImages, printBackgrounds, enableScripts, enablePlugins, enableDeveloperExtras, resizableTextAreas, enablePrivateBrowsing, enableCaretBrowsing, enableHTML5Database, enableHTML5LocalStorage, - enableXSSAuditor, enableSpatialNavigation, javascriptCanOpenWindows, + enableXSSAuditor, enableSpatialNavigation, enableFrameFlattening, javascriptCanOpenWindows, javaScriptCanAccessClipboard, enableOfflineWebAppCache, enableUniversalAccessFromFileURI, enableFileAccessFromFileURI, enableDOMPaste, tabKeyCyclesThroughElements, @@ -2879,6 +2913,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView) "enable-html5-local-storage", &enableHTML5LocalStorage, "enable-xss-auditor", &enableXSSAuditor, "enable-spatial-navigation", &enableSpatialNavigation, + "enable-frame-flattening", &enableFrameFlattening, "javascript-can-open-windows-automatically", &javascriptCanOpenWindows, "javascript-can-access-clipboard", &javaScriptCanAccessClipboard, "enable-offline-web-application-cache", &enableOfflineWebAppCache, @@ -2916,6 +2951,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView) settings->setLocalStorageEnabled(enableHTML5LocalStorage); settings->setXSSAuditorEnabled(enableXSSAuditor); settings->setSpatialNavigationEnabled(enableSpatialNavigation); + settings->setFrameFlatteningEnabled(enableFrameFlattening); settings->setJavaScriptCanOpenWindowsAutomatically(javascriptCanOpenWindows); settings->setJavaScriptCanAccessClipboard(javaScriptCanAccessClipboard); settings->setOfflineWebApplicationCacheEnabled(enableOfflineWebAppCache); @@ -3014,6 +3050,8 @@ static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GPar settings->setXSSAuditorEnabled(g_value_get_boolean(&value)); else if (name == g_intern_string("enable-spatial-navigation")) settings->setSpatialNavigationEnabled(g_value_get_boolean(&value)); + else if (name == g_intern_string("enable-frame-flattening")) + settings->setFrameFlatteningEnabled(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")) @@ -3148,7 +3186,7 @@ bool webkit_web_view_use_primary_for_paste(WebKitWebView* webView) /** * webkit_web_view_set_settings: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @settings: (transfer none): the #WebKitWebSettings to be set * * Replaces the #WebKitWebSettings instance that is currently attached @@ -3173,7 +3211,7 @@ void webkit_web_view_set_settings(WebKitWebView* webView, WebKitWebSettings* web /** * webkit_web_view_get_settings: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Obtains the #WebKitWebSettings associated with the * #WebKitWebView. The #WebKitWebView always has an associated @@ -3192,7 +3230,7 @@ WebKitWebSettings* webkit_web_view_get_settings(WebKitWebView* webView) /** * webkit_web_view_get_inspector: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Obtains the #WebKitWebInspector associated with the * #WebKitWebView. Every #WebKitWebView object has a @@ -3222,7 +3260,7 @@ static void webkit_web_view_set_window_features(WebKitWebView* webView, WebKitWe /** * webkit_web_view_get_window_features: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Returns the instance of #WebKitWebWindowFeatures held by the given * #WebKitWebView. @@ -3239,7 +3277,7 @@ WebKitWebWindowFeatures* webkit_web_view_get_window_features(WebKitWebView* webV /** * webkit_web_view_get_title: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Returns the @web_view's document title * @@ -3257,7 +3295,7 @@ G_CONST_RETURN gchar* webkit_web_view_get_title(WebKitWebView* webView) /** * webkit_web_view_get_uri: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Returns the current URI of the contents displayed by the @web_view * @@ -3275,7 +3313,7 @@ G_CONST_RETURN gchar* webkit_web_view_get_uri(WebKitWebView* webView) /** * webkit_web_view_set_maintains_back_forward_list: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @flag: to tell the view to maintain a back or forward list * * Set the view to maintain a back or forward list of history items. @@ -3289,7 +3327,7 @@ void webkit_web_view_set_maintains_back_forward_list(WebKitWebView* webView, gbo /** * webkit_web_view_get_back_forward_list: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Obtains the #WebKitWebBackForwardList associated with the given #WebKitWebView. The * #WebKitWebBackForwardList is owned by the #WebKitWebView. @@ -3306,7 +3344,7 @@ WebKitWebBackForwardList* webkit_web_view_get_back_forward_list(WebKitWebView* w /** * webkit_web_view_go_to_back_forward_item: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @item: a #WebKitWebHistoryItem* * * Go to the specified #WebKitWebHistoryItem @@ -3328,7 +3366,7 @@ gboolean webkit_web_view_go_to_back_forward_item(WebKitWebView* webView, WebKitW /** * webkit_web_view_go_back: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Loads the previous history item. */ @@ -3341,7 +3379,7 @@ void webkit_web_view_go_back(WebKitWebView* webView) /** * webkit_web_view_go_back_or_forward: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @steps: the number of steps * * Loads the history item that is the number of @steps away from the current @@ -3357,7 +3395,7 @@ void webkit_web_view_go_back_or_forward(WebKitWebView* webView, gint steps) /** * webkit_web_view_go_forward: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Loads the next history item. */ @@ -3370,7 +3408,7 @@ void webkit_web_view_go_forward(WebKitWebView* webView) /** * webkit_web_view_can_go_back: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Determines whether #web_view has a previous history item. * @@ -3388,7 +3426,7 @@ gboolean webkit_web_view_can_go_back(WebKitWebView* webView) /** * webkit_web_view_can_go_back_or_forward: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @steps: the number of steps * * Determines whether #web_view has a history item of @steps. Negative values @@ -3406,7 +3444,7 @@ gboolean webkit_web_view_can_go_back_or_forward(WebKitWebView* webView, gint ste /** * webkit_web_view_can_go_forward: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Determines whether #web_view has a next history item. * @@ -3429,7 +3467,7 @@ gboolean webkit_web_view_can_go_forward(WebKitWebView* webView) /** * webkit_web_view_open: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @uri: an URI * * Requests loading of the specified URI string. @@ -3461,7 +3499,7 @@ void webkit_web_view_reload(WebKitWebView* webView) /** * webkit_web_view_reload_bypass_cache: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Reloads the @web_view without using any cached data. * @@ -3476,7 +3514,7 @@ void webkit_web_view_reload_bypass_cache(WebKitWebView* webView) /** * webkit_web_view_load_uri: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @uri: an URI string * * Requests loading of the specified URI string. @@ -3493,20 +3531,20 @@ void webkit_web_view_load_uri(WebKitWebView* webView, const gchar* uri) } /** -+ * webkit_web_view_load_string: -+ * @web_view: a #WebKitWebView -+ * @content: an URI string -+ * @mime_type: the MIME type, or %NULL -+ * @encoding: the encoding, or %NULL -+ * @base_uri: the base URI for relative locations -+ * -+ * Requests loading of the given @content with the specified @mime_type, -+ * @encoding and @base_uri. -+ * -+ * If @mime_type is %NULL, "text/html" is assumed. -+ * -+ * If @encoding is %NULL, "UTF-8" is assumed. -+ */ + * webkit_web_view_load_string: + * @webView: a #WebKitWebView + * @content: an URI string + * @mime_type: the MIME type, or %NULL + * @encoding: the encoding, or %NULL + * @base_uri: the base URI for relative locations + * + * Requests loading of the given @content with the specified @mime_type, + * @encoding and @base_uri. + * + * If @mime_type is %NULL, "text/html" is assumed. + * + * If @encoding is %NULL, "UTF-8" is assumed. + */ void webkit_web_view_load_string(WebKitWebView* webView, const gchar* content, const gchar* mimeType, const gchar* encoding, const gchar* baseUri) { g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView)); @@ -3517,7 +3555,7 @@ void webkit_web_view_load_string(WebKitWebView* webView, const gchar* content, c } /** * webkit_web_view_load_html_string: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @content: an URI string * @base_uri: the base URI for relative locations * @@ -3535,7 +3573,7 @@ void webkit_web_view_load_html_string(WebKitWebView* webView, const gchar* conte /** * webkit_web_view_load_request: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @request: a #WebKitNetworkRequest * * Requests loading of the specified asynchronous client request. @@ -3573,7 +3611,7 @@ void webkit_web_view_stop_loading(WebKitWebView* webView) /** * webkit_web_view_search_text: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @text: a string to look for * @forward: whether to find forward or not * @case_sensitive: whether to respect the case of text @@ -3596,7 +3634,7 @@ gboolean webkit_web_view_search_text(WebKitWebView* webView, const gchar* string /** * webkit_web_view_mark_text_matches: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @string: a string to look for * @case_sensitive: whether to respect the case of text * @limit: the maximum number of strings to look for or 0 for all @@ -3617,7 +3655,7 @@ guint webkit_web_view_mark_text_matches(WebKitWebView* webView, const gchar* str /** * webkit_web_view_set_highlight_text_matches: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @highlight: whether to highlight text matches * * Highlights text matches previously marked by webkit_web_view_mark_text_matches. @@ -3635,7 +3673,7 @@ void webkit_web_view_set_highlight_text_matches(WebKitWebView* webView, gboolean /** * webkit_web_view_unmark_text_matches: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Removes highlighting previously set by webkit_web_view_mark_text_matches. */ @@ -3663,7 +3701,7 @@ WebKitWebFrame* webkit_web_view_get_main_frame(WebKitWebView* webView) /** * webkit_web_view_get_focused_frame: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Returns the frame that has focus or an active text selection. * @@ -3687,7 +3725,7 @@ void webkit_web_view_execute_script(WebKitWebView* webView, const gchar* script) /** * webkit_web_view_cut_clipboard: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Determines whether or not it is currently possible to cut to the clipboard. * @@ -3703,7 +3741,7 @@ gboolean webkit_web_view_can_cut_clipboard(WebKitWebView* webView) /** * webkit_web_view_copy_clipboard: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Determines whether or not it is currently possible to copy to the clipboard. * @@ -3719,7 +3757,7 @@ gboolean webkit_web_view_can_copy_clipboard(WebKitWebView* webView) /** * webkit_web_view_paste_clipboard: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Determines whether or not it is currently possible to paste from the clipboard. * @@ -3735,7 +3773,7 @@ gboolean webkit_web_view_can_paste_clipboard(WebKitWebView* webView) /** * webkit_web_view_cut_clipboard: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Cuts the current selection inside the @web_view to the clipboard. */ @@ -3749,7 +3787,7 @@ void webkit_web_view_cut_clipboard(WebKitWebView* webView) /** * webkit_web_view_copy_clipboard: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Copies the current selection inside the @web_view to the clipboard. */ @@ -3763,7 +3801,7 @@ void webkit_web_view_copy_clipboard(WebKitWebView* webView) /** * webkit_web_view_paste_clipboard: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Pastes the current contents of the clipboard to the @web_view. */ @@ -3777,7 +3815,7 @@ void webkit_web_view_paste_clipboard(WebKitWebView* webView) /** * webkit_web_view_delete_selection: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Deletes the current selection inside the @web_view. */ @@ -3791,7 +3829,7 @@ void webkit_web_view_delete_selection(WebKitWebView* webView) /** * webkit_web_view_has_selection: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Determines whether text was selected. * @@ -3806,7 +3844,7 @@ gboolean webkit_web_view_has_selection(WebKitWebView* webView) /** * webkit_web_view_get_selected_text: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Retrieves the selected text if any. * @@ -3822,7 +3860,7 @@ gchar* webkit_web_view_get_selected_text(WebKitWebView* webView) /** * webkit_web_view_select_all: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Attempts to select everything inside the @web_view. */ @@ -3835,7 +3873,7 @@ void webkit_web_view_select_all(WebKitWebView* webView) /** * webkit_web_view_get_editable: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Returns whether the user is allowed to edit the document. * @@ -3856,7 +3894,7 @@ gboolean webkit_web_view_get_editable(WebKitWebView* webView) /** * webkit_web_view_set_editable: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @flag: a #gboolean indicating the editable state * * Sets whether @web_view allows the user to edit its HTML document. @@ -3899,7 +3937,7 @@ void webkit_web_view_set_editable(WebKitWebView* webView, gboolean flag) /** * webkit_web_view_get_copy_target_list: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * This function returns the list of targets this #WebKitWebView can * provide for clipboard copying and as DND source. The targets in the list are @@ -3916,7 +3954,7 @@ GtkTargetList* webkit_web_view_get_copy_target_list(WebKitWebView* webView) /** * webkit_web_view_get_paste_target_list: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * This function returns the list of targets this #WebKitWebView can * provide for clipboard pasting and as DND destination. The targets in the list are @@ -3933,7 +3971,7 @@ GtkTargetList* webkit_web_view_get_paste_target_list(WebKitWebView* webView) /** * webkit_web_view_can_show_mime_type: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @mime_type: a MIME type * * This functions returns whether or not a MIME type can be displayed using this view. @@ -3956,7 +3994,7 @@ gboolean webkit_web_view_can_show_mime_type(WebKitWebView* webView, const gchar* /** * webkit_web_view_get_transparent: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Returns whether the #WebKitWebView has a transparent background. * @@ -3973,7 +4011,7 @@ gboolean webkit_web_view_get_transparent(WebKitWebView* webView) /** * webkit_web_view_set_transparent: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Sets whether the #WebKitWebView has a transparent background. * @@ -3997,7 +4035,7 @@ void webkit_web_view_set_transparent(WebKitWebView* webView, gboolean flag) /** * webkit_web_view_get_zoom_level: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Returns the zoom level of @web_view, i.e. the factor by which elements in * the page are scaled with respect to their original size. @@ -4036,7 +4074,7 @@ static void webkit_web_view_apply_zoom_level(WebKitWebView* webView, gfloat zoom /** * webkit_web_view_set_zoom_level: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @zoom_level: the new zoom level * * Sets the zoom level of @web_view, i.e. the factor by which elements in @@ -4057,7 +4095,7 @@ void webkit_web_view_set_zoom_level(WebKitWebView* webView, gfloat zoomLevel) /** * webkit_web_view_zoom_in: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Increases the zoom level of @web_view. The current zoom * level is incremented by the value of the "zoom-step" @@ -4078,7 +4116,7 @@ void webkit_web_view_zoom_in(WebKitWebView* webView) /** * webkit_web_view_zoom_out: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Decreases the zoom level of @web_view. The current zoom * level is decremented by the value of the "zoom-step" @@ -4099,7 +4137,7 @@ void webkit_web_view_zoom_out(WebKitWebView* webView) /** * webkit_web_view_get_full_content_zoom: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Returns whether the zoom level affects only text or all elements. * @@ -4118,7 +4156,7 @@ gboolean webkit_web_view_get_full_content_zoom(WebKitWebView* webView) /** * webkit_web_view_set_full_content_zoom: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @full_content_zoom: %FALSE if only text should be scaled (the default), * %TRUE if the full content of the view should be scaled. * @@ -4151,7 +4189,7 @@ void webkit_web_view_set_full_content_zoom(WebKitWebView* webView, gboolean zoom /** * webkit_web_view_get_load_status: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Determines the current status of the load. * @@ -4167,7 +4205,7 @@ WebKitLoadStatus webkit_web_view_get_load_status(WebKitWebView* webView) /** * webkit_web_view_get_progress: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Determines the current progress of the load. * @@ -4182,7 +4220,7 @@ gdouble webkit_web_view_get_progress(WebKitWebView* webView) /** * webkit_web_view_get_encoding: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Returns the default encoding of the #WebKitWebView. * @@ -4202,7 +4240,7 @@ const gchar* webkit_web_view_get_encoding(WebKitWebView* webView) /** * webkit_web_view_set_custom_encoding: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @encoding: the new encoding, or %NULL to restore the default encoding * * Sets the current #WebKitWebView encoding, without modifying the default one, @@ -4219,7 +4257,7 @@ void webkit_web_view_set_custom_encoding(WebKitWebView* webView, const char* enc /** * webkit_web_view_get_custom_encoding: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Returns the current encoding of the #WebKitWebView, not the default-encoding * of WebKitWebSettings. @@ -4240,7 +4278,7 @@ const char* webkit_web_view_get_custom_encoding(WebKitWebView* webView) /** * webkit_web_view_set_view_mode: - * @web_view: the #WebKitWebView that will have its view mode set + * @webView: the #WebKitWebView that will have its view mode set * @mode: the %WebKitWebViewViewMode to be set * * Sets the view-mode property of the #WebKitWebView. Check the @@ -4275,7 +4313,7 @@ void webkit_web_view_set_view_mode(WebKitWebView* webView, WebKitWebViewViewMode /** * webkit_web_view_get_view_mode: - * @web_view: the #WebKitWebView to obtain the view mode from + * @webView: the #WebKitWebView to obtain the view mode from * * Gets the value of the view-mode property of the * #WebKitWebView. Check the property's documentation for more @@ -4310,7 +4348,7 @@ WebKitWebViewViewMode webkit_web_view_get_view_mode(WebKitWebView* webView) /** * webkit_web_view_move_cursor: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @step: a #GtkMovementStep * @count: integer describing the direction of the movement. 1 for forward, -1 for backwards. * @@ -4345,7 +4383,7 @@ void webkit_web_view_set_group_name(WebKitWebView* webView, const gchar* groupNa /** * webkit_web_view_can_undo: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Determines whether or not it is currently possible to undo the last * editing command in the view. @@ -4364,7 +4402,7 @@ gboolean webkit_web_view_can_undo(WebKitWebView* webView) /** * webkit_web_view_undo: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Undoes the last editing command in the view, if possible. * @@ -4380,7 +4418,7 @@ void webkit_web_view_undo(WebKitWebView* webView) /** * webkit_web_view_can_redo: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Determines whether or not it is currently possible to redo the last * editing command in the view. @@ -4399,7 +4437,7 @@ gboolean webkit_web_view_can_redo(WebKitWebView* webView) /** * webkit_web_view_redo: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Redoes the last editing command in the view, if possible. * @@ -4416,7 +4454,7 @@ void webkit_web_view_redo(WebKitWebView* webView) /** * webkit_web_view_set_view_source_mode: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * @view_source_mode: the mode to turn on or off view source mode * * Set whether the view should be in view source mode. Setting this mode to @@ -4435,7 +4473,7 @@ void webkit_web_view_set_view_source_mode (WebKitWebView* webView, gboolean mode /** * webkit_web_view_get_view_source_mode: - * @web_view: a #WebKitWebView + * @webView: a #WebKitWebView * * Return value: %TRUE if @web_view is in view source mode, %FALSE otherwise. * @@ -4564,7 +4602,7 @@ WebKitHitTestResult* webkit_web_view_get_hit_test_result(WebKitWebView* webView, /** * webkit_web_view_get_icon_uri: - * @web_view: the #WebKitWebView object + * @webView: the #WebKitWebView object * * Obtains the URI for the favicon for the given #WebKitWebView, or * %NULL if there is none. @@ -4622,7 +4660,7 @@ webkit_web_view_get_dom_document(WebKitWebView* webView) * so if you insert your own #SoupCookieJar before any network * traffic occurs, WebKit will use it instead of the default. * - * Return value: the default #SoupSession + * Return value: (transfer none): the default #SoupSession * * Since: 1.1.1 */ diff --git a/WebKit/gtk/webkit/webkitwebview.h b/WebKit/gtk/webkit/webkitwebview.h index a320131..9dfb654 100644 --- a/WebKit/gtk/webkit/webkitwebview.h +++ b/WebKit/gtk/webkit/webkitwebview.h @@ -152,187 +152,187 @@ WEBKIT_API GtkWidget * webkit_web_view_new (void); WEBKIT_API G_CONST_RETURN gchar * -webkit_web_view_get_title (WebKitWebView *web_view); +webkit_web_view_get_title (WebKitWebView *webView); WEBKIT_API G_CONST_RETURN gchar * -webkit_web_view_get_uri (WebKitWebView *web_view); +webkit_web_view_get_uri (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_set_maintains_back_forward_list (WebKitWebView *web_view, +webkit_web_view_set_maintains_back_forward_list (WebKitWebView *webView, gboolean flag); WEBKIT_API WebKitWebBackForwardList * -webkit_web_view_get_back_forward_list (WebKitWebView *web_view); +webkit_web_view_get_back_forward_list (WebKitWebView *webView); WEBKIT_API gboolean -webkit_web_view_go_to_back_forward_item (WebKitWebView *web_view, +webkit_web_view_go_to_back_forward_item (WebKitWebView *webView, WebKitWebHistoryItem *item); WEBKIT_API gboolean -webkit_web_view_can_go_back (WebKitWebView *web_view); +webkit_web_view_can_go_back (WebKitWebView *webView); WEBKIT_API gboolean -webkit_web_view_can_go_back_or_forward (WebKitWebView *web_view, +webkit_web_view_can_go_back_or_forward (WebKitWebView *webView, gint steps); WEBKIT_API gboolean -webkit_web_view_can_go_forward (WebKitWebView *web_view); +webkit_web_view_can_go_forward (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_go_back (WebKitWebView *web_view); +webkit_web_view_go_back (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_go_back_or_forward (WebKitWebView *web_view, +webkit_web_view_go_back_or_forward (WebKitWebView *webView, gint steps); WEBKIT_API void -webkit_web_view_go_forward (WebKitWebView *web_view); +webkit_web_view_go_forward (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_stop_loading (WebKitWebView *web_view); +webkit_web_view_stop_loading (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_open (WebKitWebView *web_view, +webkit_web_view_open (WebKitWebView *webView, const gchar *uri); WEBKIT_API void -webkit_web_view_reload (WebKitWebView *web_view); +webkit_web_view_reload (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_reload_bypass_cache (WebKitWebView *web_view); +webkit_web_view_reload_bypass_cache (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_load_uri (WebKitWebView *web_view, +webkit_web_view_load_uri (WebKitWebView *webView, const gchar *uri); WEBKIT_API void -webkit_web_view_load_string (WebKitWebView *web_view, +webkit_web_view_load_string (WebKitWebView *webView, const gchar *content, const gchar *mime_type, const gchar *encoding, const gchar *base_uri); WEBKIT_API void -webkit_web_view_load_html_string (WebKitWebView *web_view, +webkit_web_view_load_html_string (WebKitWebView *webView, const gchar *content, const gchar *base_uri); WEBKIT_API void -webkit_web_view_load_request (WebKitWebView *web_view, +webkit_web_view_load_request (WebKitWebView *webView, WebKitNetworkRequest *request); WEBKIT_API gboolean -webkit_web_view_search_text (WebKitWebView *web_view, +webkit_web_view_search_text (WebKitWebView *webView, const gchar *text, gboolean case_sensitive, gboolean forward, gboolean wrap); WEBKIT_API guint -webkit_web_view_mark_text_matches (WebKitWebView *web_view, +webkit_web_view_mark_text_matches (WebKitWebView *webView, const gchar *string, gboolean case_sensitive, guint limit); WEBKIT_API void -webkit_web_view_set_highlight_text_matches (WebKitWebView *web_view, +webkit_web_view_set_highlight_text_matches (WebKitWebView *webView, gboolean highlight); WEBKIT_API void -webkit_web_view_unmark_text_matches (WebKitWebView *web_view); +webkit_web_view_unmark_text_matches (WebKitWebView *webView); WEBKIT_API WebKitWebFrame * -webkit_web_view_get_main_frame (WebKitWebView *web_view); +webkit_web_view_get_main_frame (WebKitWebView *webView); WEBKIT_API WebKitWebFrame * -webkit_web_view_get_focused_frame (WebKitWebView *web_view); +webkit_web_view_get_focused_frame (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_execute_script (WebKitWebView *web_view, +webkit_web_view_execute_script (WebKitWebView *webView, const gchar *script); WEBKIT_API gboolean -webkit_web_view_can_cut_clipboard (WebKitWebView *web_view); +webkit_web_view_can_cut_clipboard (WebKitWebView *webView); WEBKIT_API gboolean -webkit_web_view_can_copy_clipboard (WebKitWebView *web_view); +webkit_web_view_can_copy_clipboard (WebKitWebView *webView); WEBKIT_API gboolean -webkit_web_view_can_paste_clipboard (WebKitWebView *web_view); +webkit_web_view_can_paste_clipboard (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_cut_clipboard (WebKitWebView *web_view); +webkit_web_view_cut_clipboard (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_copy_clipboard (WebKitWebView *web_view); +webkit_web_view_copy_clipboard (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_paste_clipboard (WebKitWebView *web_view); +webkit_web_view_paste_clipboard (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_delete_selection (WebKitWebView *web_view); +webkit_web_view_delete_selection (WebKitWebView *webView); WEBKIT_API gboolean -webkit_web_view_has_selection (WebKitWebView *web_view); +webkit_web_view_has_selection (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_select_all (WebKitWebView *web_view); +webkit_web_view_select_all (WebKitWebView *webView); WEBKIT_API gboolean -webkit_web_view_get_editable (WebKitWebView *web_view); +webkit_web_view_get_editable (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_set_editable (WebKitWebView *web_view, +webkit_web_view_set_editable (WebKitWebView *webView, gboolean flag); WEBKIT_API GtkTargetList * -webkit_web_view_get_copy_target_list (WebKitWebView *web_view); +webkit_web_view_get_copy_target_list (WebKitWebView *webView); WEBKIT_API GtkTargetList * -webkit_web_view_get_paste_target_list (WebKitWebView *web_view); +webkit_web_view_get_paste_target_list (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_set_settings (WebKitWebView *web_view, +webkit_web_view_set_settings (WebKitWebView *webView, WebKitWebSettings *settings); WEBKIT_API WebKitWebSettings * -webkit_web_view_get_settings (WebKitWebView *web_view); +webkit_web_view_get_settings (WebKitWebView *webView); WEBKIT_API WebKitWebInspector * -webkit_web_view_get_inspector (WebKitWebView *web_view); +webkit_web_view_get_inspector (WebKitWebView *webView); WEBKIT_API WebKitWebWindowFeatures* -webkit_web_view_get_window_features (WebKitWebView *web_view); +webkit_web_view_get_window_features (WebKitWebView *webView); WEBKIT_API gboolean -webkit_web_view_can_show_mime_type (WebKitWebView *web_view, +webkit_web_view_can_show_mime_type (WebKitWebView *webView, const gchar *mime_type); WEBKIT_API gboolean -webkit_web_view_get_transparent (WebKitWebView *web_view); +webkit_web_view_get_transparent (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_set_transparent (WebKitWebView *web_view, +webkit_web_view_set_transparent (WebKitWebView *webView, gboolean flag); WEBKIT_API gfloat -webkit_web_view_get_zoom_level (WebKitWebView *web_view); +webkit_web_view_get_zoom_level (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_set_zoom_level (WebKitWebView *web_view, +webkit_web_view_set_zoom_level (WebKitWebView *webView, gfloat zoom_level); WEBKIT_API void -webkit_web_view_zoom_in (WebKitWebView *web_view); +webkit_web_view_zoom_in (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_zoom_out (WebKitWebView *web_view); +webkit_web_view_zoom_out (WebKitWebView *webView); WEBKIT_API gboolean -webkit_web_view_get_full_content_zoom (WebKitWebView *web_view); +webkit_web_view_get_full_content_zoom (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_set_full_content_zoom (WebKitWebView *web_view, +webkit_web_view_set_full_content_zoom (WebKitWebView *webView, gboolean full_content_zoom); WEBKIT_API SoupSession* @@ -349,11 +349,11 @@ WEBKIT_API const char* webkit_web_view_get_custom_encoding (WebKitWebView * webView); WEBKIT_API void -webkit_web_view_set_view_mode (WebKitWebView *web_view, +webkit_web_view_set_view_mode (WebKitWebView *webView, WebKitWebViewViewMode mode); WEBKIT_API WebKitWebViewViewMode -webkit_web_view_get_view_mode (WebKitWebView *web_view); +webkit_web_view_get_view_mode (WebKitWebView *webView); WEBKIT_API void webkit_web_view_move_cursor (WebKitWebView * webView, @@ -361,10 +361,10 @@ webkit_web_view_move_cursor (WebKitWebView * webView, gint count); WEBKIT_API WebKitLoadStatus -webkit_web_view_get_load_status (WebKitWebView *web_view); +webkit_web_view_get_load_status (WebKitWebView *webView); WEBKIT_API gdouble -webkit_web_view_get_progress (WebKitWebView *web_view); +webkit_web_view_get_progress (WebKitWebView *webView); WEBKIT_API void webkit_web_view_undo (WebKitWebView *webView); @@ -379,11 +379,11 @@ WEBKIT_API gboolean webkit_web_view_can_redo (WebKitWebView *webView); WEBKIT_API void -webkit_web_view_set_view_source_mode (WebKitWebView *web_view, +webkit_web_view_set_view_source_mode (WebKitWebView *webView, gboolean view_source_mode); WEBKIT_API gboolean -webkit_web_view_get_view_source_mode (WebKitWebView *web_view); +webkit_web_view_get_view_source_mode (WebKitWebView *webView); WEBKIT_API WebKitHitTestResult* webkit_web_view_get_hit_test_result (WebKitWebView *webView, diff --git a/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp b/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp index a6fe1df..e5d65bd 100644 --- a/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp +++ b/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp @@ -38,7 +38,7 @@ * In the normal case one will use #webkit_web_view_get_window_features * to get the #WebKitWebWindowFeatures and then monitor the property * changes. Be aware that the #WebKitWebWindowFeatures might change - * change before #WebKitWebView::web-view-ready signal is emitted. + * before #WebKitWebView::web-view-ready signal is emitted. * To be safe listen to the notify::window-features signal of the #WebKitWebView * and reconnect the signals whenever the #WebKitWebWindowFeatures of * a #WebKitWebView changes. |