diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am index 654457f5..3f664282 100644 --- a/WPrefs.app/Makefile.am +++ b/WPrefs.app/Makefile.am @@ -40,7 +40,7 @@ WPrefs_SOURCES = \ editmenu.h \ xmodifier.c -AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\" +AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" AM_CFLAGS = INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ diff --git a/WPrefs.app/Menu.c b/WPrefs.app/Menu.c index 66b24d1c..21a9fe13 100644 --- a/WPrefs.app/Menu.c +++ b/WPrefs.app/Menu.c @@ -41,6 +41,7 @@ typedef enum { } InfoType; #define MAX_SECTION_SIZE 4 +#define PATH_LEN 256 typedef struct _Panel { WMBox *box; @@ -1426,10 +1427,10 @@ static WMPropList *getDefaultMenu(_Panel * panel) WMPropList *menu; char *menuPath, *gspath; - gspath = wusergnusteppath(); + gspath = wstrdup(WMAKER_RESOURCE_PATH); menuPath = wmalloc(strlen(gspath) + 128); - sprintf(menuPath, "%s/Library/WindowMaker/plmenu", gspath); + sprintf(menuPath, "%s/plmenu", gspath); menu = WMReadPropListFromFile(menuPath); @@ -1444,6 +1445,7 @@ static WMPropList *getDefaultMenu(_Panel * panel) wfree(buffer); } + wfree(gspath); wfree(menuPath); return menu;