aboutsummaryrefslogtreecommitdiffstats
path: root/doc/reference
diff options
context:
space:
mode:
authorAdam Hooper <adamh@src.gnome.org>2004-07-01 09:47:17 +0800
committerAdam Hooper <adamh@src.gnome.org>2004-07-01 09:47:17 +0800
commitbbd9d6551d3f84f4cc7afa5ef4c21dfadceb668d (patch)
treed368c9eec18379a062af184d89b064517273c558 /doc/reference
parent61533f01f0f6df3b9dafc18d1567507830db0752 (diff)
downloadgsoc2013-epiphany-bbd9d6551d3f84f4cc7afa5ef4c21dfadceb668d.tar.gz
gsoc2013-epiphany-bbd9d6551d3f84f4cc7afa5ef4c21dfadceb668d.tar.zst
gsoc2013-epiphany-bbd9d6551d3f84f4cc7afa5ef4c21dfadceb668d.zip
Popup blocking support. View -> Popup Windows.
Diffstat (limited to 'doc/reference')
-rw-r--r--doc/reference/Makefile.am1
-rw-r--r--doc/reference/epiphany-sections.txt1
-rw-r--r--doc/reference/tmpl/ephy-embed-single.sgml11
-rw-r--r--doc/reference/tmpl/ephy-embed.sgml46
-rw-r--r--doc/reference/tmpl/ephy-permission-manager.sgml2
-rw-r--r--doc/reference/tmpl/ephy-shell.sgml1
-rw-r--r--doc/reference/tmpl/ephy-tab.sgml10
-rw-r--r--doc/reference/tmpl/epiphany-unused.sgml18
8 files changed, 69 insertions, 21 deletions
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 33da0122c..0915791a3 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -159,6 +159,7 @@ GTKDOC_CFLAGS = -I$(top_srcdir)/src \
-I$(top_srcdir)/embed \
-I$(top_srcdir)/embed/mozilla \
-I$(top_srcdir)/src/bookmarks \
+ -I$(top_srcdir)/lib/egg \
$(EPIPHANY_DEPENDENCY_CFLAGS)
GTKDOC_LIBS = \
diff --git a/doc/reference/epiphany-sections.txt b/doc/reference/epiphany-sections.txt
index 8d5750e4b..94f6edfa3 100644
--- a/doc/reference/epiphany-sections.txt
+++ b/doc/reference/epiphany-sections.txt
@@ -140,6 +140,7 @@ ephy_embed_single_clear_auth_cache
ephy_embed_single_set_offline_mode
ephy_embed_single_load_proxy_autoconf
ephy_embed_single_get_font_list
+ephy_embed_single_open_window
<SUBSECTION Standard>
EPHY_EMBED_SINGLE
EPHY_IS_EMBED_SINGLE
diff --git a/doc/reference/tmpl/ephy-embed-single.sgml b/doc/reference/tmpl/ephy-embed-single.sgml
index 3368ee788..ed0f624b1 100644
--- a/doc/reference/tmpl/ephy-embed-single.sgml
+++ b/doc/reference/tmpl/ephy-embed-single.sgml
@@ -90,3 +90,14 @@ is used to perform browser-related actions which do not refer to an individual
@langGroup:
+<!-- ##### FUNCTION ephy_embed_single_open_window ##### -->
+<para>
+
+</para>
+
+@single:
+@parent:
+@address:
+@features:
+
+
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index 92c329f48..618b13006 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -42,6 +42,14 @@ be done by casting).
</para>
+<!-- ##### SIGNAL EphyEmbed::ge-content-change ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1:
+
<!-- ##### SIGNAL EphyEmbed::ge-context-menu ##### -->
<para>
@@ -103,6 +111,21 @@ be done by casting).
@arg1:
@arg2:
+<!-- ##### SIGNAL EphyEmbed::ge-popup-blocked ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@:
+@:
+@:
+@:
+@:
+@:
+@:
+@:
+
<!-- ##### SIGNAL EphyEmbed::ge-security-change ##### -->
<para>
@@ -135,6 +158,7 @@ be done by casting).
@popup_blocked:
@security_change:
@zoom_change:
+@content_change:
@load_url:
@stop_load:
@reload:
@@ -162,7 +186,7 @@ be done by casting).
@has_automatic_encoding:
@set_encoding:
@print:
-@print_preview_close:
+@set_print_preview_mode:
@print_preview_n_pages:
@print_preview_navigate:
@activate:
@@ -199,14 +223,6 @@ windows opened with JavaScript often use a nonstandard chrome.
to display its statusbar.
@EPHY_EMBED_CHROME_BOOKMARKSBAR:
-<!-- ##### ENUM EmbedReloadFlags ##### -->
-<para>
-
-</para>
-
-@EMBED_RELOAD_NORMAL:
-@EMBED_RELOAD_FORCE: Bypass cache and proxy while reloading a web page
-
<!-- ##### ENUM EmbedPrintPreviewNavType ##### -->
<para>
Specifies the action to perform in ephy_embed_print_preview_navigate().
@@ -254,6 +270,8 @@ invalid SSL certificate will have an #EmbedSecurityLevel of %STATE_IS_BROKEN.
</para>
@embed:
+@force:
+<!-- # Unused Parameters # -->
@flags:
@@ -410,6 +428,7 @@ invalid SSL certificate will have an #EmbedSecurityLevel of %STATE_IS_BROKEN.
@embed:
@zoom:
+<!-- # Unused Parameters # -->
@reflow:
@@ -458,17 +477,10 @@ invalid SSL certificate will have an #EmbedSecurityLevel of %STATE_IS_BROKEN.
</para>
@embed:
+<!-- # Unused Parameters # -->
@info:
-<!-- ##### FUNCTION ephy_embed_print_preview_close ##### -->
-<para>
-
-</para>
-
-@embed:
-
-
<!-- ##### FUNCTION ephy_embed_print_preview_n_pages ##### -->
<para>
diff --git a/doc/reference/tmpl/ephy-permission-manager.sgml b/doc/reference/tmpl/ephy-permission-manager.sgml
index 93abf486c..c03dc1efa 100644
--- a/doc/reference/tmpl/ephy-permission-manager.sgml
+++ b/doc/reference/tmpl/ephy-permission-manager.sgml
@@ -49,7 +49,7 @@ Details a specific permission of a specific website.
</para>
@host: The hostname of the website to which this permission applies.
-@type: An #EphyPermissionType.
+@qtype:
@permission: An #EphyPermission (either allow or deny).
<!-- ##### ENUM EphyPermission ##### -->
diff --git a/doc/reference/tmpl/ephy-shell.sgml b/doc/reference/tmpl/ephy-shell.sgml
index aa85f4812..6c9e8b68d 100644
--- a/doc/reference/tmpl/ephy-shell.sgml
+++ b/doc/reference/tmpl/ephy-shell.sgml
@@ -59,7 +59,6 @@ ephy-shell
@EPHY_NEW_TAB_NEW_PAGE:
@EPHY_NEW_TAB_OPEN_PAGE:
@EPHY_NEW_TAB_FULLSCREEN_MODE:
-@EPHY_NEW_TAB_APPEND_GROUPED:
@EPHY_NEW_TAB_APPEND_LAST:
@EPHY_NEW_TAB_APPEND_AFTER:
@EPHY_NEW_TAB_JUMP:
diff --git a/doc/reference/tmpl/ephy-tab.sgml b/doc/reference/tmpl/ephy-tab.sgml
index aa6599bfa..2ef0a5ade 100644
--- a/doc/reference/tmpl/ephy-tab.sgml
+++ b/doc/reference/tmpl/ephy-tab.sgml
@@ -29,6 +29,11 @@ To retrieve an #EphyTab's parent #EphyWindow, use gtk_widget_get_toplevel().
</para>
+<!-- ##### ARG EphyTab:hidden-popup-count ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG EphyTab:icon ##### -->
<para>
@@ -54,6 +59,11 @@ To retrieve an #EphyTab's parent #EphyWindow, use gtk_widget_get_toplevel().
</para>
+<!-- ##### ARG EphyTab:popups-allowed ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG EphyTab:security-level ##### -->
<para>
diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml
index 548bd69cf..142307092 100644
--- a/doc/reference/tmpl/epiphany-unused.sgml
+++ b/doc/reference/tmpl/epiphany-unused.sgml
@@ -38,12 +38,13 @@ mozilla-embed-event
</para>
-<!-- ##### SIGNAL EphyEmbed::ge-popup-blocked ##### -->
+<!-- ##### ENUM EmbedReloadFlags ##### -->
<para>
</para>
-@ephyembed: the object which received the signal.
+@EMBED_RELOAD_NORMAL:
+@EMBED_RELOAD_FORCE: Bypass cache and proxy while reloading a web page
<!-- ##### SIGNAL EphyEmbedPersist::cancelled ##### -->
<para>
@@ -107,6 +108,12 @@ mozilla-embed-event
</para>
+<!-- ##### ARG EphyTab:blocked-popup-count ##### -->
+<para>
+
+</para>
+
+
<!-- ##### FUNCTION ephy_embed_get_encoding_info ##### -->
<para>
@@ -122,6 +129,13 @@ mozilla-embed-event
@Returns:
+<!-- ##### FUNCTION ephy_embed_print_preview_close ##### -->
+<para>
+
+</para>
+
+@embed:
+
<!-- ##### FUNCTION ephy_shell_delete_on_exit ##### -->
<para>