gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-30 10:22:34 +01:00
Code Issues Projects Releases Wiki Activity

fixed some bugs

Browse Source
This commit is contained in:
dan
2004-10-26 03:40:44 +00:00
parent bbd1e5dada
commit d8862b0bdf
5 changed files with 29 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
WPrefs.app/Menu.c
View File

@@ -1563,45 +1563,30 @@ buildMenuFromPL(_Panel *panel, WMPropList *pl)
static WMPropList*
getDefaultMenu(_Panel *panel)
{
WMPropList *menu, *pmenu;
WMPropList *menu;
char *menuPath, *gspath;
gspath = wusergnusteppath();
menuPath = wmalloc(strlen(gspath)+128);
/* if there is a localized plmenu for the tongue put it's filename here */
sprintf(menuPath, _("%s/Library/WindowMaker/plmenu"), gspath);
sprintf(menuPath, "%s/Library/WindowMaker/plmenu", gspath);
menu = WMReadPropListFromFile(menuPath);
if (!menu) {
wwarning("%s:could not read property list menu", menuPath);
char *buffer, *msg;
if (strcmp("%s/Library/WindowMaker/plmenu",
_("%s/Library/WindowMaker/plmenu"))!=0) {
sprintf(menuPath, "%s/Library/WindowMaker/plmenu", gspath);
menu = WMReadPropListFromFile(menuPath);
wwarning("%s:could not read property list menu", menuPath);
}
if (!menu) {
char buffer[512];
sprintf(buffer, _("Could not open default menu from '%s'"),
menuPath);
WMRunAlertPanel(WMWidgetScreen(panel->parent), panel->parent,
_("Error"), buffer, _("OK"), NULL, NULL);
}
msg = _("Could not open default menu from '%s'");
buffer = wmalloc(strlen(msg) + strlen(menuPath) + 10);
sprintf(buffer, msg, menuPath);
WMRunAlertPanel(WMWidgetScreen(panel->parent), panel->parent,
_("Error"), buffer, _("OK"), NULL, NULL);
wfree(buffer);
}
wfree(menuPath);
if (menu) {
pmenu = menu;
} else {
pmenu = NULL;
}
return pmenu;
return menu;
}