X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Fgtk%2Fhelpmenu.c;h=9b9ac2eb94d2f73b7114188864a8378004d65a8d;hb=ab28e54867f17238e2b70900d21692f95945a02b;hp=4a8d9dc5377a157e16b03439948e2ff15c345d4f;hpb=1eb382f72510d50b3636fb88c4bfaf17183672b6;p=emu8051.git

diff --git a/src/gtk/helpmenu.c b/src/gtk/helpmenu.c
index 4a8d9dc..9b9ac2e 100644
--- a/src/gtk/helpmenu.c
+++ b/src/gtk/helpmenu.c
@@ -4,19 +4,7 @@
  * Copyright (C) 1999 Jonathan St-André
  * Copyright (C) 1999 Hugo Villeneuve <hugo@hugovil.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ * This file is released under the GPLv2
  */
 
 #if HAVE_CONFIG_H
@@ -35,22 +23,17 @@
 
 #include "common.h"
 #include "options.h"
-#include "emugtk.h"
+#include "main.h"
 #include "messagebox.h"
 #include "helpmenu.h"
 
-#define PACKAGE_COPYRIGHT "(c) Hugo Villeneuve"
-
 static void
-HelpCommandsEvent(gchar *string)
+help_about_event(GtkWidget *widget, gpointer data)
 {
-	ShowMessage("Command Line Options", COMMAND_LINE_OPTIONS,
-		    GTK_JUSTIFY_LEFT, MESSAGE_DIALOG_FIXED_FONT);
-}
+	/* Remove compiler warning about unused variables. */
+	(void) widget;
+	(void) data;
 
-static void
-HelpAboutEvent(GtkWidget *widget, gpointer data)
-{
 	const char *authors[] = {
 		"Hugo Villeneuve <hugo@hugovil.com>",
 		"Jonathan St-André",
@@ -81,7 +64,7 @@ HelpAboutEvent(GtkWidget *widget, gpointer data)
 		"title", "About Dialog",
 		"version", PACKAGE_VERSION,
 		"logo-icon-name", PACKAGE_TARNAME,
-		"comments", get_package_description(),
+		"comments", PACKAGE_DESCRIPTION,
 		"authors", authors,
 		"website", PACKAGE_URL,
 		"copyright", PACKAGE_COPYRIGHT,
@@ -91,26 +74,18 @@ HelpAboutEvent(GtkWidget *widget, gpointer data)
 }
 
 void
-HelpAddMenu(GtkWidget *menu_bar)
+help_add_menu(GtkWidget *menu_bar)
 {
 	GtkWidget *item;
 	GtkWidget *menu;
 
 	menu = gtk_menu_new();
 
-	/* Create the 'Help Command Line Options' item. */
-	item = gtk_menu_item_new_with_label("Command Line Options");
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	/* Attach the callback functions to the activate signal. */
-	g_signal_connect(item, "activate", G_CALLBACK(HelpCommandsEvent), NULL);
-
-	AddMenuSeparator(menu);
-
 	/* Create the 'Help About' item. */
 	item = gtk_menu_item_new_with_label("About " PACKAGE);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	/* Attach the callback functions to the activate signal. */
-	g_signal_connect(item, "activate", G_CALLBACK(HelpAboutEvent), NULL);
+	g_signal_connect(item, "activate", G_CALLBACK(help_about_event), NULL);
 
 	/* Adding submenu title. */
 	item = gtk_menu_item_new_with_label("Help");