Check all selected nodes if they allow dragging.

2005-07-11  Christian Persch  <chpe@cvs.gnome.org>

	* lib/widgets/ephy-node-view.c: (check_node_is_drag_source),
	(can_drag_selection), (button_release_cb), (motion_notify_cb):

	Check all selected nodes if they allow dragging.

	* src/bookmarks/ephy-bookmarks-editor.c:
	(ephy_bookmarks_editor_update_menu), (key_pressed_cb):

	Don't allow to delete or rename local sites, or to put them
	on the bookmarks bar.

	* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init):

	Fix capitalisation.

1 files changed, 11 insertions, 4 deletions

diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 2049ad0df..860e9da3a 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1255,10 +1255,10 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
 	open_in_tab = (bmk_focus && bmk_selection);
 	rename = (bmk_focus && single_bmk_selected && mutable) ||
 		 (key_selection && key_focus && key_normal);
-	delete = (bmk_focus && bmk_selection) ||
+	delete = (bmk_focus && bmk_selection && mutable) ||
 		 (key_selection && key_focus && key_normal);
 	properties = bmk_focus && single_bmk_selected && mutable;
-	can_show_in_bookmarks_bar = (bmk_focus && single_bmk_selected) ||
+	can_show_in_bookmarks_bar = (bmk_focus && single_bmk_selected && mutable) ||
 		 (key_selection && key_focus);
 
 	action_group = editor->priv->action_group;
@@ -1391,10 +1391,17 @@ key_pressed_cb (EphyNodeView *view,
 		GdkEventKey *event,
 		EphyBookmarksEditor *editor)
 {
+	EphyBookmarksEditorPrivate *priv = editor->priv;
+	GtkAction *action;
+
 	if (event->keyval == GDK_Delete || event->keyval == GDK_KP_Delete)
 	{
-		cmd_delete (NULL, editor);
-		return TRUE;
+		action = gtk_action_group_get_action (priv->action_group, "Delete");
+		if (gtk_action_get_sensitive (action))
+		{
+			cmd_delete (NULL, editor);
+			return TRUE;
+		}
 	} 
 
 	return FALSE;