epiphany r7866 - in trunk: . doc/reference/tmpl

[chpe svn gnome org]

Author: chpe
Date: Mon Jan 14 23:30:54 2008
New Revision: 7866
URL: http://svn.gnome.org/viewvc/epiphany?rev=7866&view=rev

Log:
Release 2.21.5

Modified:
   trunk/configure.ac
   trunk/doc/reference/tmpl/ephy-embed.sgml
   trunk/doc/reference/tmpl/ephy-shell.sgml
   trunk/doc/reference/tmpl/epiphany-unused.sgml

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jan 14 23:30:54 2008
@@ -95,7 +95,7 @@
 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 @@
 
 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
 

Modified: trunk/doc/reference/tmpl/ephy-embed.sgml
==============================================================================
--- trunk/doc/reference/tmpl/ephy-embed.sgml	(original)
+++ trunk/doc/reference/tmpl/ephy-embed.sgml	Mon Jan 14 23:30:54 2008
@@ -230,8 +230,6 @@
 @: 
 @: 
 @: 
-@: 
-@: 
 @:
 @Param2: 
 @Param3: 
@@ -301,10 +299,6 @@
 @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 @@
 @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 @@
 @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>
 

Modified: trunk/doc/reference/tmpl/ephy-shell.sgml
==============================================================================
--- trunk/doc/reference/tmpl/ephy-shell.sgml	(original)
+++ trunk/doc/reference/tmpl/ephy-shell.sgml	Mon Jan 14 23:30:54 2008
@@ -39,6 +39,7 @@
 @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>

Modified: trunk/doc/reference/tmpl/epiphany-unused.sgml
==============================================================================
--- trunk/doc/reference/tmpl/epiphany-unused.sgml	(original)
+++ trunk/doc/reference/tmpl/epiphany-unused.sgml	Mon Jan 14 23:30:54 2008
@@ -466,6 +466,41 @@
 
 @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>