[patch] Patch to merge wmx-6.ebuild

wmx-6.diff (text/plain), 1.37 KB, created by Satoshi Fuktommy on 2003-06-22 20:37:31 UTC

diff -Nru wmx-6.orig/Config.h wmx-6/Config.h
--- wmx-6.orig/Config.h	2000-05-25 00:48:59.000000000 +0900
+++ wmx-6/Config.h	2003-05-24 11:31:34.000000000 +0900
@@ -75,8 +75,8 @@
 
 // What to run to get a new window (from the "New" menu option)
 #define CONFIG_NEW_WINDOW_LABEL "New"
-//#define CONFIG_NEW_WINDOW_COMMAND "xterm"
-#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
+#define CONFIG_NEW_WINDOW_COMMAND "xterm"
+//#define CONFIG_NEW_WINDOW_COMMAND "/home/chris/.wmx/terminal"
 #define CONFIG_NEW_WINDOW_COMMAND_OPTIONS 0
 // or, for example,
 //#define CONFIG_NEW_WINDOW_COMMAND_OPTIONS "-ls","-sb","-sl","1024",0
@@ -91,7 +91,7 @@
 // middle-button menu
 #define CONFIG_COMMAND_MENU       ".wmx"
 // only used if COMMAND_MENU is not found; ignored if invalid directory:
-#define CONFIG_SYSTEM_COMMAND_MENU	"/usr/local/lib/wmx/menu"
+#define CONFIG_SYSTEM_COMMAND_MENU	"/etc/wmx/menu"
 // append screennumber to COMMAND_MENU directory;
 // use non screen style as fallback
 #define CONFIG_ADD_SCREEN_TO_COMMAND_MENU False
diff -Nru wmx-6.orig/Menu.C wmx-6/Menu.C
--- wmx-6.orig/Menu.C	2000-05-25 00:50:27.000000000 +0900
+++ wmx-6/Menu.C	2003-05-24 11:31:34.000000000 +0900
@@ -621,7 +621,7 @@
 
 
 CommandMenu::CommandMenu(WindowManager *manager, XEvent *e,
-			 char* otherdir = NULL)
+			 char* otherdir)
     : Menu(manager, e)
 {
     const char *home = getenv("HOME");