callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't be too strict when checking icon flags. (#435062)

Browse Source 
2007-05-01  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkiconcachevalidator.c: Don't be too strict when checking
        icon flags.  (#435062)



svn path=/trunk/; revision=17767
This commit is contained in:
Matthias Clasen
2007-05-02 02:19:08 +00:00
committed by Matthias Clasen
parent 321817db53
commit fdd5aa6e5b
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-05-01 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconcachevalidator.c: Don't be too strict when checking
icon flags. (#435062)
2007-05-01 Matthias Clasen <mclasen@redhat.com> 2007-05-01 Matthias Clasen <mclasen@redhat.com>
* gtk/Makefile.am: When generating gtkbuiltincache.h, only copy * gtk/Makefile.am: When generating gtkbuiltincache.h, only copy

5
gtk/gtkiconcachevalidator.c
View File

@ -23,7 +23,7 @@
#include <gdk-pixbuf/gdk-pixdata.h> #include <gdk-pixbuf/gdk-pixdata.h>
#define VERBOSE(x) #define VERBOSE(x) x
#define check(name,condition) \ #define check(name,condition) \
if (!(condition)) \ if (!(condition)) \
@ -262,8 +262,7 @@ check_image (CacheInfo *info,
get_uint32 (info, offset + 4, &image_data_offset)); get_uint32 (info, offset + 4, &image_data_offset));
check ("image index", index < info->n_directories); check ("image index", index < info->n_directories);
check ("image flags", flags == 1 || flags == 2 || flags == 4 || check ("image flags", flags < 16);
flags == 9 || flags == 10 || flags == 12);
if (image_data_offset != 0) if (image_data_offset != 0)
{ {