From a905fe5793c03e9df5ee957d9e01d2f511a1a7f4 Mon Sep 17 00:00:00 2001
From: Peter TB Brett <peter@peter-b.co.uk>
Date: Fri, 13 Sep 2013 15:41:06 +0100
Subject: [PATCH] gschem: Remove redundant "page-new" command.

It does exactly the same as "file-new".  It was a toss-up which one to
keep, but "file-new" won.
---
 gschem/include/prototype.h     |  2 --
 gschem/lib/system-gschemrc.scm |  2 --
 gschem/src/g_keys.c            |  1 -
 gschem/src/g_register.c        |  1 -
 gschem/src/i_callbacks.c       | 18 ------------------
 5 files changed, 24 deletions(-)

diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index 2a5937e9c..7083b8265 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -127,7 +127,6 @@ SCM g_keys_view_bw_colors(SCM rest);
 SCM g_keys_page_manager(SCM rest);
 SCM g_keys_page_next(SCM rest);
 SCM g_keys_page_prev(SCM rest);
-SCM g_keys_page_new(SCM rest);
 SCM g_keys_page_close(SCM rest);
 SCM g_keys_page_revert(SCM rest);
 SCM g_keys_page_print(SCM rest);
@@ -317,7 +316,6 @@ void i_callback_view_bw_colors(gpointer data, guint callback_action, GtkWidget *
 void i_callback_page_manager(gpointer data, guint callback_action, GtkWidget *widget);
 void i_callback_page_next(gpointer data, guint callback_action, GtkWidget *widget);
 void i_callback_page_prev(gpointer data, guint callback_action, GtkWidget *widget);
-void i_callback_page_new(gpointer data, guint callback_action, GtkWidget *widget);
 void i_callback_page_close(gpointer data, guint callback_action, GtkWidget *widget);
 void i_callback_page_revert(gpointer data, guint callback_action, GtkWidget *widget);
 void i_callback_page_print(gpointer data, guint callback_action, GtkWidget *widget);
diff --git a/gschem/lib/system-gschemrc.scm b/gschem/lib/system-gschemrc.scm
index 1b8f4dad7..3635132a3 100644
--- a/gschem/lib/system-gschemrc.scm
+++ b/gschem/lib/system-gschemrc.scm
@@ -1007,7 +1007,6 @@
 (global-set-key "P M" 'page-manager)
 (global-set-key "P N" 'page-next)
 (global-set-key "P P" 'page-prev)
-(global-set-key "P E" 'page-new)
 (global-set-key "P R" 'page-revert)
 (global-set-key "P C" 'page-close)
 (global-set-key "P <Shift>P" 'page-print)
@@ -1198,7 +1197,6 @@
         `( (,(N_ "_Manager...")       page-manager            #f)
            (,(N_ "_Previous")         page-prev               "gtk-go-back")
            (,(N_ "_Next")             page-next               "gtk-go-forward")
-           (,(N_ "Ne_w")              page-new                "gtk-new")
            (,(N_ "_Revert")           page-revert             "gtk-revert-to-saved")
            (,(N_ "_Close")            page-close              "gtk-close")))
 
diff --git a/gschem/src/g_keys.c b/gschem/src/g_keys.c
index dfb7e5b63..e318593f8 100644
--- a/gschem/src/g_keys.c
+++ b/gschem/src/g_keys.c
@@ -155,7 +155,6 @@ DEFINE_G_KEYS(view_bw_colors)
 DEFINE_G_KEYS(page_manager)
 DEFINE_G_KEYS(page_next)
 DEFINE_G_KEYS(page_prev)
-DEFINE_G_KEYS(page_new)
 DEFINE_G_KEYS(page_close)
 DEFINE_G_KEYS(page_revert)
 DEFINE_G_KEYS(page_print)
diff --git a/gschem/src/g_register.c b/gschem/src/g_register.c
index 6eaa8f9e2..1a803317c 100644
--- a/gschem/src/g_register.c
+++ b/gschem/src/g_register.c
@@ -203,7 +203,6 @@ static struct gsubr_t gschem_funcs[] = {
   { "page-manager",              0, 0, 0, g_keys_page_manager },
   { "page-next",                 0, 0, 0, g_keys_page_next },
   { "page-prev",                 0, 0, 0, g_keys_page_prev },
-  { "page-new",                  0, 0, 0, g_keys_page_new },
   { "page-close",                0, 0, 0, g_keys_page_close },
   { "page-revert",               0, 0, 0, g_keys_page_revert },
   { "page-print",                0, 0, 0, g_keys_page_print },
diff --git a/gschem/src/i_callbacks.c b/gschem/src/i_callbacks.c
index eb7d1c8c1..1473c6f6c 100644
--- a/gschem/src/i_callbacks.c
+++ b/gschem/src/i_callbacks.c
@@ -1449,24 +1449,6 @@ DEFINE_I_CALLBACK(page_prev)
  *  \par Function Description
  *
  */
-DEFINE_I_CALLBACK(page_new)
-{
-  GSCHEM_TOPLEVEL *w_current = (GSCHEM_TOPLEVEL*)data;
-  PAGE *page;
-
-  g_return_if_fail (w_current != NULL);
-
-  /* create a new page */
-  page = x_window_open_page (w_current, NULL);
-  x_window_set_current_page (w_current, page);
-  s_log_message (_("New page created [%s]\n"), page->page_filename);
-}
-
-/*! \todo Finish function documentation!!!
- *  \brief
- *  \par Function Description
- *
- */
 DEFINE_I_CALLBACK(page_close)
 {
   GSCHEM_TOPLEVEL *w_current = (GSCHEM_TOPLEVEL*) data;
-- 
2.11.4.GIT