Release 2.21.4.RELEASE_2_21_4

svn path=/trunk/; revision=7776

9 files changed, 344 insertions, 153 deletions

diff --git a/configure.ac b/configure.ac
index 67c1323a8..96790e160 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 
 m4_define([epiphany_version_major],[2])
 m4_define([epiphany_version_minor],[21])
-m4_define([epiphany_version_micro],[1])
+m4_define([epiphany_version_micro],[4])
 m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro])
 
 # This can be either "trunk" or "branches/gnome-x-y"
diff --git a/doc/reference/epiphany-sections.txt b/doc/reference/epiphany-sections.txt
index 5945524ce..093d2da20 100644
--- a/doc/reference/epiphany-sections.txt
+++ b/doc/reference/epiphany-sections.txt
@@ -54,32 +54,6 @@ EPHY_WINDOW_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>ephy-tab</FILE>
-<TITLE>EphyTab</TITLE>
-EphyTab
-ephy_tab_new
-ephy_tab_get_embed
-ephy_tab_for_embed
-ephy_tab_get_icon_address
-ephy_tab_get_location
-ephy_tab_get_security_level
-ephy_tab_get_title
-ephy_tab_get_zoom
-ephy_tab_get_load_status
-ephy_tab_get_load_percent
-ephy_tab_get_link_message
-ephy_tab_get_status_message
-<SUBSECTION Standard>
-EPHY_TAB
-EPHY_IS_TAB
-EPHY_TYPE_TAB
-ephy_tab_get_type
-EPHY_TAB_CLASS
-EPHY_IS_TAB_CLASS
-EPHY_TAB_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>ephy-embed</FILE>
 <TITLE>EphyEmbed</TITLE>
 EphyEmbed
diff --git a/doc/reference/epiphany.types b/doc/reference/epiphany.types
index 3212a4fcd..32f447c4c 100644
--- a/doc/reference/epiphany.types
+++ b/doc/reference/epiphany.types
@@ -43,11 +43,9 @@ mozilla_embed_get_type
 mozilla_embed_persist_get_type
 
 #include <ephy-window.h>
-#include <ephy-tab.h>
 #include <ephy-shell.h>
 #include <ephy-session.h>
 
 ephy_window_get_type
-ephy_tab_get_type
 ephy_shell_get_type
 ephy_session_get_type
diff --git a/doc/reference/tmpl/EphySingle.sgml b/doc/reference/tmpl/EphySingle.sgml
index 46149ea22..c0bacd02a 100644
--- a/doc/reference/tmpl/EphySingle.sgml
+++ b/doc/reference/tmpl/EphySingle.sgml
@@ -22,6 +22,7 @@ EphySingle
 
 </para>
 
+@aOwningWidget: 
 @Returns: 
 
 
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index 8e9e66c3e..e6adebfc8 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -69,14 +69,6 @@ be done by casting).
 @ephyembed: the object which received the signal.
 @arg1: 
 
-<!-- ##### SIGNAL EphyEmbed::ge-content-change ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-
 <!-- ##### SIGNAL EphyEmbed::ge-context-menu ##### -->
 <para>
 
@@ -130,14 +122,6 @@ be done by casting).
 @arg2: 
 @arg3: 
 
-<!-- ##### SIGNAL EphyEmbed::ge-location ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-
 <!-- ##### SIGNAL EphyEmbed::ge-modal-alert ##### -->
 <para>
 
@@ -153,15 +137,6 @@ be done by casting).
 
 @ephyembed: the object which received the signal.
 
-<!-- ##### SIGNAL EphyEmbed::ge-net-state ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-@arg2: 
-
 <!-- ##### SIGNAL EphyEmbed::ge-new-window ##### -->
 <para>
 
@@ -257,7 +232,6 @@ be done by casting).
 @: 
 @: 
 @: 
-@: 
 @:
 @Param2: 
 @Param3: 
@@ -282,14 +256,6 @@ be done by casting).
 @arg2: 
 @arg3: 
 
-<!-- ##### SIGNAL EphyEmbed::ge-security-change ##### -->
-<para>
-
-</para>
-
-@ephyembed: the object which received the signal.
-@arg1: 
-
 <!-- ##### SIGNAL EphyEmbed::ge-zoom-change ##### -->
 <para>
 
@@ -308,15 +274,11 @@ be done by casting).
 @favicon: 
 @feed_link: 
 @search_link: 
-@location: 
-@net_state: 
 @dom_mouse_click: 
 @dom_mouse_down: 
 @dom_content_loaded: 
 @popup_blocked: 
-@security_change: 
 @zoom_change: 
-@content_change: 
 @content_blocked: 
 @modal_alert: 
 @modal_alert_closed: 
@@ -360,6 +322,19 @@ be done by casting).
 @print_preview_navigate: 
 @has_modified_forms: 
 @close: 
+@get_document_type: 
+@get_load_percent: 
+@get_load_status: 
+@get_navigation_flags: 
+@get_typed_address: 
+@set_typed_address: 
+@get_address: 
+@get_status_message: 
+@get_icon: 
+@get_icon_address: 
+@get_is_blank: 
+@get_loading_title: 
+@get_visibility: 
 
 <!-- ##### ENUM EphyEmbedChrome ##### -->
 <para>
diff --git a/doc/reference/tmpl/ephy-shell.sgml b/doc/reference/tmpl/ephy-shell.sgml
index 81cf01eb2..845f16428 100644
--- a/doc/reference/tmpl/ephy-shell.sgml
+++ b/doc/reference/tmpl/ephy-shell.sgml
@@ -47,7 +47,7 @@ ephy-shell
 
 @shell: 
 @parent_window: 
-@previous_tab: 
+@previous_embed: 
 @url: 
 @flags: 
 @Returns: 
diff --git a/doc/reference/tmpl/ephy-window.sgml b/doc/reference/tmpl/ephy-window.sgml
index e69a61587..23c9b1e2d 100644
--- a/doc/reference/tmpl/ephy-window.sgml
+++ b/doc/reference/tmpl/ephy-window.sgml
@@ -37,26 +37,6 @@ These are restricted to ephy_window_set_zoom() and ephy_window_load_url().
 </para>
 
 
-<!-- ##### ARG EphyWindow:active-tab ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG EphyWindow:chrome ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG EphyWindow:is-popup ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG EphyWindow:print-preview-mode ##### -->
-<para>
-
-</para>
-
 <!-- ##### FUNCTION ephy_window_new ##### -->
 <para>
 
@@ -84,62 +64,6 @@ These are restricted to ephy_window_set_zoom() and ephy_window_load_url().
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_window_add_tab ##### -->
-<para>
-
-</para>
-
-@window: 
-@tab: 
-@position: 
-@jump_to: 
-
-
-<!-- ##### FUNCTION ephy_window_remove_tab ##### -->
-<para>
-
-</para>
-
-@window: 
-@tab: 
-
-
-<!-- ##### FUNCTION ephy_window_jump_to_tab ##### -->
-<para>
-
-</para>
-
-@window: 
-@tab: 
-
-
-<!-- ##### FUNCTION ephy_window_get_tabs ##### -->
-<para>
-
-</para>
-
-@window: 
-@Returns: 
-
-
-<!-- ##### FUNCTION ephy_window_get_active_tab ##### -->
-<para>
-
-</para>
-
-@window: 
-@Returns: 
-
-
-<!-- ##### FUNCTION ephy_window_get_active_embed ##### -->
-<para>
-
-</para>
-
-@window: 
-@Returns: 
-
-
 <!-- ##### FUNCTION ephy_window_get_toolbar ##### -->
 <para>
 
@@ -158,15 +82,6 @@ These are restricted to ephy_window_set_zoom() and ephy_window_load_url().
 @Returns: 
 
 
-<!-- ##### FUNCTION ephy_window_set_print_preview ##### -->
-<para>
-
-</para>
-
-@window: 
-@enabled: 
-
-
 <!-- ##### FUNCTION ephy_window_set_zoom ##### -->
 <para>
 
diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml
index bac7bd654..7c4077a32 100644
--- a/doc/reference/tmpl/epiphany-unused.sgml
+++ b/doc/reference/tmpl/epiphany-unused.sgml
@@ -1,3 +1,31 @@
+<!-- ##### SECTION ./tmpl/ephy-tab.sgml:Long_Description ##### -->
+<para>
+Each #EphyWindow contains a #GtkNotebook which holds one or more #EphyTab:s.
+An #EphyTab is basically a container for an #EphyEmbed.
+</para>
+<para>
+To retrieve an #EphyTab's parent #EphyWindow, use gtk_widget_get_toplevel().
+</para>
+
+
+<!-- ##### SECTION ./tmpl/ephy-tab.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/ephy-tab.sgml:Short_Description ##### -->
+Represents an Epiphany tab
+
+
+<!-- ##### SECTION ./tmpl/ephy-tab.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/ephy-tab.sgml:Title ##### -->
+EphyTab
+
+
 <!-- ##### SECTION ./tmpl/epiphany-unused.sgml:Stability_Level ##### -->
 
 
@@ -151,6 +179,39 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 @EPHY_COOKIE_P3P_STATE_FLAGGED: 
 @EPHY_COOKIE_P3P_STATE_REJECTED: 
 
+<!-- ##### SIGNAL EphyEmbed::ge-content-change ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL EphyEmbed::ge-location ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+
+<!-- ##### SIGNAL EphyEmbed::ge-net-state ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+@arg2: 
+
+<!-- ##### SIGNAL EphyEmbed::ge-security-change ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+
 <!-- ##### SIGNAL EphyEmbedPersist::cancelled ##### -->
 <para>
 
@@ -235,18 +296,138 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 @EPHY_SHELL_STARTUP_IMPORT_BOOKMARKS: 
 @EPHY_SHELL_STARTUP_ADD_BOOKMARK: 
 
+<!-- ##### STRUCT EphyTab ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:address ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ARG EphyTab:blocked-popup-count ##### -->
 <para>
 
 </para>
 
 
+<!-- ##### ARG EphyTab:document-type ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:hidden-popup-count ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:icon ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:icon-address ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:load-progress ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:load-status ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:message ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:navigation ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:popups-allowed ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:security-level ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:title ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:typed-address ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyTab:visibility ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ARG EphyTab:visible ##### -->
 <para>
 
 </para>
 
 
+<!-- ##### ARG EphyTab:zoom ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyWindow:active-tab ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyWindow:chrome ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyWindow:is-popup ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### ARG EphyWindow:print-preview-mode ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### FUNCTION ephy_embed_activate ##### -->
 <para>
 
@@ -478,6 +659,54 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 @Returns: 
 @startup_id: 
 
+<!-- ##### FUNCTION ephy_tab_for_embed ##### -->
+<para>
+
+</para>
+
+@embed: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_tab_get_embed ##### -->
+<para>
+
+</para>
+
+@tab: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_tab_get_icon_address ##### -->
+<para>
+
+</para>
+
+@tab: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_tab_get_link_message ##### -->
+<para>
+
+</para>
+
+@tab: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_tab_get_load_percent ##### -->
+<para>
+
+</para>
+
+@tab: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_tab_get_load_status ##### -->
+<para>
+
+</para>
+
+@tab: 
+@Returns: 
+
 <!-- ##### FUNCTION ephy_tab_get_location ##### -->
 <para>
 
@@ -486,6 +715,30 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 @tab: 
 @Returns: 
 
+<!-- ##### FUNCTION ephy_tab_get_security_level ##### -->
+<para>
+
+</para>
+
+@tab: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_tab_get_status_message ##### -->
+<para>
+
+</para>
+
+@tab: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_tab_get_title ##### -->
+<para>
+
+</para>
+
+@tab: 
+@Returns: 
+
 <!-- ##### FUNCTION ephy_tab_get_window ##### -->
 <para>
 
@@ -494,6 +747,31 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 @tab: 
 @Returns: 
 
+<!-- ##### FUNCTION ephy_tab_get_zoom ##### -->
+<para>
+
+</para>
+
+@tab: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_tab_new ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+<!-- ##### FUNCTION ephy_window_add_tab ##### -->
+<para>
+
+</para>
+
+@window: 
+@tab: 
+@position: 
+@jump_to: 
+
 <!-- ##### FUNCTION ephy_window_find ##### -->
 <para>
 
@@ -501,6 +779,38 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 
 @window: 
 
+<!-- ##### FUNCTION ephy_window_get_active_embed ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_window_get_active_tab ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_window_get_tabs ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
+<!-- ##### FUNCTION ephy_window_jump_to_tab ##### -->
+<para>
+
+</para>
+
+@window: 
+@tab: 
+
 <!-- ##### FUNCTION ephy_window_print ##### -->
 <para>
 
@@ -508,6 +818,22 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 
 @window: 
 
+<!-- ##### FUNCTION ephy_window_remove_tab ##### -->
+<para>
+
+</para>
+
+@window: 
+@tab: 
+
+<!-- ##### FUNCTION ephy_window_set_print_preview ##### -->
+<para>
+
+</para>
+
+@window: 
+@enabled: 
+
 <!-- ##### FUNCTION mozilla_embed_event_new ##### -->
 <para>
 
diff --git a/embed/xulrunner/Makefile.am b/embed/xulrunner/Makefile.am
index 3392b8e96..86f3d8372 100644
--- a/embed/xulrunner/Makefile.am
+++ b/embed/xulrunner/Makefile.am
@@ -1,6 +1,8 @@
 SUBDIRS = utils src embed components data bindings
 # SUBDIRS += tests
 
+DIST_SUBDIRS =  utils src embed components data bindings tests
+
 NULL =
 
 EXTRA_DIST =			\