Changeset 34387 in webkit


Ignore:
Timestamp:
Jun 5, 2008 3:50:40 PM (16 years ago)
Author:
christian@webkit.org
Message:

Please add a version to the Gtk port
​https://bugs.webkit.org/show_bug.cgi?id=14141

Reviewed by Alp Toker.

Location:
trunk
Files:
1 added
7 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r34329 r34387  
     12008-06-05  Christian Dywan  <christian@twotoasts.de>
     2
     3        Reviewed by Alp Toker.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=14141
     6        Please add a version to the Gtk port
     7
     8        * GNUmakefile.am:
     9
    1102008-06-02  Alp Toker  <alp@nuanti.com>
    211

  • trunk/GNUmakefile.am

    r34329 r34387  
    308308        WebKit/gtk/webkit/webkitdefines.h \
    309309        WebKit/gtk/webkit/webkitnetworkrequest.h \
     310        WebKit/gtk/webkit/webkitversion.h \
    310311        WebKit/gtk/webkit/webkitwebbackforwardlist.h \
    311312        WebKit/gtk/webkit/webkitwebframe.h \
    … …  
    331332        WebKit/gtk/webkit/webkitnetworkrequest.cpp \
    332333        WebKit/gtk/webkit/webkitprivate.cpp \
     334        WebKit/gtk/webkit/webkitversion.cpp \
    333335        WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \
    334336        WebKit/gtk/webkit/webkitwebframe.cpp \

  • trunk/WebKit/gtk/ChangeLog

    r34286 r34387  
     12008-06-05  Christian Dywan  <christian@twotoasts.de>
     2
     3        Reviewed by Alp Toker.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=14141
     6        Please add a version to the Gtk port
     7
     8        * webkit/webkit.h:
     9        * webkit/webkitversion.cpp: Added.
     10        * webkit/webkitversion.h.in: Added.
     11        * webkit/webkitwebsettings.cpp:
     12        (_WebKitWebSettingsPrivate::webkit_web_settings_class_init):
     13        * webkit/webkitwebview.cpp:
     14
    1152008-06-01  Alp Toker  <alp@nuanti.com>
    216

  • trunk/WebKit/gtk/webkit/webkit.h

    r29898 r34387  
    2121#define __WEBKIT_H__
    2222
     23#include <webkit/webkitversion.h>
    2324#include <webkit/webkitdefines.h>
    2425#include <webkit/webkitnetworkrequest.h>

  • trunk/WebKit/gtk/webkit/webkitversion.cpp

    r34386 r34387  
    11/*
    2  * Copyright (C) 2007 Alp Toker <alp@atoker.com>
     2 * Copyright (C) 2008 Christian Dywan <christian@imendio.com>
    33 *
    44 * This library is free software; you can redistribute it and/or
    … …  
    1818 */
    1919
    20 #ifndef __WEBKIT_H__
    21 #define __WEBKIT_H__
     20#include "webkitversion.h"
    2221
    23 #include <webkit/webkitdefines.h>
    24 #include <webkit/webkitnetworkrequest.h>
    25 #include <webkit/webkitwebframe.h>
    26 #include <webkit/webkitwebsettings.h>
    27 #include <webkit/webkitwebview.h>
    28 #include <webkit/webkitwebbackforwardlist.h>
    29 #include <webkit/webkitwebhistoryitem.h>
     22extern "C" {
    3023
    31 #endif /* __WEBKIT_H__ */
     24/**
     25 * webkit_major_version:
     26 *
     27 * The major version number of the WebKit that is linked against.
     28 *
     29 * Return value: The major version
     30 */
     31guint webkit_major_version()
     32{
     33    return WEBKIT_MAJOR_VERSION;
     34}
     35
     36/**
     37 * webkit_minor_version:
     38 *
     39 * The minor version number of the WebKit that is linked against.
     40 *
     41 * Return value: The minor version
     42 */
     43guint webkit_minor_version()
     44{
     45    return WEBKIT_MINOR_VERSION;
     46}
     47
     48/**
     49 * webkit_micro_version:
     50 *
     51 * The micro version number of the WebKit that is linked against.
     52 *
     53 * Return value: The micro version
     54 */
     55guint webkit_micro_version()
     56{
     57    return WEBKIT_MICRO_VERSION;
     58}
     59
     60}

  • trunk/WebKit/gtk/webkit/webkitwebsettings.cpp

    r34286 r34387  
    253253                                    flags));
    254254
     255    /**
     256    * WebKitWebSettings:zoom-step:
     257    *
     258    * The value by which the zoom level is changed when zooming in or out.
     259    *
     260    * Since: 1.0.1
     261    */
    255262    g_object_class_install_property(gobject_class,
    256263                                    PROP_ZOOM_STEP,

  • trunk/WebKit/gtk/webkit/webkitwebview.cpp

    r34286 r34387  
    12211221                                                         WEBKIT_PARAM_READWRITE));
    12221222
     1223    /**
     1224    * WebKitWebView:zoom-level:
     1225    *
     1226    * The level of zoom of the content.
     1227    *
     1228    * Since: 1.0.1
     1229    */
    12231230    g_object_class_install_property(objectClass, PROP_ZOOM_LEVEL,
    12241231                                    g_param_spec_float("zoom-level",
    … …  
    12301237                                                       WEBKIT_PARAM_READWRITE));
    12311238
     1239    /**
     1240    * WebKitWebView:full-content-zoom:
     1241    *
     1242    * Whether the full content is scaled when zooming.
     1243    *
     1244    * Since: 1.0.1
     1245    */
    12321246    g_object_class_install_property(objectClass, PROP_FULL_CONTENT_ZOOM,
    12331247                                    g_param_spec_boolean("full-content-zoom",
    … …  
    20662080 *
    20672081 * Return value: the zoom level of @web_view
     2082 *
     2083 * Since: 1.0.1
    20682084 */
    20692085gfloat webkit_web_view_get_zoom_level(WebKitWebView* webView)
    … …  
    20982114 * the zoom level changes the text size, or if %TRUE, scales all
    20992115 * elements in the page.
     2116 *
     2117 * Since: 1.0.1
    21002118 */
    21012119void webkit_web_view_set_zoom_level(WebKitWebView* webView, gfloat zoomLevel)
    … …  
    21142132 * level is incremented by the value of the "zoom-step"
    21152133 * property of the #WebKitWebSettings associated with @web_view.
     2134 *
     2135 * Since: 1.0.1
    21162136 */
    21172137void webkit_web_view_zoom_in(WebKitWebView* webView)
    … …  
    21332153 * level is decremented by the value of the "zoom-step"
    21342154 * property of the #WebKitWebSettings associated with @web_view.
     2155 *
     2156 * Since: 1.0.1
    21352157 */
    21362158void webkit_web_view_zoom_out(WebKitWebView* webView)
    … …  
    21532175 * Return value: %FALSE if only text should be scaled (the default),
    21542176 * %TRUE if the full content of the view should be scaled.
     2177 *
     2178 * Since: 1.0.1
    21552179 */
    21562180gboolean webkit_web_view_get_full_content_zoom(WebKitWebView* webView)
    … …  
    21692193 *
    21702194 * Sets whether the zoom level affects only text or all elements.
     2195 *
     2196 * Since: 1.0.1
    21712197 */
    21722198void webkit_web_view_set_full_content_zoom(WebKitWebView* webView, gboolean zoomFullContent)

  • trunk/configure.ac

    r34329 r34387  
    1 AC_INIT([WebKit],[0.1],[http://bugs.webkit.org/])
    2 
    31AC_PREREQ(2.59)
    42
     3m4_define([webkit_major_version], [1])
     4m4_define([webkit_minor_version], [0])
     5m4_define([webkit_micro_version], [1])
     6
     7AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
     8
    59AC_CONFIG_HEADERS([aconfig.h])
     10
     11WEBKIT_MAJOR_VERSION=webkit_major_version
     12WEBKIT_MINOR_VERSION=webkit_minor_version
     13WEBKIT_MICRO_VERSION=webkit_micro_version
     14AC_SUBST(WEBKIT_MAJOR_VERSION)
     15AC_SUBST(WEBKIT_MINOR_VERSION)
     16AC_SUBST(WEBKIT_MICRO_VERSION)
     17
    618AC_CONFIG_SRCDIR([WebCore/config.h])
    719
    8 # see http://www.gnu.org/software/libtool/manual.html#Versioning
     20dnl # Libtool library version, not to confuse with API version
     21dnl # see http://www.gnu.org/software/libtool/manual.html#Versioning
    922LIBWEBKITGTK_VERSION=1:0:0
    1023AC_SUBST([LIBWEBKITGTK_VERSION])
    … …  
    552565GNUmakefile
    553566WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in
     567WebKit/gtk/webkit/webkitversion.h
    554568]
    555569)
Note: See TracChangeset for help on using the changeset viewer.