diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | doc/reference/tmpl/ephy-embed-persist.sgml | 1 | ||||
| -rw-r--r-- | doc/reference/tmpl/ephy-embed.sgml | 19 | ||||
| -rw-r--r-- | doc/reference/tmpl/ephy-extensions-manager.sgml | 32 | ||||
| -rw-r--r-- | doc/reference/tmpl/ephy-window.sgml | 5 | ||||
| -rw-r--r-- | doc/reference/tmpl/epiphany-unused.sgml | 24 |
7 files changed, 73 insertions, 31 deletions
@@ -1,5 +1,19 @@ 2004-11-01 Christian Persch <chpe@cvs.gnome.org> + * configure.ac: + + Bump version number and fix aclocal flags. + + * doc/reference/tmpl/ephy-embed-persist.sgml: + * doc/reference/tmpl/ephy-embed.sgml: + * doc/reference/tmpl/ephy-extensions-manager.sgml: + * doc/reference/tmpl/ephy-window.sgml: + * doc/reference/tmpl/epiphany-unused.sgml: + + Update. + +2004-11-01 Christian Persch <chpe@cvs.gnome.org> + * src/bookmarks/ephy-bookmark-action.c: (properties_activate_cb), (bookmark_destroy_cb), (ephy_bookmark_action_finalize): * src/bookmarks/ephy-bookmark-properties.c: diff --git a/configure.ac b/configure.ac index 3bbbf53e4..0c40f15d2 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ dnl You should have received a copy of the GNU General Public License along dnl with this program; if not, write to the Free Software Foundation, Inc., dnl 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -AC_INIT([GNOME Web Browser],[1.5.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) +AC_INIT([GNOME Web Browser],[1.5.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) GNOME_COMMON_INIT @@ -29,12 +29,15 @@ AC_SUBST([EPIPHANY_MAJOR]) AM_INIT_AUTOMAKE([dist-bzip2 check-news]) +dnl AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \${ACLOCAL_FLAGS}"]) +AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"]) + AM_MAINTAINER_MODE AC_PROG_INTLTOOL([0.29]) -GLIB_REQUIRED=2.5.5 -PANGO_REQUIRED=1.5.1 +GLIB_REQUIRED=2.5.4 +PANGO_REQUIRED=1.6.0 GTK_REQUIRED=2.5.4 LIBXML_REQUIRED=2.6.12 LIBGNOMEVFS_REQUIRED=2.3.1 diff --git a/doc/reference/tmpl/ephy-embed-persist.sgml b/doc/reference/tmpl/ephy-embed-persist.sgml index f16d3be1b..36eb73882 100644 --- a/doc/reference/tmpl/ephy-embed-persist.sgml +++ b/doc/reference/tmpl/ephy-embed-persist.sgml @@ -81,6 +81,7 @@ Determines how the #EphyEmbedPersist should act. ephy_embed_persist_save() if this is the case. If unset, use the destination specified with ephy_embed_persist_set_dest(). +@EMBED_PERSIST_DO_CONVERSION: <!-- ##### FUNCTION ephy_embed_persist_set_dest ##### --> <para> diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml index da9a9e933..aa6ecd5ce 100644 --- a/doc/reference/tmpl/ephy-embed.sgml +++ b/doc/reference/tmpl/ephy-embed.sgml @@ -93,6 +93,21 @@ be done by casting). @ephyembed: the object which received the signal. @arg1: +<!-- ##### SIGNAL EphyEmbed::ge-modal-alert ##### --> +<para> + +</para> + +@ephyembed: the object which received the signal. +@Returns: + +<!-- ##### SIGNAL EphyEmbed::ge-modal-alert-closed ##### --> +<para> + +</para> + +@ephyembed: the object which received the signal. + <!-- ##### SIGNAL EphyEmbed::ge-net-state ##### --> <para> @@ -154,6 +169,8 @@ be done by casting). @: @: @: +@: +@: @: <!-- ##### SIGNAL EphyEmbed::ge-security-change ##### --> @@ -189,6 +206,8 @@ be done by casting). @security_change: @zoom_change: @content_change: +@modal_alert: +@modal_alert_closed: @load_url: @stop_load: @reload: diff --git a/doc/reference/tmpl/ephy-extensions-manager.sgml b/doc/reference/tmpl/ephy-extensions-manager.sgml index 418123132..557929f8b 100644 --- a/doc/reference/tmpl/ephy-extensions-manager.sgml +++ b/doc/reference/tmpl/ephy-extensions-manager.sgml @@ -14,22 +14,15 @@ EphyExtensionsManager </para> -<!-- ##### FUNCTION ephy_extensions_manager_new ##### --> -<para> - -</para> - -@Returns: - - <!-- ##### FUNCTION ephy_extensions_manager_load ##### --> <para> </para> @manager: -@filename: +@identifier: <!-- # Unused Parameters # --> +@filename: @Returns: @@ -39,25 +32,8 @@ EphyExtensionsManager </para> @manager: +@identifier: +<!-- # Unused Parameters # --> @filename: -<!-- ##### FUNCTION ephy_extensions_manager_load_dir ##### --> -<para> - -</para> - -@manager: -@path: - - -<!-- ##### FUNCTION ephy_extensions_manager_add ##### --> -<para> - -</para> - -@manager: -@type: -@Returns: - - diff --git a/doc/reference/tmpl/ephy-window.sgml b/doc/reference/tmpl/ephy-window.sgml index 218477bd6..9f9b902f6 100644 --- a/doc/reference/tmpl/ephy-window.sgml +++ b/doc/reference/tmpl/ephy-window.sgml @@ -44,6 +44,11 @@ These are restricted to ephy_window_set_zoom() and ephy_window_load_url(). </para> +<!-- ##### ARG EphyWindow:print-preview-mode ##### --> +<para> + +</para> + <!-- ##### FUNCTION ephy_window_new ##### --> <para> diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml index 1dfbb6967..148d731f4 100644 --- a/doc/reference/tmpl/epiphany-unused.sgml +++ b/doc/reference/tmpl/epiphany-unused.sgml @@ -145,6 +145,30 @@ mozilla-embed-event @url: @shell: +<!-- ##### FUNCTION ephy_extensions_manager_add ##### --> +<para> + +</para> + +@manager: +@type: +@Returns: + +<!-- ##### FUNCTION ephy_extensions_manager_load_dir ##### --> +<para> + +</para> + +@manager: +@path: + +<!-- ##### FUNCTION ephy_extensions_manager_new ##### --> +<para> + +</para> + +@Returns: + <!-- ##### FUNCTION ephy_shell_delete_on_exit ##### --> <para> |