aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c7
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e7026611c..ba2389105 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-07 James Willcox <jwillcox@gnome.org>
+
+ * src/bookmarks/ephy-bookmarks-editor.c:
+ (ephy_bookmarks_editor_dispose):
+
+ Make the bookmarks editor not crash-on-close if no keyword is selected.
+
2003-02-07 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/egg/eggtoolbar.c: (egg_toolbar_init):
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 22d6452a4..1a145188e 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -139,6 +139,13 @@ ephy_bookmarks_editor_dispose (GObject *object)
if (editor->priv->key_view != NULL)
{
selection = ephy_node_view_get_selection (editor->priv->key_view);
+ if (selection == NULL || selection->data == NULL)
+ {
+ editor->priv->key_view = NULL;
+ G_OBJECT_CLASS (parent_class)->dispose (object);
+ return;
+ }
+
selected_id = ephy_node_get_id (EPHY_NODE (selection->data));
if (selected_id > 0)
{