aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--NEWS13
-rw-r--r--configure.in2
-rw-r--r--src/bookmarks/ephy-bookmarks-menu.c4
4 files changed, 30 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b77bef0e7..2e1327870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-08-25 Christian Persch <chpe@cvs.gnome.org>
+
+ === Release 1.3.7 ===
+
+ * src/bookmarks/ephy-bookmarks-menu.c: (open_bookmark_cb),
+ (add_action_for_bookmark):
+
+ Fix crash when opening a bookmark from the menu. Fixes bug #150982.
+
+ * NEWS:
+ * configure.in:
+
+ Version 1.3.7.
+
2004-08-24 Christian Persch <chpe@cvs.gnome.org>
* configure.in:
diff --git a/NEWS b/NEWS
index 1a38021a0..603a540a6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,17 @@
==============
+Epiphany 1.3.7
+==============
+
+Bug fixes
+
+ * Fix crash when loading a bookmark from the menu (Christian) [150982]
+
+Translation updates
+
+ * Francisco Javier F. Serrador (es)
+
+
+==============
Epiphany 1.3.6
==============
diff --git a/configure.in b/configure.in
index 4ce888224..a2df326cd 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([GNOME Web browser], [1.3.6.90],
+AC_INIT([GNOME Web browser], [1.3.7],
[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
GNOME_COMMON_INIT
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index 4134e2c8e..0e06ac199 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -159,7 +159,7 @@ ephy_bookmarks_menu_clean (EphyBookmarksMenu *menu)
static void
open_bookmark_cb (GtkAction *action,
- char *location,
+ const char *location,
EphyBookmarksMenu *menu)
{
ephy_window_load_url (menu->priv->window, location);
@@ -187,7 +187,7 @@ add_action_for_bookmark (EphyBookmarksMenu *menu,
gtk_action_set_accel_path (action, apath);
- g_signal_connect (action, "activate",
+ g_signal_connect (action, "open",
G_CALLBACK (open_bookmark_cb), menu);
gtk_action_group_add_action (menu->priv->bmk_actions, action);