From eb80584d53f63ccdcbbcf6068d5c74e53613f5a4 Mon Sep 17 00:00:00 2001
Message-Id: <eb80584d53f63ccdcbbcf6068d5c74e53613f5a4.1716117265.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sat, 19 Apr 2008 18:07:34 +0100
Subject: [PATCH] Fiddle with menu names
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 disobedience/menu.c   | 10 +++++-----
 doc/disobedience.1.in |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/disobedience/menu.c b/disobedience/menu.c
index 0540a56..d2bb6a6 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -221,7 +221,7 @@ GtkWidget *menubar(GtkWidget *w) {
 
   static const GtkItemFactoryEntry entries[] = {
     {
-      (char *)"/File",                  /* path */
+      (char *)"/Server",                /* path */
       0,                                /* accelerator */
       0,                                /* callback */
       0,                                /* callback_action */
@@ -229,7 +229,7 @@ GtkWidget *menubar(GtkWidget *w) {
       0                                 /* extra_data */
     },
     { 
-      (char *)"/File/Login",            /* path */
+      (char *)"/Server/Login",          /* path */
       (char *)"<CTRL>L",                /* accelerator */
       login,                            /* callback */
       0,                                /* callback_action */
@@ -237,7 +237,7 @@ GtkWidget *menubar(GtkWidget *w) {
       0                                 /* extra_data */
     },
     { 
-      (char *)"/File/Users",            /* path */
+      (char *)"/Server/Manage users",   /* path */
       0,                                /* accelerator */
       users,                            /* callback */
       0,                                /* callback_action */
@@ -246,7 +246,7 @@ GtkWidget *menubar(GtkWidget *w) {
     },
 #if 0
     {
-      (char *)"/File/Settings",         /* path */
+      (char *)"/Server/Settings",       /* path */
       0,                                /* accelerator */
       settings,                         /* callback */
       0,                                /* callback_action */
@@ -255,7 +255,7 @@ GtkWidget *menubar(GtkWidget *w) {
     },
 #endif
     {
-      (char *)"/File/Quit Disobedience", /* path */
+      (char *)"/Server/Quit Disobedience", /* path */
       (char *)"<CTRL>Q",                /* accelerator */
       quit_program,                     /* callback */
       0,                                /* callback_action */
diff --git a/doc/disobedience.1.in b/doc/disobedience.1.in
index 6ac4202..c6b54ad 100644
--- a/doc/disobedience.1.in
+++ b/doc/disobedience.1.in
@@ -26,7 +26,7 @@ disobedience \- GUI client for DisOrder jukebox
 .B disobedience
 is a graphical client for DisOrder.
 .SH "WINDOWS AND ICONS"
-.SS "File Menu"
+.SS "Server Menu"
 This has the following options:
 .TP
 .B Login
-- 
[mdw]