[Pcb-src-changes] pcb.git: branch: master updated (1fe293d6e1c4c18e0be0f06c360276e017bc219d)

[<gi...@gp...>]

The branch, master has been updated
       via  1fe293d6e1c4c18e0be0f06c360276e017bc219d (commit)
      from  0e75f8fd486242b3b30c7a7390c8080bfc650d35 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/global.h |    2 +-
 src/main.c   |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)


=================
 Commit Messages
=================

commit 1fe293d6e1c4c18e0be0f06c360276e017bc219d
Author: Felix Ruoff <Fe...@po...>
Commit: Felix Ruoff <Fe...@po...>

    Remove broken --menu-file option
    
    The expected functionality is given by the option --pcb-menu for the GTK+ GUI
    and lesstif GUI.

:100644 100644 2a5ae93... 7a09d46... M	src/global.h
:100644 100644 04b7c2f... 8b51609... M	src/main.c

=========
 Changes
=========

commit 1fe293d6e1c4c18e0be0f06c360276e017bc219d
Author: Felix Ruoff <Fe...@po...>
Commit: Felix Ruoff <Fe...@po...>

    Remove broken --menu-file option
    
    The expected functionality is given by the option --pcb-menu for the GTK+ GUI
    and lesstif GUI.

diff --git a/src/global.h b/src/global.h
index 2a5ae93..7a09d46 100644
--- a/src/global.h
+++ b/src/global.h
@@ -659,7 +659,7 @@ typedef struct			/* some resources... */
    *Groups,			/* string with layergroups */
    *Routes,			/* string with route styles */
    *FilePath, *RatPath, *RatCommand, *FontPath, *PinoutFont, *ElementPath, *LibraryPath, *Size,	/* geometry string for size */
-   *Media, *MenuFile,		/* file containing menu definitions */
+   *Media,
    *BackgroundImage,		/* PPM file for board background */
    *ScriptFilename,		/* PCB Actions script to execute on startup */
    *ActionString,		/* PCB Actions string to execute on startup */
diff --git a/src/main.c b/src/main.c
index 04b7c2f..8b51609 100644
--- a/src/main.c
+++ b/src/main.c
@@ -550,7 +550,6 @@ HID_Attribute main_attribute_list[] = {
   SSET (FontPath, PCBLIBPATH, "font-path", 0),
   SSET (ElementPath, PCBLIBPATH, "element-path", 0),
   SSET (LibraryPath, PCBLIBPATH, "lib-path", 0),
-  SSET (MenuFile, "pcb-menu.res", "menu-file", 0),
   SSET (ScriptFilename, 0, "action-script",
 	"If set, this file is executed at startup."),
   SSET (ActionString, 0, "action-string",