debian #154627 - quiver menu item in gnome interface

Add a menu item for Quiver.  While testing this, found the Quit menu
item still said that you quit using shift-q, so I updated that too.
Trunk change includes some other exit related fixes that don't apply to
the 3.4.3 branch.

diff --git a/doc/fixes34.3 b/doc/fixes34.3
index e2523496b0ae7ceae7ce57c2c35ff97a2275b0e1..a86b9d355852f4d74d5591d9442715af8d878f58 100644 (file)
--- a/doc/fixes34.3
+++ b/doc/fixes34.3
@@ -61,6 +61,7 @@ win32gui: allow race/gender/alignment selections beyond those specified in
 unix: don't define errno if NHSTDC
 X11: avoid a possible crash when using window manger to close a player
        selection window
+Gnome: add Quiver menu item, fix outdated Quit menu item
 
 
 General New Features

diff --git a/win/gnome/gnmain.c b/win/gnome/gnmain.c
index 2e1af12080993250b7e5d73a9999f8c3c6338aac..1f993ba08d0818a03b5e56fa75a07db62900feaa 100644 (file)
--- a/win/gnome/gnmain.c
+++ b/win/gnome/gnmain.c
@@ -33,6 +33,7 @@ void ghack_quit_game(GtkWidget *widget, int button)
     if (button == 0) {
        gnome_exit_nhwindows(0);
        gtk_object_unref(GTK_OBJECT(session_id));
+       gtk_exit(0);
     }
 }
 
@@ -64,6 +65,7 @@ void ghack_save_game(GtkWidget *widget, int button)
            /* make sure they see the Saving message */
            display_nhwindow(WIN_MESSAGE, TRUE);
            gnome_exit_nhwindows("Be seeing you...");
+           gtk_exit(0);
        } else (void)doredraw();
     }
 }
@@ -216,8 +218,8 @@ GnomeUIInfo game_tree[] =
     GNOMEUIINFO_MENU_SAVE_ITEM(ghack_save_game_cb, NULL),
     { 
        GNOME_APP_UI_ITEM, N_("Exit"), NULL, 
-       ghack_quit_game_cb, GINT_TO_POINTER('Q'), NULL, 
-       GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ABOUT, 'Q', GDK_SHIFT_MASK
+       ghack_quit_game_cb, GINT_TO_POINTER(M('Q')), NULL, 
+       GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ABOUT, 'Q', GDK_MOD1_MASK
     }, 
     GNOMEUIINFO_END
 };
@@ -361,6 +363,12 @@ GnomeUIInfo action_menu[] = {
               ghack_accelerator_selected, 
               GINT_TO_POINTER('t'), NULL, GNOME_APP_PIXMAP_NONE, NULL, 't',0
           },
+          {
+              GNOME_APP_UI_ITEM, N_("Quiver/Ready"),
+              N_("ready or quiver some ammunition"),
+              ghack_accelerator_selected,
+              GINT_TO_POINTER('Q'), NULL, GNOME_APP_PIXMAP_NONE, NULL, 'Q',GDK_SHIFT_MASK,
+          },
           { 
               GNOME_APP_UI_ITEM, N_("Open Door"), 
               N_("open a door"),