2004-01-28 15:58:53 -05:00
|
|
|
$OpenBSD: patch-usermenu_c,v 1.1 2004/01/28 20:58:54 naddy Exp $
|
|
|
|
|
--- usermenu.c.orig 1994-01-13 22:36:21.000000000 +0100
|
|
|
|
|
+++ usermenu.c 2004-01-28 21:49:10.000000000 +0100
|
1999-07-17 06:53:21 -04:00
|
|
|
@@ -5,7 +5,7 @@
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifdef IDENT
|
|
|
|
|
-#ident "@(#)usermenu.c 1.6 olvwm version 07 Jan 1994"
|
|
|
|
|
+#ident "@(#)usermenu.c 1.7 olvwm version 01/13/98"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/*
|
1999-07-16 18:03:00 -04:00
|
|
|
@@ -122,7 +122,7 @@
|
|
|
|
|
#define _XtIntrinsic_h
|
|
|
|
|
typedef unsigned long Pixel; /* Index into colormap */
|
|
|
|
|
#endif /* NO_PIXEL_FIX */
|
|
|
|
|
-#include <xpm.h>
|
|
|
|
|
+#include <X11/xpm.h>
|
|
|
|
|
#endif XPM
|
|
|
|
|
|
|
|
|
|
#include <assert.h>
|
2004-01-28 15:58:53 -05:00
|
|
|
@@ -1003,7 +1003,7 @@ menuFromFile(file, menu, messages)
|
1999-07-17 06:53:21 -04:00
|
|
|
int lineno = 1; /* Needed for recursion */
|
|
|
|
|
int rval;
|
|
|
|
|
|
|
|
|
|
- if (++menuRecursionCount > 25) {
|
|
|
|
|
+ if (++menuRecursionCount > 1000) {
|
|
|
|
|
fprintf(stderr, GetString("olvwm: maximum menu filedepth exceeded\n"));
|
|
|
|
|
menuRecursionCount = 0;
|
|
|
|
|
return MENU_RECURSION;
|
