Changeset 5113


Ignore:
Timestamp:
Aug 28, 2010 11:19:56 PM (4 years ago)
Author:
damato
Message:
  • merged r4984 onto bugfix-2.6 branch
Location:
branches/bugfix-2.6
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/bugfix-2.6

    • Property svn:mergeinfo changed
      /trunkmerged: 4984
  • branches/bugfix-2.6/ChangeLog

    r5112 r5113  
    14142010-08-26 Thore Böckelmann <tboeckel@gmx.de> 
    1515 
     16  * ImageCache.c: warnings about missing image files will only be issued in case 
     17    neither the NOIMAGEWARNING ToolType nor the theme's NoImageWarning option 
     18    are active. This avoids lots of useless warnings for the "empty" theme. 
    1619  * tools/mkrelease.sh: copied over the mkrelease.sh script from the 2.7 branch. 
    1720    This fixes #147. 
  • branches/bugfix-2.6/src/ImageCache.c

    r5101 r5113  
    131131      E(DBF_IMAGE, "wasn't able to load specified image '%s'. error: %ld", node->filename, IoErr()); 
    132132  } 
    133   else 
     133  else if(G->NoImageWarning == FALSE) 
    134134    W(DBF_IMAGE, "specified image '%s' doesn't exist.", node->filename); 
    135135 
Note: See TracChangeset for help on using the changeset viewer.