GNOME.org
 

vala r996 - in trunk: . vapi vapi/packages/WebKitGtk vapi/packages/webkit-1.0

Author: juergbi
Date: Fri Feb  8 12:01:30 2008
New Revision: 996
URL: http://svn.gnome.org/viewvc/vala?rev=996&view=rev

Log:
2008-02-08  Juerg Billeter  <j bitron ch>

	* vapi/packages/webkit-1.0/: renamed from WebKitGtk and updated to
	  current svn trunk

	* vapi/webkit-1.0.vapi: regenerated

	* vapi/Makefile.am: updated


Added:
   trunk/vapi/packages/webkit-1.0/
      - copied from r988, /trunk/vapi/packages/WebKitGtk/
   trunk/vapi/packages/webkit-1.0/webkit-1.0.deps
      - copied unchanged from r988, /trunk/vapi/packages/WebKitGtk/WebKitGtk.deps
   trunk/vapi/packages/webkit-1.0/webkit-1.0.files
      - copied, changed from r988, /trunk/vapi/packages/WebKitGtk/WebKitGtk.files
   trunk/vapi/packages/webkit-1.0/webkit-1.0.gi
      - copied, changed from r988, /trunk/vapi/packages/WebKitGtk/WebKitGtk.gi
   trunk/vapi/packages/webkit-1.0/webkit-1.0.metadata
      - copied, changed from r988, /trunk/vapi/packages/WebKitGtk/WebKitGtk.metadata
   trunk/vapi/packages/webkit-1.0/webkit-1.0.namespace
      - copied unchanged from r988, /trunk/vapi/packages/WebKitGtk/WebKitGtk.namespace
   trunk/vapi/webkit-1.0.deps
      - copied unchanged from r988, /trunk/vapi/WebKitGtk.deps
   trunk/vapi/webkit-1.0.vapi
      - copied, changed from r988, /trunk/vapi/WebKitGtk.vapi
Removed:
   trunk/vapi/WebKitGtk.deps
   trunk/vapi/WebKitGtk.vapi
   trunk/vapi/packages/WebKitGtk/
   trunk/vapi/packages/webkit-1.0/WebKitGtk.deps
   trunk/vapi/packages/webkit-1.0/WebKitGtk.files
   trunk/vapi/packages/webkit-1.0/WebKitGtk.gi
   trunk/vapi/packages/webkit-1.0/WebKitGtk.metadata
   trunk/vapi/packages/webkit-1.0/WebKitGtk.namespace
Modified:
   trunk/ChangeLog
   trunk/vapi/Makefile.am

Modified: trunk/vapi/Makefile.am
==============================================================================
--- trunk/vapi/Makefile.am	(original)
+++ trunk/vapi/Makefile.am	Fri Feb  8 12:01:30 2008
@@ -99,8 +99,8 @@
 	vala-1.0.vapi \
 	vte.deps \
 	vte.vapi \
-	WebKitGtk.deps \
-	WebKitGtk.vapi \
+	webkit-1.0.deps \
+	webkit-1.0.vapi \
 	zlib.vapi \
 	$(NULL)
 

Copied: trunk/vapi/packages/webkit-1.0/webkit-1.0.files (from r988, /trunk/vapi/packages/WebKitGtk/WebKitGtk.files)
==============================================================================
--- /trunk/vapi/packages/WebKitGtk/WebKitGtk.files	(original)
+++ trunk/vapi/packages/webkit-1.0/webkit-1.0.files	Fri Feb  8 12:01:30 2008
@@ -1,2 +1,2 @@
-include/WebKit/webkit*.h
+include/WebKit/webkit
 lib/libWebKitGtk.so

Copied: trunk/vapi/packages/webkit-1.0/webkit-1.0.gi (from r988, /trunk/vapi/packages/WebKitGtk/WebKitGtk.gi)
==============================================================================
--- /trunk/vapi/packages/WebKitGtk/WebKitGtk.gi	(original)
+++ trunk/vapi/packages/webkit-1.0/webkit-1.0.gi	Fri Feb  8 12:01:30 2008
@@ -31,6 +31,104 @@
 				</parameters>
 			</method>
 		</object>
+		<object name="WebKitWebBackForwardList" parent="GObject" type-name="WebKitWebBackForwardList" get-type="webkit_web_back_forward_list_get_type">
+			<method name="contains_item" symbol="webkit_web_back_forward_list_contains_item">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+					<parameter name="history_item" type="WebKitWebHistoryItem*"/>
+				</parameters>
+			</method>
+			<method name="get_back_item" symbol="webkit_web_back_forward_list_get_back_item">
+				<return-type type="WebKitWebHistoryItem*"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+				</parameters>
+			</method>
+			<method name="get_back_length" symbol="webkit_web_back_forward_list_get_back_length">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+				</parameters>
+			</method>
+			<method name="get_back_list_with_limit" symbol="webkit_web_back_forward_list_get_back_list_with_limit">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+					<parameter name="limit" type="gint"/>
+				</parameters>
+			</method>
+			<method name="get_current_item" symbol="webkit_web_back_forward_list_get_current_item">
+				<return-type type="WebKitWebHistoryItem*"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+				</parameters>
+			</method>
+			<method name="get_forward_item" symbol="webkit_web_back_forward_list_get_forward_item">
+				<return-type type="WebKitWebHistoryItem*"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+				</parameters>
+			</method>
+			<method name="get_forward_length" symbol="webkit_web_back_forward_list_get_forward_length">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+				</parameters>
+			</method>
+			<method name="get_forward_list_with_limit" symbol="webkit_web_back_forward_list_get_forward_list_with_limit">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+					<parameter name="limit" type="gint"/>
+				</parameters>
+			</method>
+			<method name="get_limit" symbol="webkit_web_back_forward_list_get_limit">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+				</parameters>
+			</method>
+			<method name="get_nth_item" symbol="webkit_web_back_forward_list_get_nth_item">
+				<return-type type="WebKitWebHistoryItem*"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+					<parameter name="index" type="gint"/>
+				</parameters>
+			</method>
+			<method name="go_back" symbol="webkit_web_back_forward_list_go_back">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+				</parameters>
+			</method>
+			<method name="go_forward" symbol="webkit_web_back_forward_list_go_forward">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+				</parameters>
+			</method>
+			<method name="go_to_item" symbol="webkit_web_back_forward_list_go_to_item">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+					<parameter name="history_item" type="WebKitWebHistoryItem*"/>
+				</parameters>
+			</method>
+			<constructor name="new_with_web_view" symbol="webkit_web_back_forward_list_new_with_web_view">
+				<return-type type="WebKitWebBackForwardList*"/>
+				<parameters>
+					<parameter name="web_view" type="WebKitWebView*"/>
+				</parameters>
+			</constructor>
+			<method name="set_limit" symbol="webkit_web_back_forward_list_set_limit">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="web_back_forward_list" type="WebKitWebBackForwardList*"/>
+					<parameter name="limit" type="gint"/>
+				</parameters>
+			</method>
+		</object>
 		<object name="WebKitWebFrame" parent="GObject" type-name="WebKitWebFrame" get-type="webkit_web_frame_get_type">
 			<method name="find_frame" symbol="webkit_web_frame_find_frame">
 				<return-type type="WebKitWebFrame*"/>
@@ -138,6 +236,55 @@
 				</parameters>
 			</signal>
 		</object>
+		<object name="WebKitWebHistoryItem" parent="GObject" type-name="WebKitWebHistoryItem" get-type="webkit_web_history_item_get_type">
+			<method name="get_alternate_title" symbol="webkit_web_history_item_get_alternate_title">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="web_history_item" type="WebKitWebHistoryItem*"/>
+				</parameters>
+			</method>
+			<method name="get_last_visited_time" symbol="webkit_web_history_item_get_last_visited_time">
+				<return-type type="gdouble"/>
+				<parameters>
+					<parameter name="web_history_item" type="WebKitWebHistoryItem*"/>
+				</parameters>
+			</method>
+			<method name="get_original_uri" symbol="webkit_web_history_item_get_original_uri">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="web_history_item" type="WebKitWebHistoryItem*"/>
+				</parameters>
+			</method>
+			<method name="get_title" symbol="webkit_web_history_item_get_title">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="web_history_item" type="WebKitWebHistoryItem*"/>
+				</parameters>
+			</method>
+			<method name="get_uri" symbol="webkit_web_history_item_get_uri">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="web_history_item" type="WebKitWebHistoryItem*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="webkit_web_history_item_new">
+				<return-type type="WebKitWebHistoryItem*"/>
+			</constructor>
+			<constructor name="new_with_data" symbol="webkit_web_history_item_new_with_data">
+				<return-type type="WebKitWebHistoryItem*"/>
+				<parameters>
+					<parameter name="uri" type="gchar*"/>
+					<parameter name="title" type="gchar*"/>
+				</parameters>
+			</constructor>
+			<method name="set_alternate_title" symbol="webkit_web_history_item_set_alternate_title">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="web_history_item" type="WebKitWebHistoryItem*"/>
+					<parameter name="title" type="gchar*"/>
+				</parameters>
+			</method>
+		</object>
 		<object name="WebKitWebSettings" parent="GObject" type-name="WebKitWebSettings" get-type="webkit_web_settings_get_type">
 			<method name="copy" symbol="webkit_web_settings_copy">
 				<return-type type="WebKitWebSettings*"/>
@@ -240,6 +387,12 @@
 					<parameter name="script" type="gchar*"/>
 				</parameters>
 			</method>
+			<method name="get_back_forward_list" symbol="webkit_web_view_get_back_forward_list">
+				<return-type type="WebKitWebBackForwardList*"/>
+				<parameters>
+					<parameter name="web_view" type="WebKitWebView*"/>
+				</parameters>
+			</method>
 			<method name="get_copy_target_list" symbol="webkit_web_view_get_copy_target_list">
 				<return-type type="GtkTargetList*"/>
 				<parameters>
@@ -295,6 +448,13 @@
 					<parameter name="web_view" type="WebKitWebView*"/>
 				</parameters>
 			</method>
+			<method name="go_to_back_forward_item" symbol="webkit_web_view_go_to_back_forward_item">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="web_view" type="WebKitWebView*"/>
+					<parameter name="item" type="WebKitWebHistoryItem*"/>
+				</parameters>
+			</method>
 			<method name="has_selection" symbol="webkit_web_view_has_selection">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -380,6 +540,13 @@
 					<parameter name="highlight" type="gboolean"/>
 				</parameters>
 			</method>
+			<method name="set_maintains_back_forward_list" symbol="webkit_web_view_set_maintains_back_forward_list">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="web_view" type="WebKitWebView*"/>
+					<parameter name="flag" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="set_settings" symbol="webkit_web_view_set_settings">
 				<return-type type="void"/>
 				<parameters>
@@ -480,6 +647,13 @@
 					<parameter name="web_view" type="WebKitWebView*"/>
 				</parameters>
 			</signal>
+			<signal name="populate-popup" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="object" type="WebKitWebView*"/>
+					<parameter name="p0" type="GtkMenu*"/>
+				</parameters>
+			</signal>
 			<signal name="script-alert" when="LAST">
 				<return-type type="gboolean"/>
 				<parameters>

Copied: trunk/vapi/packages/webkit-1.0/webkit-1.0.metadata (from r988, /trunk/vapi/packages/WebKitGtk/WebKitGtk.metadata)
==============================================================================
--- /trunk/vapi/packages/WebKitGtk/WebKitGtk.metadata	(original)
+++ trunk/vapi/packages/webkit-1.0/webkit-1.0.metadata	Fri Feb  8 12:01:30 2008
@@ -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"

Copied: trunk/vapi/webkit-1.0.vapi (from r988, /trunk/vapi/WebKitGtk.vapi)
==============================================================================
--- /trunk/vapi/WebKitGtk.vapi	(original)
+++ trunk/vapi/webkit-1.0.vapi	Fri Feb  8 12:01:30 2008
@@ -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 @@
 		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 @@
 		[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 @@
 		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);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]