--- dillo-0.7.1/src/menu.c Sun Mar 9 07:10:31 2003 +++ dillo-0.7.1-mine/src/menu.c Sun Mar 30 16:41:33 2003 @@ -121,7 +121,7 @@ static void Menu_sep(GtkWidget *menu) GtkWidget *a_Menu_mainbar_new(BrowserWindow *bw, gint tiny) { GtkWidget *menubar; - GtkWidget *file_menu; + GtkWidget *file_menu, *bookmarks_menu, *help_menu; /* GtkWidget *bookmarks_menu; */ /* GtkWidget *help_menu; */ @@ -139,27 +139,26 @@ GtkWidget *a_Menu_mainbar_new(BrowserWin Menu_add(file_menu, "_Preferences", "E", bw, a_Commands_prefs_callback, bw); */ - Menu_add(file_menu, "Close Window", "Q", bw, + Menu_add(file_menu, "Close Window", "W", bw, a_Commands_close_callback, bw); Menu_sep(file_menu); - Menu_add(file_menu, "Exit Dillo", "Q", bw, + Menu_add(file_menu, "Exit Dillo", "Q", bw, a_Commands_exit_callback, bw); - /* BOOKMARKS MENU + /* BOOKMARKS MENU */ bookmarks_menu = Menu_new(menubar, tiny ? "_B" : "_Bookmarks", FALSE, bw); bw->bookmarks_menu = bookmarks_menu; Menu_add(bookmarks_menu, "_View Bookmarks", NULL, bw, a_Commands_viewbm_callback, bw); Menu_sep(bookmarks_menu); - */ - /* HELP MENU + /* HELP MENU */ help_menu = Menu_new(menubar, "_Help", TRUE, bw); Menu_add(help_menu, "Dillo _Home", NULL, bw, a_Commands_helphome_callback, bw); Menu_add(help_menu, "Dillo _Manual", NULL, bw, a_Commands_manual_callback, bw); - */ + return menubar; }