diff options
Diffstat (limited to 'wm/olvwm/patches/patch-ak')
| -rw-r--r-- | wm/olvwm/patches/patch-ak | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/wm/olvwm/patches/patch-ak b/wm/olvwm/patches/patch-ak index 62bc96e2223..ea7e7966a6a 100644 --- a/wm/olvwm/patches/patch-ak +++ b/wm/olvwm/patches/patch-ak @@ -1,8 +1,17 @@ -$NetBSD: patch-ak,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ +$NetBSD: patch-ak,v 1.2 2013/03/28 21:40:11 joerg Exp $ ---- usermenu.c.orig Thu Mar 2 22:41:31 2000 -+++ usermenu.c Tue Jun 6 19:24:12 2000 -@@ -884,7 +884,7 @@ +--- usermenu.c.orig 2000-03-02 21:41:31.000000000 +0000 ++++ usermenu.c +@@ -193,7 +193,7 @@ extern int StartDSDMFunc(); + extern int StopDSDMFunc(); + + extern int GenWinMenuFunc(); +-extern int GenDirMenuFunc(); ++void GenDirMenuFunc(Display *dpy, MenuInfo *menuInfo, int bindex, MenuCache *cache, WinGeneric *winInfo, int depth); + extern int StickSelnFunc(); + extern int MoveDesktopFunc(); + +@@ -884,7 +884,7 @@ makeMenuSearchPath() home = "."; if ((owHome = getenv("OPENWINHOME")) == NULL) @@ -11,11 +20,10 @@ $NetBSD: patch-ak,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ menuSearchPath = (char **)MemAlloc(NUM_SEARCH_PATH*sizeof(char *)); -@@ -899,16 +899,6 @@ - /* $HOME/.<menufile> */ +@@ -900,16 +900,6 @@ makeMenuSearchPath() sprintf(buf, "%s/.%%s", home); menuSearchPath[i++] = MemNewString(buf); -- + -#ifdef OW_I18N_L3 - /* $OPENWINHOME/share/locale/<locale>/olwm/<menufile> */ - sprintf(buf, "%s/share/locale/%%2$s/olwm/%%1$s", owHome); @@ -25,6 +33,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ - sprintf(buf, "%s/lib/%%1$s.%%2$s", owHome); - menuSearchPath[i++] = MemNewString(buf); -#endif - +- /* $OPENWINHOME/lib/<menufile> */ sprintf(buf, "%s/lib/%%s", owHome); + menuSearchPath[i++] = MemNewString(buf); |