diff options
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | doc/reference/tmpl/ephy-embed.sgml | 50 | ||||
| -rw-r--r-- | doc/reference/tmpl/ephy-shell.sgml | 1 | ||||
| -rw-r--r-- | doc/reference/tmpl/epiphany-unused.sgml | 35 |
4 files changed, 57 insertions, 50 deletions
diff --git a/configure.ac b/configure.ac index 6d92db6e4..75a7406f3 100644 --- a/configure.ac +++ b/configure.ac @@ -95,7 +95,7 @@ if test "$enable_maintainer_mode" = "yes"; then fi GLIB_REQUIRED=2.15.2 -GTK_REQUIRED=2.11.6 +GTK_REQUIRED=2.12.0 LIBXML_REQUIRED=2.6.12 LIBXSLT_REQUIRED=1.1.7 LIBGLADE_REQUIRED=2.3.1 @@ -586,17 +586,28 @@ AM_CONDITIONAL([ENABLE_DESKTOP_FILE_PLUGIN],[test "$enable_desktop_file_plugin" AC_MSG_CHECKING([whether to enable zeroconf bookmarks support]) AC_ARG_ENABLE([zeroconf], - AS_HELP_STRING([--disable-zeroconf],[Whether to enable zeroconf bookmarks support (default: enabled)]), - [], [enable_zeroconf=yes]) + AS_HELP_STRING([--disable-zeroconf],[Whether to enable zeroconf bookmarks support (default: autodetect)]), + [], [enable_zeroconf=auto]) AC_MSG_RESULT([$enable_zeroconf]) -if test "$enable_zeroconf" = "yes"; then +if test "$enable_zeroconf" != "no"; then AVAHI_REQUIRED=0.6.22 - PKG_CHECK_MODULES(AVAHI, [avahi-gobject >= $AVAHI_REQUIRED]) + PKG_CHECK_MODULES(AVAHI, [avahi-gobject >= $AVAHI_REQUIRED],[have_avahi=yes],[have_avahi=no]) + + if test "$enable_zeroconf" = "yes" -a "$have_avahi" = "no"; then + AC_MSG_ERROR([zeroconf support was requested but avahi not found]) + elif test "$have_avahi" = "yes"; then + enable_zeroconf=yes + else + enable_zeroconf=no + fi + AC_SUBST(AVAHI_CFLAGS) AC_SUBST(AVAHI_LIBS) +fi +if test "$enable_zeroconf" = "yes"; then AC_DEFINE([ENABLE_ZEROCONF],[1],[Define to enable zeroconf bookmarks support]) fi diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml index e6adebfc8..c6f57ead0 100644 --- a/doc/reference/tmpl/ephy-embed.sgml +++ b/doc/reference/tmpl/ephy-embed.sgml @@ -230,8 +230,6 @@ be done by casting). @: @: @: -@: -@: @: @Param2: @Param3: @@ -301,10 +299,6 @@ be done by casting). @get_location: @get_link_message: @get_js_status: -@shistory_n_items: -@shistory_get_nth: -@shistory_get_pos: -@shistory_go_nth: @shistory_copy: @get_security_level: @show_page_certificate: @@ -335,6 +329,11 @@ be done by casting). @get_is_blank: @get_loading_title: @get_visibility: +@get_backward_history: +@get_forward_history: +@get_next_history_item: +@get_previous_history_item: +@go_to_history_item: <!-- ##### ENUM EphyEmbedChrome ##### --> <para> @@ -474,45 +473,6 @@ windows opened with JavaScript often use a nonstandard chrome. @embed: -<!-- ##### FUNCTION ephy_embed_shistory_n_items ##### --> -<para> - -</para> - -@embed: -@Returns: - - -<!-- ##### FUNCTION ephy_embed_shistory_get_nth ##### --> -<para> - -</para> - -@embed: -@nth: -@is_relative: -@url: -@title: - - -<!-- ##### FUNCTION ephy_embed_shistory_get_pos ##### --> -<para> - -</para> - -@embed: -@Returns: - - -<!-- ##### FUNCTION ephy_embed_shistory_go_nth ##### --> -<para> - -</para> - -@embed: -@nth: - - <!-- ##### FUNCTION ephy_embed_get_security_level ##### --> <para> diff --git a/doc/reference/tmpl/ephy-shell.sgml b/doc/reference/tmpl/ephy-shell.sgml index 845f16428..f50e4bcfa 100644 --- a/doc/reference/tmpl/ephy-shell.sgml +++ b/doc/reference/tmpl/ephy-shell.sgml @@ -39,6 +39,7 @@ ephy-shell @EPHY_NEW_TAB_IN_NEW_WINDOW: @EPHY_NEW_TAB_IN_EXISTING_WINDOW: @EPHY_NEW_TAB_ALLOW_FIXUP: +@EPHY_NEW_TAB_FROM_EXTERNAL: <!-- ##### FUNCTION ephy_shell_new_tab ##### --> <para> diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml index 7c4077a32..c493cdc0c 100644 --- a/doc/reference/tmpl/epiphany-unused.sgml +++ b/doc/reference/tmpl/epiphany-unused.sgml @@ -466,6 +466,41 @@ Represents the state of an #EphyEmbed with regards to networking negotiations. @embed: +<!-- ##### FUNCTION ephy_embed_shistory_get_nth ##### --> +<para> + +</para> + +@embed: +@nth: +@is_relative: +@url: +@title: + +<!-- ##### FUNCTION ephy_embed_shistory_get_pos ##### --> +<para> + +</para> + +@embed: +@Returns: + +<!-- ##### FUNCTION ephy_embed_shistory_go_nth ##### --> +<para> + +</para> + +@embed: +@nth: + +<!-- ##### FUNCTION ephy_embed_shistory_n_items ##### --> +<para> + +</para> + +@embed: +@Returns: + <!-- ##### FUNCTION ephy_embed_single_load_proxy_autoconf ##### --> <para> |