From: Juerg Billeter Date: Fri, 8 Feb 2008 12:01:30 +0000 (+0000) Subject: renamed from WebKitGtk and updated to current svn trunk X-Git-Tag: VALA_0_1_7~95 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8da3aba7df9150dafe54972a81b12c9520fd9c77;p=platform%2Fupstream%2Fvala.git renamed from WebKitGtk and updated to current svn trunk 2008-02-08 Juerg Billeter * vapi/packages/webkit-1.0/: renamed from WebKitGtk and updated to current svn trunk * vapi/webkit-1.0.vapi: regenerated * vapi/Makefile.am: updated svn path=/trunk/; revision=996 --- diff --git a/ChangeLog b/ChangeLog index 41be8e0..d573fb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2008-02-08 Jürg Billeter + * vapi/packages/webkit-1.0/: renamed from WebKitGtk and updated to + current svn trunk + + * vapi/webkit-1.0.vapi: regenerated + + * vapi/Makefile.am: updated + +2008-02-08 Jürg Billeter + * vapi/Makefile.am, vapi/taglib_c.vapi: add taglib bindings, patch by Andreas Brauchli diff --git a/vapi/Makefile.am b/vapi/Makefile.am index d6414c6..df83790 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -99,8 +99,8 @@ dist_vapi_DATA = \ vala-1.0.vapi \ vte.deps \ vte.vapi \ - WebKitGtk.deps \ - WebKitGtk.vapi \ + webkit-1.0.deps \ + webkit-1.0.vapi \ zlib.vapi \ $(NULL) diff --git a/vapi/packages/WebKitGtk/WebKitGtk.files b/vapi/packages/WebKitGtk/WebKitGtk.files deleted file mode 100644 index 1823a54..0000000 --- a/vapi/packages/WebKitGtk/WebKitGtk.files +++ /dev/null @@ -1,2 +0,0 @@ -include/WebKit/webkit*.h -lib/libWebKitGtk.so diff --git a/vapi/packages/WebKitGtk/WebKitGtk.deps b/vapi/packages/webkit-1.0/webkit-1.0.deps similarity index 100% rename from vapi/packages/WebKitGtk/WebKitGtk.deps rename to vapi/packages/webkit-1.0/webkit-1.0.deps diff --git a/vapi/packages/webkit-1.0/webkit-1.0.files b/vapi/packages/webkit-1.0/webkit-1.0.files new file mode 100644 index 0000000..ef827c6 --- /dev/null +++ b/vapi/packages/webkit-1.0/webkit-1.0.files @@ -0,0 +1,2 @@ +include/WebKit/webkit +lib/libWebKitGtk.so diff --git a/vapi/packages/WebKitGtk/WebKitGtk.gi b/vapi/packages/webkit-1.0/webkit-1.0.gi similarity index 75% rename from vapi/packages/WebKitGtk/WebKitGtk.gi rename to vapi/packages/webkit-1.0/webkit-1.0.gi index 4be1441..1ef9ef8 100644 --- a/vapi/packages/WebKitGtk/WebKitGtk.gi +++ b/vapi/packages/webkit-1.0/webkit-1.0.gi @@ -31,6 +31,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -138,6 +236,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -240,6 +387,12 @@ + + + + + + @@ -295,6 +448,13 @@ + + + + + + + @@ -380,6 +540,13 @@ + + + + + + + @@ -480,6 +647,13 @@ + + + + + + + diff --git a/vapi/packages/WebKitGtk/WebKitGtk.metadata b/vapi/packages/webkit-1.0/webkit-1.0.metadata similarity index 76% rename from vapi/packages/WebKitGtk/WebKitGtk.metadata rename to vapi/packages/webkit-1.0/webkit-1.0.metadata index fdeddcc..961974f 100644 --- a/vapi/packages/WebKitGtk/WebKitGtk.metadata +++ b/vapi/packages/webkit-1.0/webkit-1.0.metadata @@ -1,4 +1,4 @@ -WebKit cheader_filename="webkit.h" +WebKit cheader_filename="webkit/webkit.h" lower_case_cprefix="webkit_" webkit_web_frame_get_global_context hidden="1" WebKitWebView::copy_clipboard has_emitter="1" WebKitWebView::cut_clipboard has_emitter="1" diff --git a/vapi/packages/WebKitGtk/WebKitGtk.namespace b/vapi/packages/webkit-1.0/webkit-1.0.namespace similarity index 100% rename from vapi/packages/WebKitGtk/WebKitGtk.namespace rename to vapi/packages/webkit-1.0/webkit-1.0.namespace diff --git a/vapi/WebKitGtk.deps b/vapi/webkit-1.0.deps similarity index 100% rename from vapi/WebKitGtk.deps rename to vapi/webkit-1.0.deps diff --git a/vapi/WebKitGtk.vapi b/vapi/webkit-1.0.vapi similarity index 69% rename from vapi/WebKitGtk.vapi rename to vapi/webkit-1.0.vapi index 533431c..1307ca3 100644 --- a/vapi/WebKitGtk.vapi +++ b/vapi/webkit-1.0.vapi @@ -1,48 +1,53 @@ -/* WebKitGtk.vapi generated by lt-vapigen, do not modify. */ +/* webkit-1.0.vapi generated by lt-vapigen, do not modify. */ -[CCode (cprefix = "WebKit", lower_case_cprefix = "web_kit_")] +[CCode (cprefix = "WebKit", lower_case_cprefix = "webkit_")] namespace WebKit { - [CCode (cprefix = "WEBKIT_NAVIGATION_RESPONSE_", cheader_filename = "webkit.h")] + [CCode (cprefix = "WEBKIT_NAVIGATION_RESPONSE_", cheader_filename = "webkit/webkit.h")] public enum NavigationResponse { ACCEPT, IGNORE, DOWNLOAD, } - [CCode (cprefix = "WEBKIT_WEB_VIEW_TARGET_INFO_", cheader_filename = "webkit.h")] + [CCode (cprefix = "WEBKIT_WEB_VIEW_TARGET_INFO_", cheader_filename = "webkit/webkit.h")] public enum WebViewTargetInfo { HTML, TEXT, } - [CCode (cheader_filename = "webkit.h")] + [CCode (cheader_filename = "webkit/webkit.h")] public class NetworkRequest : GLib.Object { - [CCode (cname = "webkit_network_request_get_uri")] public weak string get_uri (); - [CCode (cname = "webkit_network_request_new")] public NetworkRequest (string uri); - [CCode (cname = "webkit_network_request_set_uri")] public void set_uri (string uri); } - [CCode (cheader_filename = "webkit.h")] + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebBackForwardList : GLib.Object { + public bool contains_item (WebKit.WebHistoryItem history_item); + public weak WebKit.WebHistoryItem get_back_item (); + public int get_back_length (); + public weak GLib.List get_back_list_with_limit (int limit); + public weak WebKit.WebHistoryItem get_current_item (); + public weak WebKit.WebHistoryItem get_forward_item (); + public int get_forward_length (); + public weak GLib.List get_forward_list_with_limit (int limit); + public int get_limit (); + public weak WebKit.WebHistoryItem get_nth_item (int index); + public void go_back (); + public void go_forward (); + public void go_to_item (WebKit.WebHistoryItem history_item); + public WebBackForwardList.with_web_view (WebKit.WebView web_view); + public void set_limit (int limit); + } + [CCode (cheader_filename = "webkit/webkit.h")] public class WebFrame : GLib.Object { - [CCode (cname = "webkit_web_frame_find_frame")] public weak WebKit.WebFrame find_frame (string name); - [CCode (cname = "webkit_web_frame_get_name")] public weak string get_name (); - [CCode (cname = "webkit_web_frame_get_parent")] public weak WebKit.WebFrame get_parent (); - [CCode (cname = "webkit_web_frame_get_title")] public weak string get_title (); - [CCode (cname = "webkit_web_frame_get_uri")] public weak string get_uri (); - [CCode (cname = "webkit_web_frame_get_web_view")] public weak WebKit.WebView get_web_view (); - [CCode (cname = "webkit_web_frame_load_request")] public void load_request (WebKit.NetworkRequest request); - [CCode (cname = "webkit_web_frame_new")] public WebFrame (WebKit.WebView web_view); - [CCode (cname = "webkit_web_frame_reload")] public void reload (); - [CCode (cname = "webkit_web_frame_stop_loading")] public void stop_loading (); public weak string name { get; } public weak string title { get; } @@ -53,11 +58,20 @@ namespace WebKit { public signal void load_done (bool p0); public signal void title_changed (string p0); } - [CCode (cheader_filename = "webkit.h")] + [CCode (cheader_filename = "webkit/webkit.h")] + public class WebHistoryItem : GLib.Object { + public weak string get_alternate_title (); + public double get_last_visited_time (); + public weak string get_original_uri (); + public weak string get_title (); + public weak string get_uri (); + public WebHistoryItem (); + public WebHistoryItem.with_data (string uri, string title); + public void set_alternate_title (string title); + } + [CCode (cheader_filename = "webkit/webkit.h")] public class WebSettings : GLib.Object { - [CCode (cname = "webkit_web_settings_copy")] public weak WebKit.WebSettings copy (); - [CCode (cname = "webkit_web_settings_new")] public WebSettings (); [NoAccessorMethod] public weak bool auto_load_images { get; set construct; } @@ -96,69 +110,41 @@ namespace WebKit { [NoAccessorMethod] public weak string user_stylesheet_uri { get; set construct; } } - [CCode (cheader_filename = "webkit.h")] + [CCode (cheader_filename = "webkit/webkit.h")] public class WebView : Gtk.Container, Atk.Implementor, Gtk.Buildable { - [CCode (cname = "webkit_web_view_can_copy_clipboard")] public bool can_copy_clipboard (); - [CCode (cname = "webkit_web_view_can_cut_clipboard")] public bool can_cut_clipboard (); - [CCode (cname = "webkit_web_view_can_go_back")] public bool can_go_back (); - [CCode (cname = "webkit_web_view_can_go_back_or_forward")] public bool can_go_back_or_forward (int steps); - [CCode (cname = "webkit_web_view_can_go_backward")] public bool can_go_backward (); - [CCode (cname = "webkit_web_view_can_go_forward")] public bool can_go_forward (); - [CCode (cname = "webkit_web_view_can_paste_clipboard")] public bool can_paste_clipboard (); - [CCode (cname = "webkit_web_view_delete_selection")] public void delete_selection (); - [CCode (cname = "webkit_web_view_execute_script")] public void execute_script (string script); - [CCode (cname = "webkit_web_view_get_copy_target_list")] + public weak WebKit.WebBackForwardList get_back_forward_list (); public weak Gtk.TargetList get_copy_target_list (); - [CCode (cname = "webkit_web_view_get_editable")] public bool get_editable (); - [CCode (cname = "webkit_web_view_get_main_frame")] public weak WebKit.WebFrame get_main_frame (); - [CCode (cname = "webkit_web_view_get_paste_target_list")] public weak Gtk.TargetList get_paste_target_list (); - [CCode (cname = "webkit_web_view_get_settings")] public weak WebKit.WebSettings get_settings (); - [CCode (cname = "webkit_web_view_go_back")] public void go_back (); - [CCode (cname = "webkit_web_view_go_back_or_forward")] public void go_back_or_forward (int steps); - [CCode (cname = "webkit_web_view_go_backward")] public void go_backward (); - [CCode (cname = "webkit_web_view_go_forward")] public void go_forward (); - [CCode (cname = "webkit_web_view_has_selection")] + public bool go_to_back_forward_item (WebKit.WebHistoryItem item); public bool has_selection (); - [CCode (cname = "webkit_web_view_load_html_string")] public void load_html_string (string content, string base_uri); - [CCode (cname = "webkit_web_view_load_string")] public void load_string (string content, string content_mime_type, string content_encoding, string base_uri); - [CCode (cname = "webkit_web_view_mark_text_matches")] public uint mark_text_matches (string string, bool case_sensitive, uint limit); - [CCode (cname = "webkit_web_view_new")] public WebView (); - [CCode (cname = "webkit_web_view_open")] public void open (string uri); - [CCode (cname = "webkit_web_view_reload")] public void reload (); - [CCode (cname = "webkit_web_view_search_text")] public bool search_text (string string, bool case_sensitive, bool forward, bool wrap); - [CCode (cname = "webkit_web_view_set_editable")] public void set_editable (bool flag); - [CCode (cname = "webkit_web_view_set_highlight_text_matches")] public void set_highlight_text_matches (bool highlight); - [CCode (cname = "webkit_web_view_set_settings")] + public void set_maintains_back_forward_list (bool flag); public void set_settings (WebKit.WebSettings settings); - [CCode (cname = "webkit_web_view_stop_loading")] public void stop_loading (); - [CCode (cname = "webkit_web_view_unmark_text_matches")] public void unmark_text_matches (); [NoWrapper] public virtual weak string choose_file (WebKit.WebFrame frame, string old_file); @@ -182,6 +168,7 @@ namespace WebKit { public signal int navigation_requested (GLib.Object frame, GLib.Object request); [HasEmitter] public signal void paste_clipboard (); + public signal void populate_popup (Gtk.Menu p0); public signal bool script_alert (GLib.Object frame, string alert_message); public signal bool script_confirm (GLib.Object frame, string confirm_message, bool did_confirm); public signal bool script_prompt (GLib.Object frame, string message, string default_value, pointer value);