[gnome-commander/gcmd-1-2-8] Fixed problem #352024 (F10 key doesn't work)

[Piotr Eljasiak <epiotr src gnome org>]

commit aeef19908d203afa7c291f4f1b126d92a696d924
Author: Thomas Jost <thomas jost gmail com>
Date:   Fri Nov 19 21:10:21 2010 +0100

    Fixed problem #352024 (F10 key doesn't work)
    
    The current behavior is incoherent: F10 should close the window, but it
    currently gives focus to the menu bar (#352024). Since this is the expected
    behavior according to the GNOME HIG, removing the F10 assignment is probably a
    good idea.

 NEWS                                  |    1 +
 doc/C/gnome-commander.xml             |    8 +++-----
 doc/keys.txt                          |    1 -
 src/gnome-cmd-key-shortcuts-dialog.cc |    2 --
 src/gnome-cmd-main-win.cc             |   14 --------------
 src/gnome-cmd-user-actions.cc         |    5 -----
 6 files changed, 4 insertions(+), 27 deletions(-)
---
diff --git a/NEWS b/NEWS
index 38317fd..fd49f72 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ gnome-commander 1.2.8.9
 ---------------
 
 Bug fixes:
+ * Fixed problem #352024 (F10 key doesn't work)
  * Fixed problem #631243 (advrename $c(width) regression)
 
 New features:
diff --git a/doc/C/gnome-commander.xml b/doc/C/gnome-commander.xml
index 4b7d116..f1093bd 100644
--- a/doc/C/gnome-commander.xml
+++ b/doc/C/gnome-commander.xml
@@ -4058,11 +4058,6 @@
             <entry><para></para></entry>
         </row>
         <row valign="top">
-            <entry><para><keycombo><keycap>F10</keycap></keycombo></para></entry>
-            <entry><para>Quit</para></entry>
-            <entry><para></para></entry>
-        </row>
-        <row valign="top">
             <entry><para></para></entry>
             <entry><para></para></entry>
             <entry><para></para></entry>
@@ -6063,6 +6058,9 @@
                 <para>
                     <itemizedlist>
                         <listitem>
+                            <para>Fixed problem #352024 (F10 key doesn't work)</para>
+                        </listitem>
+                        <listitem>
                             <para>Fixed problem #631243 (advrename $c(width) regression)</para>
                         </listitem>
                     </itemizedlist>
diff --git a/doc/keys.txt b/doc/keys.txt
index f4a342e..e4c3731 100644
--- a/doc/keys.txt
+++ b/doc/keys.txt
@@ -10,7 +10,6 @@ F6              Rename or move files
 F7              Create directory
 F8              Delete files
 F9              Search
-F10             Quit
 
 ALT+1           Change left connection
 ALT+2           Change right connection
diff --git a/src/gnome-cmd-key-shortcuts-dialog.cc b/src/gnome-cmd-key-shortcuts-dialog.cc
index a0f60ef..0023d0b 100644
--- a/src/gnome-cmd-key-shortcuts-dialog.cc
+++ b/src/gnome-cmd-key-shortcuts-dialog.cc
@@ -134,7 +134,6 @@ static void response_callback (GnomeCmdKeyShortcutsDialog *dialog, int response_
                 dialog->user_actions->unregister(GDK_F7);
                 dialog->user_actions->unregister(GDK_F8);
                 dialog->user_actions->unregister(GDK_F9);
-                dialog->user_actions->unregister(GDK_F10);
 
                 dialog->user_actions->register_action(GDK_F3, "file.view");
                 dialog->user_actions->register_action(GDK_F4, "file.edit");
@@ -143,7 +142,6 @@ static void response_callback (GnomeCmdKeyShortcutsDialog *dialog, int response_
                 dialog->user_actions->register_action(GDK_F7, "file.mkdir");
                 dialog->user_actions->register_action(GDK_F8, "file.delete");
                 dialog->user_actions->register_action(GDK_F9, "edit.search");
-                dialog->user_actions->register_action(GDK_F10, "file.exit");
             }
 
             break;
diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc
index 7580240..d1d7f97 100644
--- a/src/gnome-cmd-main-win.cc
+++ b/src/gnome-cmd-main-win.cc
@@ -92,7 +92,6 @@ struct GnomeCmdMainWinPrivate
     GtkWidget *mkdir_btn;
     GtkWidget *delete_btn;
     GtkWidget *find_btn;
-    GtkWidget *quit_btn;
 
     GtkWidget *menubar;
     GtkWidget *toolbar;
@@ -410,12 +409,6 @@ static void on_search_clicked (GtkButton *button, GnomeCmdMainWin *mw)
 }
 
 
-static void on_quit_clicked (GtkButton *button, GnomeCmdMainWin *mw)
-{
-    file_exit (NULL);
-}
-
-
 static void create_buttonbar (GnomeCmdMainWin *mw)
 {
     mw->priv->buttonbar_sep = create_separator (FALSE);
@@ -439,8 +432,6 @@ static void create_buttonbar (GnomeCmdMainWin *mw)
     mw->priv->delete_btn = add_buttonbar_button(_("F8 Delete"), main_win, "delete_btn", mw->priv->accel_group, 0);
     gtk_box_pack_start (GTK_BOX (mw->priv->buttonbar), create_separator (TRUE), FALSE, TRUE, 0);
     mw->priv->find_btn = add_buttonbar_button(_("F9 Search"), main_win, "find_btn", mw->priv->accel_group, 0);
-    gtk_box_pack_start (GTK_BOX (mw->priv->buttonbar), create_separator (TRUE), FALSE, TRUE, 0);
-    mw->priv->quit_btn = add_buttonbar_button(_("F10 Quit"), main_win, "quit_btn", mw->priv->accel_group, 0);
 
     gtk_signal_connect (GTK_OBJECT (mw->priv->view_btn), "clicked", GTK_SIGNAL_FUNC (on_view_clicked), mw);
     gtk_signal_connect (GTK_OBJECT (mw->priv->edit_btn), "clicked", GTK_SIGNAL_FUNC (on_edit_clicked), mw);
@@ -449,7 +440,6 @@ static void create_buttonbar (GnomeCmdMainWin *mw)
     gtk_signal_connect (GTK_OBJECT (mw->priv->mkdir_btn), "clicked", GTK_SIGNAL_FUNC (on_mkdir_clicked), mw);
     gtk_signal_connect (GTK_OBJECT (mw->priv->delete_btn), "clicked", GTK_SIGNAL_FUNC (on_delete_clicked), mw);
     gtk_signal_connect (GTK_OBJECT (mw->priv->find_btn), "clicked", GTK_SIGNAL_FUNC (on_search_clicked), mw);
-    gtk_signal_connect (GTK_OBJECT (mw->priv->quit_btn), "clicked", GTK_SIGNAL_FUNC (on_quit_clicked), mw);
 }
 
 
@@ -1109,10 +1099,6 @@ gboolean gnome_cmd_main_win_keypressed (GnomeCmdMainWin *mw, GdkEventKey *event)
                 case GDK_F9:
                     on_search_clicked (NULL, mw);
                     return TRUE;
-
-                case GDK_F10:
-                    on_quit_clicked (NULL, mw);
-                    return TRUE;
             }
 
     if (gnome_cmd_main_win_get_fs (mw, ACTIVE)->key_pressed(event))
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index 2f9b0aa..1402e5c 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -222,7 +222,6 @@ void GnomeCmdUserActions::init()
     register_action(GDK_F7, "file.mkdir");
     register_action(GDK_F8, "file.delete");
     // register_action(GDK_F9, "edit.search");     //  do not register F9 here, as edit.search action wouldn't be checked for registration later
-    // register_action(GDK_F10, "file.exit");      //  do not register F10 here, as file.exit action wouldn't be checked for registration later
 
     load("key-bindings");
 
@@ -334,9 +333,6 @@ void GnomeCmdUserActions::init()
 
     unregister(GDK_F9);                                 // unregister F9 if defined in [key-bindings]
     register_action(GDK_F9, "edit.search");             // and overwrite it with edit.search action
-
-    unregister(GDK_F10);                                // unregister F10 if defined in [key-bindings]
-    register_action(GDK_F10, "file.exit");              // and overwrite it with file.exit action
  }
 
 
@@ -351,7 +347,6 @@ void GnomeCmdUserActions::shutdown()
     unregister(GDK_F7);
     unregister(GDK_F8);
     unregister(GDK_F9);
-    unregister(GDK_F10);
 
     write("key-bindings");