[nautilus-actions] Remove nact_imenubar_on_delete_key_pressed() function

[Pierre Wieser <pwieser src gnome org>]

commit 5fbb0dc4700ae67a220cfd7083dd71afb94b0f5a
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sun Aug 23 22:46:01 2009 +0200

    Remove nact_imenubar_on_delete_key_pressed() function

 ChangeLog                   |    4 ++++
 src/nact/nact-imenubar.c    |   20 +-------------------
 src/nact/nact-imenubar.h    |    1 -
 src/nact/nact-main-window.c |   14 +-------------
 4 files changed, 6 insertions(+), 33 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e20e894..065b7a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,10 @@
 	Rewrite save function to allow saving all modified actions in one pass.
 	Take advantage of na_ipivot_consumer_delay_notify().
 	Use UI Manager, thus removing all helper functions.
+	Remove nact_imenubar_on_delete_key_pressed() function.
+
+	* src/nact/nact-main-window.c:
+	No more call nact_imenubar_on_delete_key_pressed() function.
 
 	* src/nact/nautilus-actions-config-tool.actions:
 	Add Preferences item in the Edit menu.
diff --git a/src/nact/nact-imenubar.c b/src/nact/nact-imenubar.c
index 6f62758..5def4c5 100644
--- a/src/nact/nact-imenubar.c
+++ b/src/nact/nact-imenubar.c
@@ -122,7 +122,7 @@ static const GtkActionEntry entries[] = {
 				/* i18n: tooltip displayed in the status bar when selecting the Duplicate item */
 				N_( "Create a copy of the selected action or profile." ),
 				G_CALLBACK( on_duplicate_activated ) },
-		{ "DeleteItem", GTK_STOCK_DELETE, NULL, "Del",
+		{ "DeleteItem", GTK_STOCK_DELETE, NULL, "Delete",
 				/* i18n: tooltip displayed in the status bar when selecting the Delete item */
 				N_( "Remove the selected action or profile from your configuration." ),
 				G_CALLBACK( on_delete_activated ) },
@@ -329,24 +329,6 @@ nact_imenubar_init( NactMainWindow *window )
 }
 
 /**
- * nact_imenubar_on_delete_key_pressed:
- * @window: the #NactMainWindow to which the menubar is attached.
- *
- * Deletes the currently selected item.
- */
-void
-nact_imenubar_on_delete_key_pressed( NactWindow *window )
-{
-	static const gchar *thisfn = "nact_imenubar_on_delete_key_pressed";
-	g_debug( "%s: window=%p", thisfn, window );
-
-	g_assert( NACT_IS_MAIN_WINDOW( window ));
-	g_assert( NACT_IS_IMENUBAR( window ));
-
-	on_delete_activated( NULL, window );
-}
-
-/**
  * nact_imenubar_on_delete_event:
  * @window: the #NactMainWindow to which the menubar is attached.
  *
diff --git a/src/nact/nact-imenubar.h b/src/nact/nact-imenubar.h
index eb37c23..55c4f4b 100644
--- a/src/nact/nact-imenubar.h
+++ b/src/nact/nact-imenubar.h
@@ -76,7 +76,6 @@ GType nact_imenubar_get_type( void );
 
 void  nact_imenubar_init( NactMainWindow *window );
 
-void  nact_imenubar_on_delete_key_pressed( NactWindow *window );
 void  nact_imenubar_on_delete_event( NactWindow *window );
 
 G_END_DECLS
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index 0209fe9..f6b3dd9 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -96,7 +96,6 @@ static void             setup_dialog_title( NactWindow *window );
 
 static void             on_actions_list_selection_changed( GtkTreeSelection *selection, gpointer user_data );
 static gboolean         on_actions_list_double_click( GtkWidget *widget, GdkEventButton *event, gpointer data );
-static gboolean         on_actions_list_delete_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data );
 static gboolean         on_actions_list_enter_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer data );
 static void             set_current_action( NactMainWindow *window );
 static void             set_current_profile( NactMainWindow *window, gboolean set_action );
@@ -257,7 +256,7 @@ iactions_list_iface_init( NactIActionsListInterface *iface )
 	iface->get_actions = get_actions;
 	iface->on_selection_changed = on_actions_list_selection_changed;
 	iface->on_double_click = on_actions_list_double_click;
-	iface->on_delete_key_pressed = on_actions_list_delete_key_pressed;
+	iface->on_delete_key_pressed = NULL;
 	iface->on_enter_key_pressed = on_actions_list_enter_key_pressed;
 	iface->is_modified_action = is_modified_action;
 	iface->is_valid_action = is_valid_action;
@@ -642,17 +641,6 @@ on_actions_list_double_click( GtkWidget *widget, GdkEventButton *event, gpointer
 }
 
 static gboolean
-on_actions_list_delete_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer user_data )
-{
-	if( NACT_MAIN_WINDOW( user_data )->private->edited_action ){
-		nact_imenubar_on_delete_key_pressed( NACT_WINDOW( user_data ));
-		return( TRUE );
-	}
-
-	return( FALSE );
-}
-
-static gboolean
 on_actions_list_enter_key_pressed( GtkWidget *widget, GdkEventKey *event, gpointer user_data )
 {
 	nact_iactions_list_toggle_collapse(