# HG changeset patch # User ib # Date 1301696192 0 # Node ID 0b17f6bed6fc7f2380d96fb740e7058a7d90b21d # Parent b61dff4c9a35d024d12894f4d5cab5c16b37a780 Don't needlessly store font information in the wItems array There is no valuable information available and no such information is used anywhere. So remove the itFont item type. diff -r b61dff4c9a35 -r 0b17f6bed6fc gui/app.h --- a/gui/app.h Fri Apr 01 21:23:50 2011 +0000 +++ b/gui/app.h Fri Apr 01 22:16:32 2011 +0000 @@ -119,7 +119,6 @@ #define itDLabel 105 #define itBase 106 #define itPotmeter 107 -#define itFont 108 #define itPLMButton (itNone - 1) #define itPRMButton (itNone - 2) diff -r b61dff4c9a35 -r 0b17f6bed6fc gui/skin/skin.c --- a/gui/skin/skin.c Fri Apr 01 21:23:50 2011 +0000 +++ b/gui/skin/skin.c Fri Apr 01 22:16:32 2011 +0000 @@ -687,7 +687,6 @@ static int cmd_font(char *in) { char fnt[256]; - wItem *item; if (!window_cmd("font")) return 1; @@ -699,15 +698,7 @@ cutItem(in, fnt, ',', 0); // Note: This seems needless but isn't for compatibility // reasons with a meanwhile depreciated second parameter. - item = next_item(); - - if (!item) - return 1; - - item->type = itFont; - item->fontid = fntRead(path, fnt); - - switch (item->fontid) { + switch (fntRead(path, fnt)) { case -1: skin_error(MSGTR_SKIN_NotEnoughMemory); return 1;