aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog25
-rw-r--r--NEWS20
-rw-r--r--configure.ac10
-rw-r--r--embed/mozilla/EphyAboutModule.cpp2
-rw-r--r--src/ephy-window.c2
5 files changed, 51 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 7803d7972..99a51e8e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,21 @@
-2006-08-19 Christian Persch <chpe@cvs.gnome.org>
+2006-08-21 Christian Persch <chpe@cvs.gnome.org>
+
+ === Release 2.15.92 ===
+
+ * NEWS:
+ * configure.ac:
+
+ Updated for 2.15.92.
+
+ * embed/mozilla/EphyAboutModule.cpp:
+
+ Use escaped URL for about:recover. Fixes bug #351296.
+
+ * src/ephy-window.c:
+
+ Remove shortcut for SendPage.
+
+2006-08-21 Christian Persch <chpe@cvs.gnome.org>
* data/glade/print.glade:
* embed/mozilla/GeckoPrintService.cpp:
@@ -6,6 +23,12 @@
Don't show the empty window that the print options tab is
taken from, and don't leak the glade object.
+2006-08-21 Christian Persch <chpe@cvs.gnome.org>
+
+ * data/epiphany-pango.schemas:
+
+ Enable pango for Urdu locale.
+
2006-08-19 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/EphyFind.cpp:
diff --git a/NEWS b/NEWS
index 85e857c25..eb6b9b185 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,24 @@
================
+Epiphany 2.15.92
+================
+
+Contributors to this release:
+Kjartan Maraas, Christian Persch, Jean-François Rameau.
+
+Translations updates:
+Rostislav "zbrox" Raykov (bg), Gil Forcada (ca), Hendrik Richter (de),
+Mindu Dorji (dz), Kostas Papadimas (el), Francisco Javier F. Serrador (es),
+Ivar Smolin (et), Ilkka Tuohela (fi), Ankit Patel (gu), Gabor Kelemen (hu),
+Mohammad DAMT (id), Satoru SATOH (ja), Changwoo Ryu (ko),
+Žygimantas Beručka (lt), Jovan Naumovski (mk), Badral (mn),
+Rahul Bhalerao (mr), Kjartan Maraas (nb), Reinout van Schouwen (nl),
+Subhransu Behera (or), Artur Flinta (pl), Nickolay V. Shmyrev (ru),
+Matic Žgur (sl), Daniel Nylander (sv), Theppitak Karoonboonyanan (th),
+Baris Cicek (tr), Maxim Dziumanenko (uk), Clytie Siddall (vi),
+Funda Wang (zh_CN).
+
+
+================
Epiphany 2.15.91
================
diff --git a/configure.ac b/configure.ac
index a94ced089..28a8df3c9 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.91.90],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[2.15.92],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
GNOME_COMMON_INIT
@@ -74,14 +74,14 @@ if test "x$enable_maintainer_mode" = "xyes"; then
MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth $MOZILLA_WARN_CXXFLAGS"
fi
-GLIB_REQUIRED=2.10.1
-GTK_REQUIRED=2.9.3
+GLIB_REQUIRED=2.12.0
+GTK_REQUIRED=2.10.0
LIBXML_REQUIRED=2.6.12
LIBXSLT_REQUIRED=1.1.7
LIBGLADE_REQUIRED=2.3.1
LIBGNOMEVFS_REQUIRED=2.9.2
-LIBGNOME_REQUIRED=2.10.0
-LIBGNOMEUI_REQUIRED=2.6.0
+LIBGNOME_REQUIRED=2.14.0
+LIBGNOMEUI_REQUIRED=2.14.0
GNOME_DESKTOP_REQUIRED=2.9.91
LIBSTARTUP_NOTIFICATION_REQUIRED=0.5
DBUS_GLIB_REQUIRED=0.35
diff --git a/embed/mozilla/EphyAboutModule.cpp b/embed/mozilla/EphyAboutModule.cpp
index 92bc975f4..ebc40f8f5 100644
--- a/embed/mozilla/EphyAboutModule.cpp
+++ b/embed/mozilla/EphyAboutModule.cpp
@@ -536,7 +536,7 @@ EphyAboutModule::CreateRecoverPage(nsIURI *aRecoverURI,
char *secondary = g_strdup_printf
(_("The page “%s” in this tab was not fully loaded yet when "
"the web browser crashed; it could have caused the crash."),
- url.get());
+ rawurl.get());
nsCOMPtr<nsIChannel> channel;
rv = WritePage (aRecoverURI, uri, uri, rawurl, title.get(),
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 5f11553aa..21e4f7f7e 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -147,7 +147,7 @@ static const GtkActionEntry ephy_menu_entries [] = {
{ "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "<control>P",
N_("Print the current page"),
G_CALLBACK (window_cmd_file_print) },
- { "FileSendTo", STOCK_SEND_MAIL, N_("S_end Link by Email..."), "<control>M",
+ { "FileSendTo", STOCK_SEND_MAIL, N_("S_end Link by Email..."), NULL,
N_("Send a link of the current page"),
G_CALLBACK (window_cmd_file_send_to) },
{ "FileCloseTab", GTK_STOCK_CLOSE, N_("_Close"), "<control>W",