Add option no-define to AM_INIT_AUTOMAKE

[emu8051.git] / src / gtk / helpmenu.c

diff --git a/src/gtk/helpmenu.c b/src/gtk/helpmenu.c
index 6d3f9e0..90c9120 100644 (file)
--- 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,23 +23,12 @@
 
 #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)
-{
-       (void) string; /* Remove compiler warning about unused variables. */
-
-       ShowMessage("Command Line Options", COMMAND_LINE_OPTIONS,
-                   GTK_JUSTIFY_LEFT, MESSAGE_DIALOG_FIXED_FONT);
-}
-
 static void
-HelpAboutEvent(GtkWidget *widget, gpointer data)
+help_about_event(GtkWidget *widget, gpointer data)
 {
        /* Remove compiler warning about unused variables. */
        (void) widget;
@@ -87,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,
@@ -97,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);
+       item = gtk_menu_item_new_with_label("About " PACKAGE_NAME);
        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");