gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-29 01:42:32 +01:00
Code Issues Projects Releases Wiki Activity

Updating to version 0.20.2

Browse Source 
Many bug fixes.
This commit is contained in:
dan
1998-10-21 14:43:47 +00:00
parent 9d2e6ef9f1
commit 9af1c6c415
222 changed files with 9132 additions and 4322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
WPrefs.app/Menu.c
View File

@@ -1,6 +1,6 @@
/* Menu.c- menu definition
*
* WPrefs - WindowMaker Preferences Program
* WPrefs - Window Maker Preferences Program
*
* Copyright (c) 1998 Alfredo K. Kojima
*
@@ -1280,9 +1280,8 @@ showData(_Panel *panel)
strcat(menuPath, "/Defaults/WMRootMenu");
menu = PLGetProplistWithPath(menuPath);
free(menuPath);
if (!PLIsArray(menu)) {
if (!menu || !PLIsArray(menu)) {
sprintf(buffer, _("The format of the current menu in ~/G/D/WMRootMenu "
"is not supported by WPrefs. A new menu will be created.\n"
"You can also replace ~/G/D/WMRootMenu with ~/G/L/W/plmenu "
@@ -1303,8 +1302,11 @@ showData(_Panel *panel)
} else {
pmenu = preProcessMenu(menu, &hasWSMenu);
}
PLSetFilename(pmenu, PLGetFilename(menu));
PLRelease(menu);
PLSetFilename(pmenu, menuPath);
free(menuPath);
if (menu)
PLRelease(menu);
if (panel->itemClipboard) {
PLRelease(panel->itemClipboard);