aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
-rw-r--r--doc/reference/tmpl/ephy-embed.sgml3
-rw-r--r--doc/reference/tmpl/ephy-shell.sgml9
-rw-r--r--doc/reference/tmpl/epiphany-unused.sgml8
-rw-r--r--embed/mozilla/Makefile.am2
6 files changed, 19 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 2eb5cd717..64c97ae31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-07-10 Christian Persch <chpe@cvs.gnome.org>
+ === Release 2.15.4 ===
+
+ * configure.ac:
+
+2006-07-10 Christian Persch <chpe@cvs.gnome.org>
+
* lib/widgets/ephy-node-view.c:
(ephy_node_view_selection_changed_cb), (ephy_node_view_remove):
diff --git a/configure.ac b/configure.ac
index 2e9913adb..30f13257c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-AC_INIT([GNOME Web Browser],[2.15.3.90],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[2.15.4],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
GNOME_COMMON_INIT
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index f965cc0db..bc35ef98e 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -332,6 +332,9 @@ be done by casting).
@:
@:
@:
+@:
+@:
+@:
@:
<!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### -->
diff --git a/doc/reference/tmpl/ephy-shell.sgml b/doc/reference/tmpl/ephy-shell.sgml
index 824e0627d..147153966 100644
--- a/doc/reference/tmpl/ephy-shell.sgml
+++ b/doc/reference/tmpl/ephy-shell.sgml
@@ -125,12 +125,3 @@ ephy-shell
@Returns:
-<!-- ##### FUNCTION ephy_shell_get_print_setup_dialog ##### -->
-<para>
-
-</para>
-
-@shell:
-@Returns:
-
-
diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml
index cee98c591..bac7bd654 100644
--- a/doc/reference/tmpl/epiphany-unused.sgml
+++ b/doc/reference/tmpl/epiphany-unused.sgml
@@ -449,6 +449,14 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
@shell:
@Returns:
+<!-- ##### FUNCTION ephy_shell_get_print_setup_dialog ##### -->
+<para>
+
+</para>
+
+@shell:
+@Returns:
+
<!-- ##### FUNCTION ephy_shell_new ##### -->
<para>
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index 38b58fd0d..9dbf40c08 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -38,7 +38,7 @@ libephymozillaembed_la_SOURCES = \
GeckoPrintService.cpp \
GeckoPrintService.h \
GeckoPrintSession.cpp \
- GeckoPrintSession.has \
+ GeckoPrintSession.h \
GlobalHistory.cpp \
GlobalHistory.h \
MozDownload.cpp \